diff -Nru update-manager-17.10.11/AutoUpgradeTester/apt-watchdog update-manager-0.156.14.15/AutoUpgradeTester/apt-watchdog --- update-manager-17.10.11/AutoUpgradeTester/apt-watchdog 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/apt-watchdog 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,50 @@ +#!/usr/bin/python +# +# this is watchdog that will try to kill hanging apt-get installs +# that may happen when the auto-install-tester runs +# +# its probably not useful for anything else + +import os +import signal +import subprocess +import sys +import time + +# default kill time 60min +WAKEUP_INTERVAL = 60*60 + +def watchdog_loop(): + watch_files = ["/var/log/apt/term.log", + "/var/log/dist-upgrade/apt-term.log"] + mtime = 0 + while True: + for f in watch_files: + if os.path.exists(f): + mtime = max(mtime, os.path.getmtime(f)) + time.sleep(WAKEUP_INTERVAL) + for f in watch_files: + if os.path.exists(f): + if os.path.getmtime(f) > mtime: + break + else: + print "no mtime change for %s seconds, sending SIGINT" % WAKEUP_INTERVAL + subprocess.call(["killall","-INT","apt-get"]) + + +if __name__ == "__main__": + print "Starting apt watchdog daemon for the auto-install-tester" + + if len(sys.argv) > 1 and sys.argv[1] == "--no-daemon": + watchdog_loop() + + # do the daemon thing + pid = os.fork() + if pid == 0: + os.setsid() + signal.signal(signal.SIGHUP, signal.SIG_IGN) + watchdog_loop() + else: + # add a little sleep to ensure child is setup + time.sleep(10) + os._exit(0) diff -Nru update-manager-17.10.11/AutoUpgradeTester/auto-install-tester.py update-manager-0.156.14.15/AutoUpgradeTester/auto-install-tester.py --- update-manager-17.10.11/AutoUpgradeTester/auto-install-tester.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/auto-install-tester.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,207 @@ +#!/usr/bin/python + +from optparse import OptionParser +import os +import os.path +import time + +import sys +sys.path.insert(0, "../DistUpgrade") + +from UpgradeTestBackendQemu import UpgradeTestBackendQemu + +import apt +import apt_pkg + +def do_install_remove(backend, pkgname): + """ install a package in the backend """ + #print "watchdog_runing: ", backend.watchdog_running + if not backend.watchdog_running: + print "starting watchdog" + backend._runInImage(["/bin/apt-watchdog"]) + backend.watchdog_running = True +# ret = backend._runInImage(["DEBIAN_FRONTEND=text","DEBIAN_PRIORITY=low", +# "apt-get","install","-q","-y",pkg.name]) + ret = backend._runInImage(["DEBIAN_FRONTEND=noninteractive", + "apt-get","install","-q","-y",pkg.name]) + print "apt returned: ", ret + if ret != 0: + return False + # now remove it again + ret = backend._runInImage(["DEBIAN_FRONTEND=noninteractive", + "apt-get","autoremove", "-y",pkg.name]) + print "apt returned: ", ret + if ret != 0: + return False + return True + +def test_downloadable(backend, pkgname): + """ test if the pkg is downloadable or gives a 404 """ + ret = backend._runInImage(["apt-get","install","-q","--download-only","-y",pkg.name]) + print "apt --download-only returned: ", ret + if ret != 0: + return False + return True + +if __name__ == "__main__": + + parser = OptionParser() + parser.add_option("-p", "--profile", dest="profile", + default="profile/auto-install-tester/", + help="base profile dir") + + (options, args) = parser.parse_args() + + # create backend + apt_pkg.Config.Set("APT::Architecture","i386") + basedir = os.path.abspath(os.path.dirname(options.profile)) + aptbasedir = os.path.join(basedir,"auto-install-test") + + + # create apt dirs if needed + for d in ["etc/apt/", + "var/lib/dpkg", + "var/lib/apt/lists/partial", + "var/cache/apt/archives/partial"]: + if not os.path.exists(os.path.join(aptbasedir,d)): + os.makedirs(os.path.join(aptbasedir,d)) + + + backend = UpgradeTestBackendQemu(options.profile) + backend.watchdog_running = False + backend.bootstrap() + + # copy status file from image to aptbasedir + backend.start() + print "copy apt-watchdog" + backend._copyToImage("apt-watchdog", "/bin/") + print "copy status file" + backend._copyFromImage("/var/lib/dpkg/status", + os.path.join(aptbasedir,"var/lib/dpkg/","status")) + print "run update" + backend._runInImage(["apt-get","-q", "update"]) + backend.stop() + + # build apt stuff (outside of the kvm) + mirror = backend.config.get("NonInteractive","Mirror") + dist = backend.config.get("Sources","From") + components = backend.config.getlist("NonInteractive","Components") + pockets = backend.config.getlist("NonInteractive","Pockets") + f=open(os.path.join(aptbasedir,"etc","apt","sources.list"),"w") + f.write("deb %s %s %s\n" % (mirror, dist, " ".join(components))) + for pocket in pockets: + f.write("deb %s %s-%s %s\n" % (mirror, dist, pocket, " ".join(components))) + f.close() + + # get a cache + cache = apt.Cache(rootdir=os.path.abspath(aptbasedir)) + cache.update(apt.progress.text.AcquireProgress()) + cache.open(apt.progress.OpProgress()) + + # now test if we can install stuff + backend.saveVMSnapshot("clean-base") + backend.start() + + # setup dirs + resultdir = backend.resultdir + print "Using resultdir: '%s'" % resultdir + failures = open(os.path.join(resultdir,"failures.txt"),"w") + + # pkg blacklist - only useful for pkg that causes exsessive delays + # when installing, e.g. by requiring input or by tryint to connect + # to a (firewalled) network + pkgs_blacklisted = set() + sname = os.path.join(resultdir,"pkgs_blacklisted.txt") + print "looking at ", sname + if os.path.exists(sname): + pkgs_blacklisted = set(open(sname).read().split("\n")) + print "have '%s' with '%i' entries" % (sname, len(pkgs_blacklisted)) + + # set with package that have been tested successfully + pkgs_tested = set() + sname = os.path.join(resultdir,"pkgs_done.txt") + print "looking at ", sname + if os.path.exists(sname): + pkgs_tested = set(open(sname).read().split("\n")) + print "have '%s' with '%i' entries" % (sname, len(pkgs_tested)) + statusfile = open(sname, "a") + else: + statusfile = open(sname, "w") + + # now see if we can install and remove it again + for (i, pkg) in enumerate(cache): +# for (i, pkg) in enumerate([ cache["abook"], +# cache["emacspeak"], +# cache["postfix"] ]): + # clean the cache + cache._depcache.Init() + print "\n\nPackage %s: %i of %i (%f.2)" % (pkg.name, i, len(cache), + float(i)/float(len(cache))*100) + print "pkgs_tested has %i entries\n\n" % len(pkgs_tested) + + pkg_failed = False + + # skip stuff in the ubuntu-minimal that we can't install or upgrade + if pkg.is_installed and not pkg.is_upgradable: + continue + + # skip blacklisted pkg names + if pkg.name in pkgs_blacklisted: + print "blacklisted: ", pkg.name + continue + + # skip packages we tested already + if "%s-%s" % (pkg.name, pkg.candidateVersion) in pkgs_tested: + print "already tested: ", pkg.name + continue + + # see if we can install/upgrade the pkg + try: + pkg.markInstall() + except SystemError, e: + pkg.markKeep() + if not (pkg.markedInstall or pkg.markedUpgrade): + print "pkg: %s not installable" % pkg.name + failures.write("%s markInstall()\n " % pkg.name) + continue + + if not test_downloadable(backend, pkg.name): + # because the test runs for so long its likely that we hit + # 404 because the archive has changed since we ran, deal with + # that here by not outputing it as a error for a start + # FIXME: restart whole test + continue + + # mark as tested + statusfile.write("%s-%s\n" % (pkg.name, pkg.candidateVersion)) + + if not do_install_remove(backend, pkg.name): + # on failure, re-run in a clean env so that the log + # is more meaningful + print "pkg: %s failed, re-testing in a clean(er) environment" % pkg.name + backend.restoreVMSnapshot("clean-base") + backend.watchdog_running = False + backend.start() + if not do_install_remove(backend, pkg.name): + outname = os.path.join(resultdir,"%s-fail.txt" % pkg.name) + failures.write("failed to install/remove %s (log at %s)\n" % (pkg.name, outname)) + time.sleep(5) + backend._copyFromImage("/var/log/apt/term.log",outname) + + # now restore back to a clean state and continue testing + # (but do not record the package as succesful tested) + backend.restoreVMSnapshot("clean-base") + backend.watchdog_running = False + backend.start() + continue + + # installation worked, record that we have tested this package + for pkg in cache: + if pkg.markedInstall or pkg.markedUpgrade: + pkgs_tested.add("%s-%s" % (pkg.name, pkg.candidateVersion)) + statusfile.flush() + failures.flush() + + # all done, stop the backend + backend.stop() + diff -Nru update-manager-17.10.11/AutoUpgradeTester/auto-upgrade-tester update-manager-0.156.14.15/AutoUpgradeTester/auto-upgrade-tester --- update-manager-17.10.11/AutoUpgradeTester/auto-upgrade-tester 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/auto-upgrade-tester 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,383 @@ +#!/usr/bin/python -u +# "-u": Force stdin, stdout and stderr to be totally unbuffered. +# To get more accurate log files +# +# see also +# http://www.faqts.com/knowledge_base/entry/versions/index.phtml?aid=4419 + +import datetime +import glob +import logging +import multiprocessing +import os +import shutil +import sys +import time +import subprocess +from ConfigParser import SafeConfigParser + +# check if we run from a bzr checkout +if os.path.exists("./UpgradeTestBackend.py"): + sys.path.insert(0, "../") + +from optparse import OptionParser +from AutoUpgradeTester.UpgradeTestBackend import UpgradeTestBackend + +# bigger exitcode means more problematic error, +# exitcode 101 means generic error +class FailedToBootstrapError(Exception): + """ Failed to initial bootstrap the test system """ + exitcode = 99 + +class FailedToUpgradeError(Exception): + """ Failed to upgrade the test system """ + exitcode = 98 + +class FailedPostUpgradeTestError(Exception): + """ Some post upgrade tests failed """ + exitcode = 97 + +class OutputThread(multiprocessing.Process): + def __init__(self, filename): + multiprocessing.Process.__init__(self) + self.file = os.open(filename, os.O_RDONLY) + def run(self): + while True: + # the read() seems to not block for some reason + # but return "" ?!? + s = os.read(self.file, 1024) + if s: + print s, + else: + time.sleep(0.1) + +# FIXME: move this into the generic backend code +def login(backend): + """ login into a backend """ + backend.bootstrap() + backend.login() + +def createBackend(backend_name, profile): + """ create a backend of the given name for the given profile """ + try: + backend_full_name = "AutoUpgradeTester.%s" % backend_name + backend_modul = __import__(backend_full_name, fromlist="AutoUpgradeTester") + backend_class = getattr(backend_modul, backend_name) + except (ImportError, AttributeError, TypeError), e: + logging.exception("can not import '%s'" % backend_name) + return None + return backend_class(profile) + +class HtmlOutputStream: + HTML_HEADER=r""" + + + + + Auto upgrade tester + + + +

Automatic upgrade tester test results

+ +

Upgrade test started %(date)s

+ + + +""" + + HTML_FOOTER=""" +
ProfileResultBugsDate FinishedRuntimeFull Logs
+

Upgrade test finished %s

+ +""" + + def __init__(self, outputdir=None): + self.html_output = None + if outputdir: + self.outputdir = outputdir + if not os.path.exists(outputdir): + os.makedirs(outputdir) + self.html_output = open(os.path.join(outputdir, "index.html"), "w") + def write(self, s): + if self.html_output: + self.html_output.write(s) + self.html_output.flush() + def copy_results_and_add_table_link(self, profile_name, resultdir): + if not self.html_output: + return + # copy logs & sanitize permissions + targetdir = os.path.join(self.outputdir, profile_name) + html_output.copytree(resultdir, targetdir) + for f in glob.glob(targetdir+"/*"): + os.chmod(f, 0644) + # write html line that links to output dir + s = "Logs for %(profile)s test" % { + 'logdir' : profile_name, + 'profile': profile_name, } + html_output.write(s) + def copytree(self, src, dst): + if self.html_output: + shutil.copytree(src, dst) + def write_html_header(self, time_started): + self.write(self.HTML_HEADER % { 'date' : time_started }) + def write_html_footer(self): + self.write(self.HTML_FOOTER % datetime.datetime.now()) + +def testUpgrade(backend_name, profile, add_pkgs, quiet=False, + html_output=HtmlOutputStream()): + """ test upgrade for the given backend/profile """ + backend = createBackend(backend_name, profile) + assert(backend != None) + if not os.path.exists(profile): + print "ERROR: Can't find '%s' " % profile + html_output.write("Can't find profile '%s'" % profile) + html_output.write(4*"") + return 2 + print "Storing the result in '%s'" % backend.resultdir + profile_name = os.path.split(os.path.normpath(profile))[1] + # setup output + outfile = os.path.join(backend.resultdir, "bootstrap.log") + fd = os.open(outfile, os.O_WRONLY|os.O_CREAT|os.O_TRUNC, 0644) + out = OutputThread(outfile) + out.daemon = True + if not quiet: + out.start() + old_stdout = os.dup(1) + old_stderr = os.dup(2) + os.dup2(fd, 1) + os.dup2(fd, 2) + time_started = datetime.datetime.now() + print "%s log started" % time_started + result = 0 + try: + # write what we working on + html_output.write("%s" % profile_name) + # init + if not backend.bootstrap(): + print "FAILED: bootstrap for '%s'" % profile + html_output.write("Failed to bootstrap") + raise FailedToBootstrapError("Failed to bootstrap '%s'" % profile) + if add_pkgs: + if not backend.installPackages(add_pkgs): + print "FAILED: installPacakges '%s'" % add_pkgs + html_output.write("Failed to add pkgs '%s'" % ",".join(add_pkgs)) + raise Exception, "Failed to install packages '%s'" % add_pkgs + if not backend.upgrade(): + print "FAILED: upgrade for '%s'" % profile + html_output.write("Failed to upgrade") + raise FailedToUpgradeError("Failed to upgrade %s" % profile) + if not backend.test(): + print "FAILED: test for '%s'" % profile + html_output.write("Upgraded, but post upgrade test failed") + raise FailedPostUpgradeTestError("Failed in post upgrade test %s" % profile) + print "profile: %s worked" % profile + html_output.write("ok") + except (FailedToBootstrapError, FailedToUpgradeError, FailedPostUpgradeTestError) as e: + print e + result = e.exitcode + except Exception, e: + import traceback + traceback.print_exc() + print "Caught exception in testUpgrade for '%s' (%s)" % (profile, e) + html_output.write("Unknown failure (should not happen)") + result = 2 + finally: + # print out result details + print "Logs can be found here:" + for n in ["bootstrap.log", "main.log", "apt.log"]: + print " %s/%s" % (backend.resultdir, n) + + time_ended = datetime.datetime.now() + print "%s log ended." % time_ended + print "Duration: %s" % (time_ended - time_started) + + # give the output time to settle and kill the daemon + time.sleep(2) + if out.is_alive(): + out.terminate() + out.join() + # write result line + s="%(date)s%(runtime)s" % { + 'date' : datetime.datetime.now(), + 'runtime' : datetime.datetime.now() - time_started} + html_output.write(s) + html_output.copy_results_and_add_table_link(profile_name, backend.resultdir) + html_output.write("") + # close and restore file descriptors + os.close(fd) + os.dup2(old_stdout, 1) + os.dup2(old_stderr, 2) + return result + +def profileFromAptClone(aptclonefile): + """ Create a profile from an apt-clone archive + + :param aptclonefile: Path to an apt-clone archive + :return: path to profile or None if it fails to recognize the clone file + """ + profile = None + try: + cmd = ('apt-clone', 'info', aptclonefile) + output = subprocess.check_output(cmd) + clone_properties = {} + for k, v in [ line.split(': ') for line in output.split('\n') if ': ' in line]: + clone_properties[k] = v + try: + clone_date = datetime.datetime.strptime(clone_properties['Date'], '%c').strftime('_%Y%m%d-%H%M%S') + except: + clone_date = '' + profilename = "%s_%s_%s%s" % ( + clone_properties['Distro'], + clone_properties['Arch'], + clone_properties['Hostname'], + clone_date) + + # Generate configuration file for this profile + # FIXME: + # update packaging to grant write access on base for upgrade-tester user + ppath = 'profile' if os.path.exists("./UpgradeTestBackend.py") else base + profile = os.path.join(ppath, profilename) + profilecfg = SafeConfigParser() + if not os.path.exists(profile): + os.makedirs(profile) + + profilecfg.set('DEFAULT', 'SourceRelease', clone_properties['Distro']) + profilecfg.add_section('NonInteractive') + profilecfg.set('NonInteractive', 'ProfileName', profilename) + profilecfg.set('NonInteractive', 'AptcloneFile', os.path.abspath(aptclonefile)) + profilecfg.add_section('KVM') + profilecfg.set('KVM', 'Arch', clone_properties['Arch']) + with open(os.path.join(profile, 'DistUpgrade.cfg'), 'wb') as profilefile: + profilecfg.write(profilefile) + + except subprocess.CalledProcessError: + return None + + return profile + +if __name__ == "__main__": + logging.basicConfig(level=logging.INFO) + + parser = OptionParser() + parser.add_option("--additinoal", "--additional-pkgs", dest="add_pkgs", + default="", + help="add additional pkgs before running the upgrade") + parser.add_option("-a", "--auto", dest="auto", default=False, + action="store_true", + help="run all tests in profile/ dir") + parser.add_option("--bootstrap-only", "--bootstrap-only",dest="bootstrap_only", + default=False, + action="store_true", + help="only bootstrap the image") + parser.add_option("--tests-only", "", default=False, + action="store_true", + help="only run post_upgrade_tests in the image") + parser.add_option("-l", "--login", dest="login", default=False, + action="store_true", + help="log into the a profile") + parser.add_option("-b", "--backend", dest="backend", + default="UpgradeTestBackendQemu", + help="UpgradeTestBackend to use: UpgradeTestBackendChroot, UpgradeTestBackendQemu") + parser.add_option("-d", "--diff", dest="gen_diff", + default=False, action="store_true", + help="generate a diff of the upgraded image versus a fresh installed image") + parser.add_option("--quiet", "--quiet", default=False, action="store_true", + help="quiet operation") + parser.add_option("", "--html-output-dir", default=None, + help="html output directory") + + (options, args) = parser.parse_args() + + # save for later + fd1 = os.dup(1) + fd2 = os.dup(2) + + # FIXME: move this to a configuration + base="/usr/share/auto-upgrade-tester/profiles/" + # check if we have something to do + profiles = args + if not profiles and not options.auto: + print sys.argv[0] + print "No profile specified, available default profiles:" + print "\n".join(os.listdir(base)) + print + print "Or use '-a' for 'auto' mode" + sys.exit(1) + + # generic + res = 0 + add_pkgs = [] + if options.add_pkgs: + add_pkgs = options.add_pkgs.split(",") + # auto mode + if options.auto: + print "running in auto-mode" + for d in os.listdir(base): + os.dup2(fd1, 1) + os.dup2(fd2, 2) + print "Testing '%s'" % d + res = max(res, testUpgrade(options.backend, base+d, add_pkgs)) + sys.exit(res) + # profile mode, test the given profiles + time_started = datetime.datetime.now() + + # clean output dir + html_output = HtmlOutputStream(options.html_output_dir) + html_output.write_html_header(time_started) + for profile in profiles: + + # case of an apt-clone archive + if os.path.isfile(profile): + profilename = profileFromAptClone(profile) + if not profilename: + print "File is not a valid apt-clone image: %s" % profilename + continue + profile = profilename + print "Using generated profile: %s" % profile + + if not "/" in profile: + profile = base + profile + try: + if options.login: + backend = createBackend(options.backend, profile) + login(backend) + elif options.bootstrap_only: + backend = createBackend(options.backend, profile) + backend.bootstrap(force=True) + elif options.tests_only: + backend = createBackend(options.backend, profile) + backend.test() + elif options.gen_diff: + backend = createBackend(options.backend, profile) + backend.genDiff() + else: + print "Testing '%s'" % profile + now = datetime.datetime.now() + current_res = testUpgrade(options.backend, profile, + add_pkgs, options.quiet, + html_output) + if current_res == 0: + print "Profile '%s' worked" % profile + else: + print "Profile '%s' FAILED" % profile + res = max(res, current_res) + except Exception, e: + import traceback + print "ERROR: exception caught '%s' " % e + html_output.write('
unhandled ERROR %s:\n%s
' % (e, traceback.format_exc())) + traceback.print_exc() + if hasattr(e, "exitcode"): + res = max(res, e.exitcode) + else: + res = max(res, 101) + html_output.write_html_footer() + + # return exit code + sys.exit(res) diff -Nru update-manager-17.10.11/AutoUpgradeTester/auto-upgrade-tester-jenkins-slave update-manager-0.156.14.15/AutoUpgradeTester/auto-upgrade-tester-jenkins-slave --- update-manager-17.10.11/AutoUpgradeTester/auto-upgrade-tester-jenkins-slave 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/auto-upgrade-tester-jenkins-slave 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,60 @@ +#!/usr/bin/python +# +# Copyright (C) 2010, Canonical Ltd (http://www.canonical.com/) +# +# This file is part of ubuntu-server-iso-testing. +# +# ubuntu-server-iso-testing is free software: you can redistribute it +# and/or modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation, either version 3 of +# the License, or (at your option) any later version. +# +# ubuntu-server-iso-testing is distributed in the hope that it will +# be useful, but WITHOUT ANY WARRANTY; without even the implied warranty +# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ubuntu-server-iso-testing. If not, see +# . +# + +import logging +import optparse +import os +import urllib +import sys +import subprocess +import socket + +usage="usage: %prog [options] HUDSON_URL" +parser = optparse.OptionParser(usage=usage) +parser.add_option("-d", "--debug", dest="debug", action="store_true", default=False, + help="enable debugging") +parser.add_option("-n", "--nodename", dest="nodename", default=socket.gethostname(), + help="hostname to use when registering with hudson (default=hostname)") +(options, args) = parser.parse_args() + +if len(args) == 0: + logging.error("Need a HUDSON_URL to execute") + parser.print_help() + sys.exit(1) + +if options.debug: + logging.basicConfig(level=logging.DEBUG) +else: + logging.basicConfig(level=logging.INFO) + +HUDSON_URL=args[0] +HUDSON_PATH="/computer/%s/slave-agent.jnlp" +SLAVE_URL=HUDSON_URL + 'jnlpJars/slave.jar' +SLAVE_JAR=os.path.expanduser("~/.slave.jar") + +l_hudson_url= HUDSON_URL + HUDSON_PATH % options.nodename + +logging.debug("Retrieving hudson slave.jar") +urllib.urlretrieve(SLAVE_URL, SLAVE_JAR) + +cmd = [ 'java','-jar', SLAVE_JAR, '-jnlpUrl', l_hudson_url ] +logging.debug("Cmd: %s" % (cmd)) +subprocess.check_call(cmd) diff -Nru update-manager-17.10.11/AutoUpgradeTester/chart_dpkg_progress.py update-manager-0.156.14.15/AutoUpgradeTester/chart_dpkg_progress.py --- update-manager-17.10.11/AutoUpgradeTester/chart_dpkg_progress.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/chart_dpkg_progress.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,51 @@ +#!/usr/bin/python + + +import sys +import string +from heapq import heappush, heappop + +if __name__ == "__main__": + + start_time = 0.0 + last_time = 0.0 + total_time = 0.0 + pkgs = {} + last_pkgname = None + + log = open(sys.argv[1]) + for line in map(string.strip, log): + line_data = line.split(":") + + # special cases + if line_data[1].strip() == "Start": + start_time = float(line_data[0]) + continue + elif line_data[1].strip() == "Finished": + total_time = float(line_data[0]) - start_time + continue + + # we have a real pkg here + current_time = float(line_data[0]) + pkgname = line_data[2] + + # special cases + if not last_time: + last_time = current_time + if not pkgname in pkgs: + pkgs[pkgname] = 0 + + # add up time + if last_pkgname: + pkgs[last_pkgname] += (current_time-last_time) + last_time = current_time + last_pkgname = pkgname + + + # put into heap and output by time it takes + heap = [] + for pkg in pkgs: + heappush(heap, (pkgs[pkg], pkg)) + while heap: + print "%.6ss: %s" % heappop(heap) + print "total: %4.7ss %4.6sm" % (total_time, total_time/60) diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/additional_pkgs.cfg update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/additional_pkgs.cfg --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/additional_pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/additional_pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,2 @@ +build-essential +devscripts \ No newline at end of file diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/apt-autoinst-fixup.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/apt-autoinst-fixup.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/apt-autoinst-fixup.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/apt-autoinst-fixup.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,71 @@ +#!/usr/bin/python + +import sys +import os + +import warnings +warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning) +import apt +import apt_pkg +import logging + +logging.basicConfig(level=logging.DEBUG, + filename="/var/log/dist-upgrade/apt-autoinst-fixup.log", + format='%(asctime)s %(levelname)s %(message)s', + filemode='w') + +cache = apt.Cache() + +min_version = "0.6.20ubuntu13" +if apt_pkg.VersionCompare(cache["python-apt"].installedVersion, min_version) < 0: + logging.error("Need at least python-apt version %s " % min_version) + sys.exit(1) + + +# figure out what needs fixup +logging.debug("Starting to check for auto-install states that need fixup") +need_fixup = set() + +# work around #105663 +need_fixup.add("mdadm") + +for pkg in cache: + if pkg.is_installed and pkg.section == "metapackages": + logging.debug("Found installed meta-pkg: '%s' " % pkg.name) + dependsList = pkg._pkg.CurrentVer.DependsList + for t in ["Depends","PreDepends","Recommends"]: + if dependsList.has_key(t): + for depOr in dependsList[t]: + for dep in depOr: + depname = dep.TargetPkg.Name + if (cache[depname].is_installed and + cache._depcache.is_auto_installed(cache[depname]._pkg)): + logging.info("Removed auto-flag from package '%s'" % depname) + need_fixup.add(depname) + +# now go through the tagfile and actually fix it up +if len(need_fixup) > 0: + # action is set to zero (reset the auto-flag) + action = 0 + STATE_FILE = apt_pkg.Config.FindDir("Dir::State") + "extended_states" + # open the statefile + if os.path.exists(STATE_FILE): + tagfile = apt_pkg.ParseTagFile(open(STATE_FILE)) + outfile = open(STATE_FILE+".tmp","w") + while tagfile.Step(): + pkgname = tagfile.Section.get("Package") + autoInst = tagfile.Section.get("Auto-Installed") + if pkgname in need_fixup: + newsec = apt_pkg.RewriteSection(tagfile.Section, + [], + [ ("Auto-Installed",str(action)) ] + ) + outfile.write(newsec+"\n") + else: + outfile.write(str(tagfile.Section)+"\n") + os.rename(STATE_FILE, STATE_FILE+".fixup-save") + os.rename(outfile.name, STATE_FILE) + os.chmod(STATE_FILE, 0644) + + + diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/build-dist.sh update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/build-dist.sh --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/build-dist.sh 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/build-dist.sh 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,53 @@ +#!/bin/sh + +# build a tarball that is ready for the upload. the format is +# simple, it contans: +# $version/$dist.tar.gz +# $version/ReleaseNotes +# this put into a file called "$dist-upgrader_$version.tar.gz" + + +TARGETDIR=../dist-upgrade-build +SOURCEDIR=`pwd` +DIST=feisty +MAINTAINER="Michael Vogt " +NOTES=ReleaseAnnouncement +version=$(cd ..;LC_ALL=C dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p' | sed s/.*://) + +# create targetdir +if [ ! -d $TARGETDIR/$version ]; then + mkdir -p $TARGETDIR/$version +fi + +#build the actual dist-upgrader tarball +./build-tarball.sh + +# how move it into a container including the targetdir (with version) +# and ReleaeNotes +cd $TARGETDIR/$version +cp $SOURCEDIR/$NOTES . +cp $SOURCEDIR/$DIST.tar.gz . +cd .. + +# build it +TARBALL="dist-upgrader_"$version"_all.tar.gz" +tar czvf $TARBALL $version + +# now create a changes file +CHANGES="dist-upgrader_"$version"_all.changes" +echo > $CHANGES +echo "Origin: Ubuntu/$DIST" >> $CHANGES +echo "Format: 1.7" >> $CHANGES +echo "Date: `date -R`" >> $CHANGES +echo "Architecture: all">>$CHANGES +echo "Version: $version" >>$CHANGES +echo "Distribution: $DIST" >>$CHANGES +echo "Source: dist-upgrader" >> $CHANGES +echo "Binary: dist-upgrader" >> $CHANGES +echo "Urgency: low" >> $CHANGES +echo "Maintainer: $MAINTAINER" >> $CHANGES +echo "Changed-By: $MAINTAINER" >> $CHANGES +echo "Changes: " >> $CHANGES +echo " * new upstream version" >> $CHANGES +echo "Files: " >> $CHANGES +echo " `md5sum $TARBALL | awk '{print $1}'` `stat --format=%s $TARBALL` raw-dist-upgrader - $TARBALL" >> $CHANGES diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/build-exclude.txt update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/build-exclude.txt --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/build-exclude.txt 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/build-exclude.txt 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,9 @@ +./backports +./profile +./result +./tarball +./toChroot +./automatic-upgrade-testing +./build-exclude.txt +./ChrootNonInteractive.py +./install_all.py \ No newline at end of file diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/build-tarball.sh update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/build-tarball.sh --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/build-tarball.sh 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/build-tarball.sh 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,35 @@ +#!/bin/sh + +set -e + +DIST=$(lsb_release -c -s) + +# cleanup +echo "Cleaning up" + +for d in ./ plugins/ computerjanitor/; do + rm -f $d/*~ $d/*.bak $d/*.pyc $d/*.moved $d/'#'* $d/*.rej $d/*.orig +done + +#sudo rm -rf backports/ profile/ result/ tarball/ *.deb + +# automatically generate codename for the distro in the +# cdromupgrade script +sed -i s/^CODENAME=.*/CODENAME=$DIST/ cdromupgrade + +# update po and copy the mo files +(cd ../po; make update-po) +cp -r ../po/mo . + +# make symlink +if [ ! -h $DIST ]; then + ln -s dist-upgrade.py $DIST +fi + +# copy nvidia obsoleted drivers data +cp /usr/share/nvidia-common/obsolete nvidia-obsolete.pkgs + +# create the tarball, copy links in place +tar -c -h -z -v --exclude=$DIST.tar.gz --exclude=$0 -X build-exclude.txt -f $DIST.tar.gz ./* + + diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/cdromupgrade update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/cdromupgrade --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/cdromupgrade 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/cdromupgrade 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,40 @@ +#!/bin/sh +# +# "cdromupgrade" is a shell script wrapper around the dist-upgrader +# to make it possible to put it onto the top-level dir of a CD and +# run it from there +# +# Not that useful unfortunately when the CD is mounted "noexec". +# + +# the codename is AUTO-GENERATED from the build-host relase codename +CODENAME=precise +UPGRADER_DIR=dists/$CODENAME/main/dist-upgrader/binary-all/ + +# this script can be called in three ways: +# sh /cdrom/cdromugprade +# sh ./cdromupgrade +# sh cdromupgrade +# the sh below is needed to figure out the cdromdirname +case "$0" in +/*) cddirname="${0%\/*}" ;; +*/*) cddirname="$(pwd)/${0%\/*}" ;; +*) cddirname="$(pwd)/" ;; +esac + +fullpath="$cddirname/$UPGRADER_DIR" + +# extract the tar to a TMPDIR and run it from there +if [ ! -f "$fullpath/$CODENAME.tar.gz" ]; then + echo "Could not find the upgrade application archive, exiting" + exit 1 +fi + +TMPDIR=$(mktemp -d) +cd $TMPDIR +tar xzf "$fullpath/$CODENAME.tar.gz" +if [ ! -x $TMPDIR/$CODENAME ]; then + echo "Could not find the upgrade application in the archive, exiting" + exit 1 +fi +$TMPDIR/$CODENAME --cdrom "$cddirname" $@ diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/Changelog update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/Changelog --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/Changelog 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/Changelog 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,188 @@ +2007-02-14: + - automatically generate the .py file from the .ui files +2007-02-14: + - fix the $dist-proposed handling + - fix in $dist-commercial handling (LP#66783) + - updated demotions +2007-02-13: + - fix in the reboot code (lp: #84538) + - make some string more distro neutral +2007-02-07: + - add support for the cdrom upgrader to update itself +2007-02-05: + - use the new python-apt aptsources api + - server mode has magic to deal with runing under ssh +2007-02-02: + - merged the KDE frontend (thanks Riddell) + - added tasks support + - add dist-upgrade --mode=server +2007-02-01: + - fix apport integration +2007-01-29: + - fixes in the InstallProgress.error() method + - DistUpgrade/DistUpgradeView.py: fix InstallProgress refactoring + - updated obsoletes + - auto-generate the codename for the upgrade based on the build-system coden (lp: #77620) + - various bugfixes + - apport support +2006-12-12: + - rewrote the _checkFreeSpace() and add better checking + for /boot (#70683) +2006-11-28: + - add quirks rule to install ndiswrapper-utils-1.9 if 1.8 is + installed +2006-11-27: + - fix caption in main glade file + - use "Dpkg::StopOnError","False" option +2006-11-23: + - initial feisty upload +2006-10-28: + - catch errors when load_icon() does not work +2006-10-27: + - reset self.read so that we do not loop endlessly when dpkg + sends unexpected data (lp: #68553) +2006-10-26: + - make sure that xserver-xorg-video-all get installed if + xserver-xorg-driver-all was installed before (lp: #58424) +2006-10-21: + - comment out old cdrom sources + - demotions updated +2006-10-21: + - fix incorrect arguments in fixup logging (lp: #67311) + - more error logging + - fix upgrade problems for people with unofficial compiz + repositories (lp: #58424) + - rosetta i18n updates + - uploaded +2006-10-17: + - ensure bzr, tomboy and xserver-xorg-input-* are properly + upgraded + - don't fail if dpkg sents unexpected status lines (lp: #66013) +2006-10-16: + - remove leftover references to ubuntu-base and + use ubuntu-minimal and ubuntu-standard instead + - updated translations from rosetta +2006-10-13: + - log held-back as well +2006-10-12: + - check if cdrom.lst actually exists before copying it +2006-10-11: + - keep pixbuf loader reference around so that we + have one after the upgrade when the old + /usr/lib/gtk-2.0/loader/2.4.0/ loader is gone. + This fixes the problem of missing stock-icons + after the upgrade. Also revalidate the theme + in each step. +2006-10-10: + - fix time calculation + - fix kubuntu upgrade case +2006-10-06: + - fix source.list rewrite corner case bug (#64159) +2006-10-04: + - improve the space checking/logging +2006-09-29: + - typo fix (thanks to Jane Silber) (lp: #62946) +2006-09-28: + - bugfix in the cdromupgrade script +2006-09-27: + - uploaded a version that only reverts the backport fetching + but no other changes compared to 2006-09-23 +2006-09-27: + - embarrassing bug cdromupgrade.sh +2006-09-26: + - comment out the getRequiredBackport code because we will + not use Breaks for the dapper->edgy upgrade yet + (see #54234 for the rationale) + - updated demotions.cfg for dapper->edgy + - special case the packages affected by the Breaks changes + - make sure that no translations get lost during the upgrade + (thanks to mdz for pointing this out) + - bugfixes +2006-09-23: + - support fetching backports of selected packages first and + use them for the upgrade (needed to support Breaks) + - fetch/use apt/dpkg/python-apt backports for the upgrade +2006-09-06: + - increased the "free-space-savety-buffer" to 100MB +2006-09-05: + - added "RemoveEssentialOk" option and put "sysvinit" into it +2006-09-04: + - set Debug::pkgDepCache::AutoInstall as debug option too + - be more robust against failure from the locales + - remove libgl1-mesa (no longer needed on edgy) +2006-09-03: + - fix in the cdromupgrade script path detection +2006-09-01: + - make the cdromupgrade wrapper work with the compressed version + of the upgrader as put onto the CD + - uploaded +2006-08-30: + - fixes to the cdromupgrade wrapper +2006-08-29: + - always enable the "main" component to make sure it is available + - add download estimated time + - add --cdrom switch to make cdrom based dist-upgrades possible + - better error reporting + - moved the logging into the /var/log/dist-upgrade/ dir + - change the obsoletes calculation when run without network and + consider demotions as obsoletes then (because we can't really + use the "pkg.downloadable" hint without network) + - uploaded +2006-08-18: + - sort the demoted software list +2006-07-31: + - updated to edgy + - uploadedd +2006-05-31: + - fix bug in the free space calculation (#47092) + - updated ReleaseAnnouncement + - updated translations + - fix a missing bindtextdomain + - fix a incorrect ngettext usage + - added quirks handler to fix nvidia-glx issue (#47017) + Thanks to the amazing Kiko for helping improve this! +2006-05-24: + - if the initial "update()" fails, just exit, don't try + to restore the old sources.list (nothing was modified yet) + Ubuntu: #46712 + - fix a bug in the sourcesList rewriting (ubuntu: #46245) + - expand the terminal when no libgnome2-perl is installed + because debconf might want to ask questions (ubuntu: #46214) + - disable the breezy cdrom source to make removal of demoted + packages work properly (ubuntu: #46336) + - translations updated from rosetta + - fixed a bug in the demotions calculation (ubuntu: #46245) + - typos fixed and translations unfuzzied (ubuntu: #46792,#46464) + - upload +2006-05-12: + - space checking improved (ubuntu: #43948) + - show software that was demoted from main -> universe + - improve the remaining time reporting + - translation updates + - upload +2006-05-09: + - upload +2006-05-08: + - fix error when asking for media-change (ubuntu: 43442,43728) +2006-05-02: + - upload +2006-04-28: + - add more sanity checking, if no valid mirror is found in the + sources.list ask for "dumb" rewrite + - if nothing valid was found after a dumb rewrite, add official + sources + - don't report install TIMEOUT over and over in the log + - report what package caused a install TIMEOUT +2006-04-27: + - add a additonal sanity check after the rewriting of the sources.list + (check for BaseMetaPkgs still in the cache) + - on abort reopen() the cache to force writing a new + /var/cache/apt/pkgcache.bin + - use a much more compelte mirror list (based on the information + from https://wiki.ubuntu.com/Archive) +2006-04-25: + - make sure that DistUpgradeView.getTerminal().call() actually + waits until the command has finished (dpkg --configure -a) +2006-04-18: + - add logging to the sources.list modification code + - general logging improvements (thanks to Xavier Poinsard) diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/cruft.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/cruft.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/cruft.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/cruft.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,138 @@ +# cruft.py - base class for different kinds of cruft +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import computerjanitor + + +class Cruft(object): + + """One piece of cruft to be cleaned out. + + A piece of cruft can be a file, a package, a configuration tweak + that is missing, or something else. + + This is a base class, which does nothing. Subclasses do the + actual work. + + """ + + def get_prefix(self): + """Return the unique prefix used to group this type of cruft. + + For example, the .deb package called 'foo' would have a prefix + of 'deb'. This way, the package foo is not confused with the + file foo, or the username foo. + + Subclasses SHOULD define this. The default implementation + returns the name of the class, which is rarely useful to + the user. + + """ + + return self.__class__.__name__ + + def get_prefix_description(self): + """Return human-readable description of class of cruft.""" + return self.get_description() + + def get_shortname(self): + """Return the name of this piece of cruft. + + The name should be something that the user will understand. + For example, it might be the name of a package, or the full + path to a file. + + The name should be unique within the unique prefix returned + by get_prefix. The prefix MUST NOT be included by this method, + the get_name() method does that instead. The intent is that + get_shortname() will be used by the user interface in contexts + where the prefix is shown separately from the short name, + and get_name() when a single string is used. + + Subclasses MUST define this. The default implementation + raises an exception. + + """ + + raise computerjanitor.UnimplementedMethod(self.get_shortname) + + def get_name(self): + """Return prefix plus name. + + See get_prefix() and get_shortname() for a discussion of + the prefix and the short name. This method will return + the prefix, a colon, and the short name. + + The long name will used to store state/configuration data: + _this_ package should not be removed. + + """ + + return "%s:%s" % (self.get_prefix(), self.get_shortname()) + + def get_description(self): + """Return a description of this piece of cruft. + + This may be arbitrarily long. The user interface will take + care of breaking it into lines or otherwise presenting it to + the user in a nice manner. The description should be plain + text, in UTF-8. + + The default implementation returns the empty string. Subclasses + MAY override this as they wish. + + """ + + return "" + + def get_disk_usage(self): + """Return amount of disk space reserved by this piece of cruft. + + The unit is bytes. + + The disk space in question should be the amount that will be + freed if the cruft is cleaned up. The amount may be an estimate + (read: guess). It is intended to be shown to the user to help + them decide what to remove and what to keep. + + This will also be used by the user interface to better + estimate how much remaining time there is when cleaning + up a lot of cruft. + + For some types of cruft, this is not applicable and they should + return None. The base class implementation does that, so + subclasses MUST define this method if it is useful for them to + return something else. + + The user interface will distinguish between None (not + applicable) and 0 (no disk space being used). + + """ + + return None + + def cleanup(self): + """Clean up this piece of cruft. + + Depending on the type of cruft, this may mean removing files, + packages, modifying configuration files, or something else. + + The default implementation raises an exception. Subclasses + MUST override this. + + """ + + raise computerjanitor.UnimplementedMethod(self.cleanup) diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/cruft_tests.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/cruft_tests.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/cruft_tests.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/cruft_tests.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,56 @@ +# cruft_tests.py - unit tests for cruft.py +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import unittest + +import computerjanitor + + +class CruftTests(unittest.TestCase): + + def setUp(self): + self.cruft = computerjanitor.Cruft() + + def testReturnsClassNameAsDefaultPrefix(self): + class Mockup(computerjanitor.Cruft): + pass + self.assertEqual(Mockup().get_prefix(), "Mockup") + + def testReturnsEmptyStringAsDefaultPrefixDescription(self): + self.assertEqual(self.cruft.get_prefix_description(), "") + + def testReturnsDescriptionAsDefaultPrefixDescription(self): + self.cruft.get_description = lambda: "foo" + self.assertEqual(self.cruft.get_prefix_description(), "foo") + + def testRaisesErrorForDefaultGetShortname(self): + self.assertRaises(computerjanitor.UnimplementedMethod, + self.cruft.get_shortname) + + def testReturnsCorrectStringForFullName(self): + self.cruft.get_prefix = lambda *args: "foo" + self.cruft.get_shortname = lambda *args: "bar" + self.assertEqual(self.cruft.get_name(), "foo:bar") + + def testReturnsEmptyStringAsDefaultDescription(self): + self.assertEqual(self.cruft.get_description(), "") + + def testReturnsNoneForDiskUsage(self): + self.assertEqual(self.cruft.get_disk_usage(), None) + + def testRaisesErrorForDefaultCleanup(self): + self.assertRaises(computerjanitor.UnimplementedMethod, + self.cruft.cleanup) diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/exc.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/exc.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/exc.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/exc.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,30 @@ +# exc.py - exceptions for computerjanitor +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import computerjanitor +_ = computerjanitor.setup_gettext() + + +class ComputerJanitorException(Exception): + + def __str__(self): + return self._str + + +class UnimplementedMethod(ComputerJanitorException): + + def __init__(self, method): + self._str = _("Unimplemented method: %s") % str(method) diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/exc_tests.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/exc_tests.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/exc_tests.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/exc_tests.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,34 @@ +# exc_tests.py - unit tests for exc.py +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import unittest + +import computerjanitor + + +class ComputerJanitorExceptionTests(unittest.TestCase): + + def testReturnsStrCorrectly(self): + e = computerjanitor.Exception() + e._str = "pink" + self.assertEqual(str(e), "pink") + + +class UnimplementedMethodTests(unittest.TestCase): + + def testErrorMessageContainsMethodName(self): + e = computerjanitor.UnimplementedMethod(self.__init__) + self.assert_("__init__" in str(e)) \ No newline at end of file diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/file_cruft.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/file_cruft.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/file_cruft.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/file_cruft.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,58 @@ +# file_cruft.py - implementation of file cruft +# Copyright (C) 2008, 2009 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import os + +import computerjanitor +_ = computerjanitor.setup_gettext() + + +class FileCruft(computerjanitor.Cruft): + + """Cruft that is individual files. + + This type of cruft consists of individual files that should be + removed. Various plugins may decide that various files are cruft; + they can all use objects of FileCruft type to mark such files, + regardless of the reason the files are considered cruft. + + When FileCruft instantiated, the file is identified by a pathname. + + """ + + def __init__(self, pathname, description): + self.pathname = pathname + st = os.stat(pathname) + self.disk_usage = st.st_blocks * 512 + self.description = description + + def get_prefix(self): + return "file" + + def get_prefix_description(self): + return _("A file on disk") + + def get_shortname(self): + return self.pathname + + def get_description(self): + return "%s\n" % self.description + + def get_disk_usage(self): + return self.disk_usage + + def cleanup(self): + os.remove(self.pathname) diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/file_cruft_tests.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/file_cruft_tests.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/file_cruft_tests.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/file_cruft_tests.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,63 @@ +# file_cruft_tests.py - unit tests for file_cruft.py +# Copyright (C) 2008, 2009 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import os +import subprocess +import tempfile + +import unittest + +import computerjanitor + + +class FileCruftTests(unittest.TestCase): + + def setUp(self): + fd, self.pathname = tempfile.mkstemp() + os.write(fd, "x" * 1024) + os.close(fd) + self.cruft = computerjanitor.FileCruft(self.pathname, "description") + + def tearDown(self): + if False and os.path.exists(self.pathname): + os.remove(self.pathname) + + def testReturnsCorrectPrefix(self): + self.assertEqual(self.cruft.get_prefix(), "file") + + def testReturnsCorrectPrefixDescription(self): + self.assertEqual(self.cruft.get_prefix_description(), "A file on disk") + + def testReturnsCorrectShortname(self): + self.assertEqual(self.cruft.get_shortname(), self.pathname) + + def testReturnsCorrectName(self): + self.assertEqual(self.cruft.get_name(), "file:%s" % self.pathname) + + def testReturnsCorrectDescription(self): + self.assertEqual(self.cruft.get_description(), "description\n") + + def testReturnsCorrectDiskUsage(self): + p = subprocess.Popen(["du", "-s", "-B", "1", self.pathname], + stdout=subprocess.PIPE) + stdout, stderr = p.communicate() + du = int(stdout.splitlines()[0].split("\t")[0]) + self.assertEqual(self.cruft.get_disk_usage(), du) + + def testDeletesPackage(self): + self.assert_(os.path.exists(self.pathname)) + self.cruft.cleanup() + self.assertFalse(os.path.exists(self.pathname)) diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/__init__.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/__init__.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/__init__.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/__init__.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,60 @@ +# __init__.py for computerjanitor +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +VERSION = "1.11" + + +# Set up gettext. This needs to be before the import statements below +# so that if any modules call it right after importing, they find +# setup_gettext. + +def setup_gettext(): + """Set up gettext for a module. + + Return a method to be used for looking up translations. Usage: + + import computerjanitor + _ = computerjanitor.setup_gettext() + + """ + + import gettext + import os + + domain = 'update-manager' + localedir = os.environ.get('LOCPATH', None) + t = gettext.translation(domain, localedir=localedir, fallback=True) + return t.ugettext + + +from cruft import Cruft +from file_cruft import FileCruft +from package_cruft import PackageCruft +from missing_package_cruft import MissingPackageCruft +from exc import ComputerJanitorException as Exception, UnimplementedMethod +from plugin import Plugin, PluginManager + +# reference it here to make pyflakes happy +Cruft +FileCruft +PackageCruft +Exception +UnimplementedMethod +MissingPackageCruft +Plugin +PluginManager + + diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/missing_package_cruft.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/missing_package_cruft.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/missing_package_cruft.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/missing_package_cruft.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,45 @@ +# missing_package_cruft.py - install a missing package +# Copyright (C) 2009 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import computerjanitor +_ = computerjanitor.setup_gettext() + + +class MissingPackageCruft(computerjanitor.Cruft): + + """Install a missing package.""" + + def __init__(self, package, description=None): + self.package = package + self.description = description + + def get_prefix(self): + return "install-deb" + + def get_prefix_description(self): + return _("Install missing package.") + + def get_shortname(self): + return self.package.name + + def get_description(self): + if self.description: + return self.description + else: + return _("Package %s should be installed.") % self.package.name + + def cleanup(self): + self.package.markInstall() diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/missing_package_cruft_tests.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/missing_package_cruft_tests.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/missing_package_cruft_tests.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/missing_package_cruft_tests.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,61 @@ +# missing_package_cruft_tests.py - unit tests for missing_package_cruft.py +# Copyright (C) 2008, 2009 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import unittest + +import computerjanitor + + +class MockAptPackage(object): + + def __init__(self): + self.name = "name" + self.summary = "summary" + self.installedSize = 12765 + self.installed = False + + def markInstall(self): + self.installed = True + + +class MissingPackageCruftTests(unittest.TestCase): + + def setUp(self): + self.pkg = MockAptPackage() + self.cruft = computerjanitor.MissingPackageCruft(self.pkg) + + def testReturnsCorrectPrefix(self): + self.assertEqual(self.cruft.get_prefix(), "install-deb") + + def testReturnsCorrectPrefixDescription(self): + self.assert_("Install" in self.cruft.get_prefix_description()) + + def testReturnsCorrectShortname(self): + self.assertEqual(self.cruft.get_shortname(), "name") + + def testReturnsCorrectName(self): + self.assertEqual(self.cruft.get_name(), "install-deb:name") + + def testReturnsCorrectDescription(self): + self.assert_("name" in self.cruft.get_description()) + + def testSetsDescriptionWhenAsked(self): + pkg = computerjanitor.MissingPackageCruft(self.pkg, "foo") + self.assertEqual(pkg.get_description(), "foo") + + def testInstallsPackage(self): + self.cruft.cleanup() + self.assert_(self.pkg.installed) diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/package_cruft.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/package_cruft.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/package_cruft.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/package_cruft.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,57 @@ +# package_cruft.py - implementation for the package craft +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import computerjanitor +_ = computerjanitor.setup_gettext() + + +class PackageCruft(computerjanitor.Cruft): + + """Cruft that is .deb packages. + + This type of cruft consists of .deb packages installed onto the + system which can be removed. Various plugins may decide that + various packages are cruft; they can all use objects of PackageCruft + type to mark such packages, regardless of the reason the packages + are considered cruft. + + When PackageCruft instantiated, the package is identified by an + apt.Package object. That object is used for all the real operations, + so this class is merely a thin wrapper around it. + + """ + + def __init__(self, pkg, description): + self._pkg = pkg + self._description = description + + def get_prefix(self): + return "deb" + + def get_prefix_description(self): + return _(".deb package") + + def get_shortname(self): + return self._pkg.name + + def get_description(self): + return u"%s\n\n%s" % (self._description, self._pkg.summary) + + def get_disk_usage(self): + return self._pkg.installedSize + + def cleanup(self): + self._pkg.markDelete() diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/package_cruft_tests.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/package_cruft_tests.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/package_cruft_tests.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/package_cruft_tests.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,61 @@ +# package_cruft_tests.py - unit tests for package_cruft.py +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import unittest + +import computerjanitor + + +class MockAptPackage(object): + + def __init__(self): + self.name = "name" + self.summary = "summary" + self.installedSize = 12765 + self.deleted = False + + def markDelete(self): + self.deleted = True + + +class PackageCruftTests(unittest.TestCase): + + def setUp(self): + self.pkg = MockAptPackage() + self.cruft = computerjanitor.PackageCruft(self.pkg, "description") + + def testReturnsCorrectPrefix(self): + self.assertEqual(self.cruft.get_prefix(), "deb") + + def testReturnsCorrectPrefixDescription(self): + self.assertEqual(self.cruft.get_prefix_description(), ".deb package") + + def testReturnsCorrectShortname(self): + self.assertEqual(self.cruft.get_shortname(), "name") + + def testReturnsCorrectName(self): + self.assertEqual(self.cruft.get_name(), "deb:name") + + def testReturnsCorrectDescription(self): + self.assertEqual(self.cruft.get_description(), + "description\n\nsummary") + + def testReturnsCorrectDiskUsage(self): + self.assertEqual(self.cruft.get_disk_usage(), 12765) + + def testDeletesPackage(self): + self.cruft.cleanup() + self.assert_(self.pkg.deleted) diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/plugin.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/plugin.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/plugin.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/plugin.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,184 @@ +# plugin.py - plugin base class for computerjanitor +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import imp +import inspect +import logging +import os + +import computerjanitor +_ = computerjanitor.setup_gettext() + +class Plugin(object): + + """Base class for plugins. + + These plugins only do one thing: identify cruft. See the 'get_cruft' + method for details. + + """ + + def get_condition(self): + if hasattr(self, "_condition"): + return self._condition + else: + return [] + + def set_condition(self, condition): + self._condition = condition + + condition = property(get_condition, set_condition) + + def set_application(self, app): + """Set the Application instance this plugin belongs to. + + This is used by the plugin manager when creating the plugin + instance. In a perfect world, this would be done via the + __init__ method, but since I took a wrong left turn, I ended + up in an imperfect world, and therefore giving the Application + instance to __init__ would mandate that all sub-classes would + have to deal with that explicitly. That is a lot of unnecessary + make-work, which we should avoid. Therefore, we do it via this + method. + + The class may access the Application instance via the + 'app' attribute. + + """ + + self.app = app + + def do_cleanup_cruft(self): # pragma: no cover + """Find cruft and clean it up. + + This is a helper method. + """ + + for cruft in self.get_cruft(): + cruft.cleanup() + self.post_cleanup() + + def get_cruft(self): + """Find some cruft in the system. + + This method MUST return an iterator (see 'yield' statement). + This interface design allows cruft to be collected piecemeal, + which makes it easier to show progress in the user interface. + + The base class default implementation of this raises an + exception. Subclasses MUST override this method. + + """ + + raise computerjanitor.UnimplementedMethod(self.get_cruft) + + def post_cleanup(self): + """Does plugin wide cleanup after the individual cleanup + was performed. + + This is useful for stuff that needs to be proccessed + in batches (e.g. for performance reasons) like package + removal. + """ + pass + + +class PluginManager(object): + + """Class to find and load plugins. + + Plugins are stored in files named '*_plugin.py' in the list of + directories given to the initializer. + + """ + + def __init__(self, app, plugin_dirs): + self._app = app + self._plugin_dirs = plugin_dirs + self._plugins = None + + def get_plugin_files(self): + """Return all filenames in which plugins may be stored.""" + + names = [] + + + for dirname in self._plugin_dirs: + if not os.path.exists(dirname): + continue + basenames = [x for x in os.listdir(dirname) + if x.endswith("_plugin.py")] + logging.debug("Plugin modules in %s: %s" % + (dirname, " ".join(basenames))) + names += [os.path.join(dirname, x) for x in basenames] + + return names + + def _find_plugins(self, module): + """Find and instantiate all plugins in a module.""" + plugins = [] + for dummy, member in inspect.getmembers(module): + if inspect.isclass(member) and issubclass(member, Plugin): + plugins.append(member) + logging.debug("Plugins in %s: %s" % + (module, " ".join(str(x) for x in plugins))) + return [plugin() for plugin in plugins] + + def _load_module(self, filename): + """Load a module from a filename.""" + logging.debug("Loading module %s" % filename) + module_name, dummy = os.path.splitext(os.path.basename(filename)) + f = file(filename, "r") + try: + module = imp.load_module(module_name, f, filename, + (".py", "r", imp.PY_SOURCE)) + except Exception, e: # pragma: no cover + logging.warning("Failed to load plugin '%s' (%s)" % + (module_name, e)) + return None + f.close() + return module + + def get_plugins(self, condition=[], callback=None): + """Return all plugins that have been found. + + If callback is specified, it is called after each plugin has + been found, with the following arguments: filename, index of + filename in list of files to be examined (starting with 0), and + total number of files to be examined. The purpose of this is to + allow the callback to inform the user in case things take a long + time. + + """ + + if self._plugins is None: + self._plugins = [] + filenames = self.get_plugin_files() + for i in range(len(filenames)): + if callback: + callback(filenames[i], i, len(filenames)) + module = self._load_module(filenames[i]) + for plugin in self._find_plugins(module): + plugin.set_application(self._app) + self._plugins.append(plugin) + # get the matching plugins + plugins = [p for p in self._plugins + if (p.condition == condition) or + (condition in p.condition) or + (condition == "*") ] + logging.debug("plugins for condition '%s' are '%s'" % + (condition, plugins)) + return plugins diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/plugin_tests.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/plugin_tests.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/computerjanitor/plugin_tests.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/computerjanitor/plugin_tests.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,112 @@ +# plugin_tests.py - unit tests for plugin.py +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import os +import tempfile +import unittest + +import computerjanitor + + +class PluginTests(unittest.TestCase): + + def testGetCruftRaisesException(self): + p = computerjanitor.Plugin() + self.assertRaises(computerjanitor.UnimplementedMethod, p.get_cruft) + + def testPostCleanupReturnsNone(self): + p = computerjanitor.Plugin() + self.assertEqual(p.post_cleanup(), None) + + def testDoesNotHaveAppAttributeByDefault(self): + p = computerjanitor.Plugin() + self.assertFalse(hasattr(p, "app")) + + def testSetApplicationSetsApp(self): + p = computerjanitor.Plugin() + p.set_application("foo") + self.assertEqual(p.app, "foo") + + def testSetsRequiredConditionToNoneByDefault(self): + p = computerjanitor.Plugin() + self.assertEqual(p.condition, []) + + +class PluginManagerTests(unittest.TestCase): + + def testFindsNoPluginsInEmptyDirectory(self): + tempdir = tempfile.mkdtemp() + pm = computerjanitor.PluginManager(None, [tempdir]) + plugins = pm.get_plugins() + os.rmdir(tempdir) + self.assertEqual(plugins, []) + + def testFindsOnePluginFileInTestPluginDirectory(self): + pm = computerjanitor.PluginManager(None, ["testplugins"]) + self.assertEqual(pm.get_plugin_files(), + ["testplugins/hello_plugin.py"]) + + def testFindsOnePluginInTestPluginDirectory(self): + pm = computerjanitor.PluginManager(None, ["testplugins"]) + self.assertEqual(len(pm.get_plugins()), 1) + + def testFindPluginsSetsApplicationInPluginsFound(self): + pm = computerjanitor.PluginManager("foo", ["testplugins"]) + self.assertEqual(pm.get_plugins()[0].app, "foo") + + def callback(self, filename, index, count): + self.callback_called = True + + def testCallsCallbackWhenFindingPlugins(self): + pm = computerjanitor.PluginManager(None, ["testplugins"]) + self.callback_called = False + pm.get_plugins(callback=self.callback) + self.assert_(self.callback_called) + + +class ConditionTests(unittest.TestCase): + + def setUp(self): + self.pm = computerjanitor.PluginManager(None, ["testplugins"]) + + class White(computerjanitor.Plugin): + pass + + class Red(computerjanitor.Plugin): + def __init__(self): + self.condition = ["red"] + + class RedBlack(computerjanitor.Plugin): + def __init__(self): + self.condition = ["red","black"] + + self.white = White() + self.red = Red() + self.redblack = RedBlack() + self.pm._plugins = [self.white, self.red, self.redblack] + + def testReturnsOnlyConditionlessPluginByDefault(self): + self.assertEqual(self.pm.get_plugins(), [self.white]) + + def testReturnsOnlyRedPluginWhenConditionIsRed(self): + self.assertEqual(self.pm.get_plugins(condition="red"), [self.red, self.redblack]) + + def testReturnsOnlyRedPluginWhenConditionIsRedAndBlack(self): + self.assertEqual(self.pm.get_plugins(condition=["red","black"]), [self.redblack]) + + def testReturnsEallPluginsWhenRequested(self): + self.assertEqual(set(self.pm.get_plugins(condition="*")), + set([self.white, self.red, self.redblack])) diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/crashdialog.ui update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/crashdialog.ui --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/crashdialog.ui 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/crashdialog.ui 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,142 @@ + + CrashDialog + + + + 0 + 0 + 483 + 483 + + + + + 0 + 0 + + + + Upgrader Crashed + + + false + + + true + + + + + + + + + 0 + 0 + + + + <h2>Upgrade Tool Crashed</h2> + + + Qt::AlignVCenter + + + false + + + + + + + QFrame::HLine + + + QFrame::Sunken + + + + + + + <qt>We're sorry; the upgrade tool crashed. Please file a new bug report at <a href="http://launchpad.net/ubuntu/+source/update-manager">http://launchpad.net/ubuntu/+source/update-manager</a> (do not attach your details to any existing bug) and a developer will attend to the problem as soon as possible. To help the developers understand what went wrong, include the following detail in your bug report, and attach the files /var/log/dist-upgrade/apt.log and /var/log/dist-upgrade/main.log: + + + Qt::AlignVCenter + + + true + + + true + + + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 20 + 20 + + + + + + + + &Close + + + Alt+C + + + true + + + true + + + + + + + + + + + qPixmapFromMimeSource + + kurllabel.h + + + + + crash_close + clicked() + CrashDialog + accept() + + + 20 + 20 + + + 20 + 20 + + + + + diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/demoted.cfg update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/demoted.cfg --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/demoted.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/demoted.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,245 @@ +# demoted packages from oneiric to precise +ajaxterm +asp.net-examples +at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu +cantor +cantor-dbg +cobbler-enlist +couchdb-bin +dcraw +defoma +defoma-doc +desktopcouch +desktopcouch-tools +desktopcouch-ubuntuone +ecosconfig-imx +evolution-couchdb +evolution-couchdb-backend +exiv2 +fortunes-ubuntu-server +g++-4.5-multilib +gamin +gbrainy +gcc-4.4-source +gcc-4.5-multilib +gir1.2-couchdb-1.0 +gir1.2-desktopcouch-1.0 +gnome-desktop-data +gnome-search-tool +jsvc +jython +jython-doc +kaffeine +kaffeine-dbg +kdevelop +kdevelop-data +kdevelop-dev +kdevplatform-dbg +kdevplatform-dev +kdewallpapers +koffice-l10n-ca +koffice-l10n-cavalencia +koffice-l10n-da +koffice-l10n-de +koffice-l10n-el +koffice-l10n-engb +koffice-l10n-es +koffice-l10n-et +koffice-l10n-fr +koffice-l10n-gl +koffice-l10n-hu +koffice-l10n-it +koffice-l10n-ja +koffice-l10n-kk +koffice-l10n-nb +koffice-l10n-nds +koffice-l10n-nl +koffice-l10n-pl +koffice-l10n-pt +koffice-l10n-ptbr +koffice-l10n-ru +koffice-l10n-sv +koffice-l10n-tr +koffice-l10n-uk +koffice-l10n-wa +koffice-l10n-zhcn +koffice-l10n-zhtw +lib32go0 +lib32go0-dbg +lib64go0 +lib64go0-dbg +libaccess-bridge-java +libaccess-bridge-java-jni +libamd2.2.0 +libatspi-dbg +libatspi-dev +libatspi1.0-0 +libbtf1.1.0 +libcamd2.2.0 +libccolamd2.7.1 +libcholmod1.7.1 +libcolamd2.7.1 +libcommons-daemon-java +libcouchdb-glib-1.0-2 +libcouchdb-glib-dev +libcouchdb-glib-doc +libcsparse2.2.3 +libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev +libdesktopcouch-glib-1.0-2 +libdesktopcouch-glib-dev +libdirectfb-1.2-9 +libdirectfb-1.2-9-dbg +libdirectfb-bin +libdirectfb-bin-dbg +libdirectfb-dev +libdirectfb-extra +libdirectfb-extra-dbg +libgamin-dev +libgamin0 +libgdata-cil-dev +libgdict-1.0-6 +libgdict-1.0-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil +libglademm-2.4-1c2a +libglademm-2.4-dbg +libglademm-2.4-dev +libglademm-2.4-doc +libgladeui-1-11 +libgladeui-1-dev +libgmm-dev +libgo0 +libgo0-dbg +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev +libgtkhtml-editor-common +libgtkhtml-editor-dev +libgtkhtml-editor0 +libgtkhtml3.14-19 +libgtkhtml3.14-dbg +libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev +libklu1.1.0 +libldl2.0.1 +libllvm-2.8-ocaml-dev +libllvm-2.9-ocaml-dev +libllvm2.8 +libllvm2.9 +liblpsolve55-dev +libmodplug-dev +libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil +libmozjs185-1.0 +libmozjs185-dev +libmusicbrainz4-dev +libmysql-java +libnotify-cil-dev +libnotify0.4-cil +libofa0 +libofa0-dev +libpg-java +libpod-plainer-perl +libqt4-declarative-shaders +librcps-dev +librcps0 +libreadline-java +libreadline-java-doc +libsac-java +libsac-java-doc +libsac-java-gcj +libsublime-dev +libsuitesparse-dbg +libsuitesparse-dev +libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil +libtextcat-data +libtextcat-dev +libtextcat0 +libts-0.0-0 +libts-0.0-0-dbg +libts-bin +libts-dev +libumfpack5.4.0 +libvala-0.12-0 +libvala-0.12-0-dbg +libxine-dev +libxine1 +libxine1-bin +libxine1-console +libxine1-dbg +libxine1-doc +libxine1-ffmpeg +libxine1-gnome +libxine1-misc-plugins +libxine1-x +linux-wlan-ng +linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime +llvm-2.9 +llvm-2.9-dev +llvm-2.9-doc +llvm-2.9-examples +llvm-2.9-runtime +lp-solve +lp-solve-doc +mono-jay +mono-xsp2 +mono-xsp2-base +myspell-tools +nova-ajax-console-proxy +oxygen-icon-theme-complete +pngquant +python-aptdaemon.gtkwidgets +python-bittorrent +python-central +python-desktopcouch +python-desktopcouch-application +python-desktopcouch-records +python-desktopcouch-recordtypes +python-fontforge +python-gamin +python-indicate +python-smartpm +python-support +python-telepathy +python-xklavier +qt3-designer +squid +squid-common +swift +tomboy +tomcat6-user +tsconf +ttf-lao +ttf-sil-padauk +ttf-unfonts-extra +unionfs-fuse +vala-0.12-doc +valac-0.12 +valac-0.12-dbg +vinagre +x-ttcidfont-conf +xserver-xephyr +zeitgeist-extension-fts diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/demoted.cfg.hardy update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/demoted.cfg.hardy --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/demoted.cfg.hardy 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/demoted.cfg.hardy 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,568 @@ +# demoted packages from hardy to lucid +acpi +adept +analog +app-install-data-edubuntu +aspell-af +aspell-am +aspell-ar +aspell-bg +aspell-bn +aspell-br +aspell-ca +aspell-cs +aspell-cy +aspell-da +aspell-de +aspell-de-alt +aspell-el +aspell-eo +aspell-es +aspell-et +aspell-fa +aspell-fo +aspell-fr +aspell-ga +aspell-gl-minimos +aspell-gu +aspell-he +aspell-hr +aspell-hu +aspell-hy +aspell-is +aspell-it +aspell-ku +aspell-lt +aspell-lv +aspell-ml +aspell-nl +aspell-no +aspell-nr +aspell-ns +aspell-or +aspell-pa +aspell-pl +aspell-pt-br +aspell-pt-pt +aspell-ro +aspell-ru +aspell-sk +aspell-sl +aspell-ss +aspell-st +aspell-sv +aspell-ta +aspell-te +aspell-tn +aspell-ts +aspell-uk +aspell-xh +aspell-zu +atomix +atomix-data +bacula-traymonitor +bicyclerepair +binutils-static +brazilian-conjugate +bug-buddy +capiutils +cgilib +compiz-fusion-plugins-extra +console-tools +console-tools-dev +contacts-snapshot +cpp-4.1 +cpp-4.1-doc +cpp-4.2 +cpp-4.2-doc +cricket +cups-pdf +cupsddk +db4.6-doc +db4.6-util +debtags +denemo +desktop-base +diff-doc +discover1 +dpkg-awk +drdsl +edubuntu-artwork +edubuntu-desktop +edubuntu-desktop-kde +edubuntu-docs +edubuntu-server +elinks +elinks-data +elinks-doc +elisa +emacs22 +emacs22-bin-common +emacs22-common +emacs22-el +emacs22-nox +enigmail +epiphany-browser +epiphany-browser-data +epiphany-browser-dbg +epiphany-browser-dev +epiphany-extensions +epiphany-gecko +fbreader +fdutils +fontforge-doc +freeradius-dialupadmin +freeradius-iodbc +freeradius-krb5 +freeradius-ldap +freeradius-mysql +freeradius-postgresql +g++-4.2 +g++-4.2-multilib +galculator +gcc-4.1 +gcc-4.1-base +gcc-4.1-doc +gcc-4.1-multilib +gcc-4.1-source +gcc-4.2 +gcc-4.2-base +gcc-4.2-doc +gcc-4.2-locales +gcc-4.2-multilib +gcc-4.2-source +gcompris +gcompris-data +gcompris-dbg +gcompris-sound-ar +gcompris-sound-bg +gcompris-sound-br +gcompris-sound-cs +gcompris-sound-da +gcompris-sound-de +gcompris-sound-el +gcompris-sound-en +gcompris-sound-es +gcompris-sound-eu +gcompris-sound-fi +gcompris-sound-fr +gcompris-sound-hi +gcompris-sound-hu +gcompris-sound-id +gcompris-sound-it +gcompris-sound-mr +gcompris-sound-nb +gcompris-sound-nl +gcompris-sound-pt +gcompris-sound-ptbr +gcompris-sound-ru +gcompris-sound-so +gcompris-sound-sr +gcompris-sound-sv +gcompris-sound-tr +gcompris-sound-ur +gengetopt +gfortran-4.2 +gfortran-4.2-doc +glut-doc +glutg3-dev +gnome-icon-theme-gartoon +gnome-mount +gnome-netstatus-applet +gnome-pilot +gnome-pilot-conduits +gnome-volume-manager +gobby +gobjc-4.2 +gpaint +gpgsm +gstreamer0.10-gnomevfs +gthumb +gtk2-engines-sapwood +gtk2-engines-sapwood-dbg +guile-1.6 +guile-1.6-dev +guile-1.6-doc +guile-1.6-libs +hildon-control-panel +hildon-control-panel-dbg +hildon-control-panel-dev +hildon-control-panel-l10n-engb +hildon-control-panel-l10n-english +hildon-thumbnail +hildon-update-category-database +human-icon-theme +ibrazilian +ibritish +ibulgarian +icatalan +iczech +idanish +idutch +iesperanto +iestonian +ifaroese +ifrench-gut +ihungarian +iirish +iitalian +ilithuanian +imanx +indi +ingerman +inorwegian +iogerman +ipolish +iportuguese +ipppd +irussian +isdnutils-base +isdnutils-doc +isdnutils-xtools +ispanish +iswedish +iswiss +itagalog +italc-client +italc-master +iukrainian +javacc-doc +kdeartwork-theme-icon +kdeartwork-theme-window +keep +kernel-package +kexi +khelpcenter +kino +klogd +kmplayer +kmplayer-base +koffice-data +koffice-doc-html +koffice-libs +kspread +ktorrent +kubuntu-artwork-usplash +kugar +kwin-style-crystal +kword +kword-data +kxsldbg +language-support-writing-no +language-support-writing-sw +laptop-mode-tools +lib32gfortran2 +lib32gfortran2-dbg +lib32stdc++6-4.2-dbg +lib64gfortran2 +lib64gfortran2-dbg +lib64stdc++6-4.2-dbg +libalut-dev +libalut0 +libapache2-mod-auth-pam +libapache2-mod-auth-sys-group +libapache2-svn +libares-dev +libares0 +libavahi-compat-howl-dev +libavahi-compat-howl0 +libboost-python-dev +libcapi20-3 +libcapi20-dev +libcdio7 +libchicken-dev +libconsole +libdb4.2 +libdb4.2++-dev +libdb4.2++c2 +libdb4.2-dev +libdb4.6 +libdb4.6++ +libdb4.6++-dev +libdb4.6-dbg +libdb4.6-dev +libdb4.6-java +libdb4.6-java-dev +libdb4.6-java-gcj +libdiscover1-dev +libehcache-java +libesd-alsa0 +libfile-which-perl +libgda3-3 +libgda3-3-dbg +libgda3-common +libgda3-dev +libgda3-doc +libgfortran2 +libgfortran2-dbg +libggz-gtk-dev +libggz-gtk1 +libggzdmod++-dev +libggzdmod++1 +libggzdmod-dev +libggzdmod6 +libglew1.5 +libglew1.5-dev +libglut3 +libglut3-dev +libgnet-dev +libgnet2.0-0 +libgnome-speech-dev +libgnome-speech7 +libgnomevfs2-bin +libgnumail-java-doc +libguile-ltdl-1 +libhildon-1-0 +libhildon-1-0-dbg +libhildon-1-dev +libhildonhelp-dev +libhildonhelp0 +libhildonhelp0-dbg +libhildonmime-dev +libhildonmime0 +libhildonmime0-dbg +libio-socket-ssl-perl +libiso9660-dev +libitalc +libitext-java +libiw29 +libjakarta-poi-java +libjakarta-poi-java-doc +libjcommon-java +libjcommon-java-doc +libjsr107cache-java +libkpathsea4 +libloader-java +libloader-java-doc +liblockdev1 +liblockdev1-dbg +liblockdev1-dev +libmatchbox-dev +libmatchbox1 +libmikmod2 +libmikmod2-dev +libmimelib1-dev +libmimelib1c2a +libmokoui2-0 +libmokoui2-dev +libmokoui2-doc +libmysqlclient15off +libnet-ssleay-perl +libnet6-1.3-0 +libnet6-1.3-0-dbg +libnet6-1.3-dev +libobby-0.4-1 +libobby-0.4-dev +libopenal-dev +libopensync0 +libopensync0-dbg +libopensync0-dev +libosso-dev +libosso1 +libosso1-dbg +libosso1-doc +libpam-thinkfinger +libpigment-dbg +libpigment0.3-dev +libpixie-java +libpolkit-gnome-dev +libpolkit-gnome0 +libportaudio-dev +libportaudio-doc +libportaudio0 +libpqxx-2.6.9ldbl +libpqxx-dev +libpt-1.10.10 +libpt-1.10.10-dbg +libpt-1.10.10-plugins-alsa +libpt-1.10.10-plugins-v4l +libpt-1.10.10-plugins-v4l2 +libqcad0-dev +libqt-perl +libqthreads-12 +librsvg2-bin +librsync-dev +librsync1 +libscim-dev +libscim8c2a +libsdl-image1.2 +libsdl-image1.2-dev +libsdl-mixer1.2 +libsdl-mixer1.2-dev +libsdl-pango-dev +libsdl-pango1 +libsdl-ttf2.0-0 +libsdl-ttf2.0-dev +libsensors-dev +libsensors3 +libskim-dev +libskim0 +libsmbios-dev +libsmbios-doc +libsmokeqt-dev +libsmokeqt1 +libsmpeg-dev +libsmpeg0 +libsnmp-session-perl +libstdc++6-4.1-dbg +libstdc++6-4.1-doc +libstdc++6-4.2-dbg +libstdc++6-4.2-dev +libstdc++6-4.2-doc +libsvn-java +libsvn-ruby +libsvn-ruby1.8 +libthinkfinger-dev +libthinkfinger-doc +libthinkfinger0 +libwriter2latex-java-doc +libwv2-dev +libxml-encoding-perl +libxml-writer-perl +libzlcore-dev +libzltext-dev +libzlui-gtk +linux-headers-rt +lsb-languages +lsb-multimedia +maemo-af-desktop-l10n-engb +maemo-af-desktop-l10n-english +matchbox-keyboard +matchbox-window-manager +mce-dev +mesa-utils +mii-diag +mimetex +minicom +moodle +myspell-da +myspell-fr-gut +myspell-sw +netcat-traditional +nut-hal-drivers +openoffice.org-style-crystal +openoffice.org-writer2latex +osso-af-settings +osso-gwconnect +osso-gwconnect-dev +pccts +pidgin-otr +planner +planner-dev +policykit-gnome +policykit-gnome-doc +poster +powermanagement-interface +powernowd +pppdcapiplugin +pyqt-tools +python-bluez +python-clientform +python-daap +python-gdata +python-hildon +python-hildon-dev +python-launchpad-bugs +python-mechanize +python-numeric +python-numeric-dbg +python-numeric-ext +python-numeric-ext-dbg +python-pgm +python-pqueue +python-pylirc +python-pysqlite2 +python-pysqlite2-dbg +python-qt-dev +python-qt3 +python-qt3-dbg +python-qt3-doc +python-qtext +python-qtext-dbg +python-selinux +python-sexy +python-tcm +python-twisted-web2 +python-tz +python2.5 +python2.5-dbg +python2.5-doc +python2.5-examples +python2.5-minimal +qca-tls +qcad +qcad-doc +qt3-assistant +quanta +quanta-data +rasmol +rasmol-doc +rdiff-backup +rss-glx +scim +scim-anthy +scim-bridge-agent +scim-bridge-client-gtk +scim-bridge-client-qt +scim-bridge-client-qt4 +scim-chewing +scim-dev +scim-dev-doc +scim-gtk2-immodule +scim-hangul +scim-m17n +scim-modules-socket +scim-modules-table +scim-pinyin +scim-qtimm +scim-tables-additional +scim-tables-zh +selinux-utils +sensord +sepol-utils +skim +sound-juicer +speedcrunch +student-control-panel +swat +sysklogd +tagcoll +tangerine-icon-theme +tasks +tasks-dbg +tcl8.3 +tcl8.3-dev +tcl8.3-doc +tdb-tools +tetex-extra +thin-client-manager-backend +thin-client-manager-gnome +thinkfinger-tools +ttf-kochi-gothic +ttf-kochi-mincho +ttf-sil-andika +ttf-sil-doulos +ttf-sil-gentium +tuxmath +tuxpaint +tuxpaint-data +tuxpaint-stamps-default +tuxtype +tuxtype-data +usplash-theme-ubuntu +vlock +w3c-dtd-xhtml +workrave +xaos +xapian-examples +xapian-tools +xresprobe +xsane +xsane-common +xsane-doc +xserver-xorg-video-amd +xserver-xorg-video-amd-dbg +xserver-xorg-video-dummy +xserver-xorg-video-glint +xserver-xorg-video-via +zope-common diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DevelReleaseAnnouncement update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DevelReleaseAnnouncement --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DevelReleaseAnnouncement 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DevelReleaseAnnouncement 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,58 @@ += Welcome to the Ubuntu 'Precise Pangolin' development release = + +''This is still a BETA release.'' +''Do not install it on production machines.'' + +Thanks for your interest in this development release of Ubuntu. +The Ubuntu developers are moving very quickly to bring you the +absolute latest and greatest software the Open Source Community has to +offer. This development release brings you a taste of the newest features +for the next version of Ubuntu. + +== Testing == + +Please help to test this development snapshot and report problems back to the +developers. For more information about testing Ubuntu, please read: + + http://www.ubuntu.com/testing + + +== Reporting Bugs == + +This development release of Ubuntu contains bugs. If you want to help +out with bugs, the Bug Squad is always looking for help. Please read the +following information about reporting bugs: + + http://help.ubuntu.com/community/ReportingBugs + +Then report bugs using apport in Ubuntu. For example: + + ubuntu-bug linux + +will open a bug report in Launchpad regarding the linux package. Your +comments, bug reports, patches and suggestions will help fix bugs and improve +future releases. + + +== Participate in Ubuntu == + +If you would like to help shape Ubuntu, take a look at the list of +ways you can participate at + + http://www.ubuntu.com/community/participate/ + + +== More Information == + +You can find out more about Ubuntu on the Ubuntu website and Ubuntu +wiki. + + http://www.ubuntu.com/ + http://wiki.ubuntu.com/ + + +To sign up for Ubuntu development announcements, please +subscribe to Ubuntu's development announcement list at: + + http://lists.ubuntu.com/mailman/listinfo/ubuntu-devel-announce + diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/dialog_changes.ui update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/dialog_changes.ui --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/dialog_changes.ui 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/dialog_changes.ui 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,213 @@ + + dialog_changes + + + + 0 + 0 + 588 + 417 + + + + + 0 + 0 + + + + Package Changes + + + true + + + + + + &Cancel + + + + + + + + + + + + 0 + 0 + + + + + + + image0 + + + false + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 20 + 80 + + + + + + + + + + + + + + + Qt::RichText + + + Qt::AlignVCenter + + + true + + + + + + + + 0 + 0 + + + + + + + Qt::RichText + + + Qt::AlignVCenter + + + true + + + + + + + + + + + Details >>> + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 341 + 21 + + + + + + + + _Start Upgrade + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 161 + 20 + + + + + + + + false + + + + 1 + + + + + + + + + + + button_confirm_changes + clicked() + dialog_changes + accept() + + + 20 + 20 + + + 20 + 20 + + + + + button_cancel_changes + clicked() + dialog_changes + reject() + + + 20 + 20 + + + 20 + 20 + + + + + diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/dialog_conffile.ui update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/dialog_conffile.ui --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/dialog_conffile.ui 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/dialog_conffile.ui 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,142 @@ + + dialog_conffile + + + + 0 + 0 + 372 + 319 + + + + Configuration File Change + + + true + + + + + + Show Difference >>> + + + + + + + + 0 + 0 + + + + + + + image0 + + + false + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 121 + 21 + + + + + + + + + + + true + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 336 + 20 + + + + + + + + Keep + + + + + + + Replace + + + + + + + + + + + + + keep_button + clicked() + dialog_conffile + reject() + + + 20 + 20 + + + 20 + 20 + + + + + replace_button + clicked() + dialog_conffile + accept() + + + 20 + 20 + + + 20 + 20 + + + + + diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/dialog_error.ui update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/dialog_error.ui --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/dialog_error.ui 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/dialog_error.ui 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,119 @@ + + dialog_error + + + + 0 + 0 + 427 + 343 + + + + Error + + + true + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 21 + 161 + + + + + + + + &Close + + + + + + + + 0 + 0 + + + + + + + image0 + + + false + + + + + + + + + + true + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 130 + 21 + + + + + + + + _Report Bug + + + + + + + + + + + + + button_close + clicked() + dialog_error + close() + + + 20 + 20 + + + 20 + 20 + + + + + diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/distinfo.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/distinfo.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/distinfo.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/distinfo.py 2015-11-26 16:33:29.000000000 +0000 @@ -0,0 +1,309 @@ +# distinfo.py - provide meta information for distro repositories +# +# Copyright (c) 2005 Gustavo Noronha Silva +# Copyright (c) 2006-2007 Sebastian Heinlein +# +# Authors: Gustavo Noronha Silva +# Sebastian Heinlein +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +from __future__ import print_function + +import errno +import logging +import os +from subprocess import Popen, PIPE +import re + +import apt_pkg + +from apt_pkg import gettext as _ + + +class Template(object): + + def __init__(self): + self.name = None + self.child = False + self.parents = [] # ref to parent template(s) + self.match_name = None + self.description = None + self.base_uri = None + self.type = None + self.components = [] + self.children = [] + self.match_uri = None + self.mirror_set = {} + self.distribution = None + self.available = True + self.official = True + + def has_component(self, comp): + ''' Check if the distribution provides the given component ''' + return comp in (c.name for c in self.components) + + def is_mirror(self, url): + ''' Check if a given url of a repository is a valid mirror ''' + proto, hostname, dir = split_url(url) + if hostname in self.mirror_set: + return self.mirror_set[hostname].has_repository(proto, dir) + else: + return False + + +class Component(object): + + def __init__(self, name, desc=None, long_desc=None, parent_component=None): + self.name = name + self.description = desc + self.description_long = long_desc + self.parent_component = parent_component + + def get_parent_component(self): + return self.parent_component + + def set_parent_component(self, parent): + self.parent_component = parent + + def get_description(self): + if self.description_long is not None: + return self.description_long + elif self.description is not None: + return self.description + else: + return None + + def set_description(self, desc): + self.description = desc + + def set_description_long(self, desc): + self.description_long = desc + + def get_description_long(self): + return self.description_long + + +class Mirror(object): + ''' Storage for mirror related information ''' + + def __init__(self, proto, hostname, dir, location=None): + self.hostname = hostname + self.repositories = [] + self.add_repository(proto, dir) + self.location = location + + def add_repository(self, proto, dir): + self.repositories.append(Repository(proto, dir)) + + def get_repositories_for_proto(self, proto): + return [r for r in self.repositories if r.proto == proto] + + def has_repository(self, proto, dir): + if dir is None: + return False + for r in self.repositories: + if r.proto == proto and dir in r.dir: + return True + return False + + def get_repo_urls(self): + return [r.get_url(self.hostname) for r in self.repositories] + + def get_location(self): + return self.location + + def set_location(self, location): + self.location = location + + +class Repository(object): + + def __init__(self, proto, dir): + self.proto = proto + self.dir = dir + + def get_info(self): + return self.proto, self.dir + + def get_url(self, hostname): + return "%s://%s/%s" % (self.proto, hostname, self.dir) + + +def split_url(url): + ''' split a given URL into the protocoll, the hostname and the dir part ''' + split = re.split(":*\/+", url, maxsplit=2) + while len(split) < 3: + split.append(None) + return split + + +class DistInfo(object): + + def __init__(self, dist=None, base_dir="/usr/share/python-apt/templates"): + self.metarelease_uri = '' + self.templates = [] + self.arch = apt_pkg.config.find("APT::Architecture") + + location = None + match_loc = re.compile(r"^#LOC:(.+)$") + match_mirror_line = re.compile( + r"^(#LOC:.+)|(((http)|(ftp)|(rsync)|(file)|(mirror)|(https))://" + r"[A-Za-z0-9/\.:\-_@]+)$") + #match_mirror_line = re.compile(r".+") + + if not dist: + try: + dist = Popen(["lsb_release", "-i", "-s"], + stdout=PIPE).communicate()[0].strip() + except OSError as exc: + if exc.errno != errno.ENOENT: + logging.warning( + 'lsb_release failed, using defaults:' % exc) + dist = "Debian" + + self.dist = dist + + map_mirror_sets = {} + + dist_fname = "%s/%s.info" % (base_dir, dist) + with open(dist_fname) as dist_file: + template = None + component = None + for line in dist_file: + tokens = line.split(':', 1) + if len(tokens) < 2: + continue + field = tokens[0].strip() + value = tokens[1].strip() + if field == 'ChangelogURI': + self.changelogs_uri = _(value) + elif field == 'MetaReleaseURI': + self.metarelease_uri = value + elif field == 'Suite': + self.finish_template(template, component) + component = None + template = Template() + template.name = value + template.distribution = dist + template.match_name = "^%s$" % value + elif field == 'MatchName': + template.match_name = value + elif field == 'ParentSuite': + template.child = True + for nanny in self.templates: + # look for parent and add back ref to it + if nanny.name == value: + template.parents.append(nanny) + nanny.children.append(template) + elif field == 'Available': + template.available = apt_pkg.string_to_bool(value) + elif field == 'Official': + template.official = apt_pkg.string_to_bool(value) + elif field == 'RepositoryType': + template.type = value + elif field == 'BaseURI' and not template.base_uri: + template.base_uri = value + elif field == 'BaseURI-%s' % self.arch: + template.base_uri = value + elif field == 'MatchURI' and not template.match_uri: + template.match_uri = value + elif field == 'MatchURI-%s' % self.arch: + template.match_uri = value + elif (field == 'MirrorsFile' or + field == 'MirrorsFile-%s' % self.arch): + # Make the path absolute. + value = os.path.isabs(value) and value or \ + os.path.abspath(os.path.join(base_dir, value)) + if value not in map_mirror_sets: + mirror_set = {} + try: + with open(value) as value_f: + mirror_data = list(filter( + match_mirror_line.match, + [x.strip() for x in value_f])) + except Exception: + print("WARNING: Failed to read mirror file") + mirror_data = [] + for line in mirror_data: + if line.startswith("#LOC:"): + location = match_loc.sub(r"\1", line) + continue + (proto, hostname, dir) = split_url(line) + if hostname in mirror_set: + mirror_set[hostname].add_repository(proto, dir) + else: + mirror_set[hostname] = Mirror( + proto, hostname, dir, location) + map_mirror_sets[value] = mirror_set + template.mirror_set = map_mirror_sets[value] + elif field == 'Description': + template.description = _(value) + elif field == 'Component': + if (component and not + template.has_component(component.name)): + template.components.append(component) + component = Component(value) + elif field == 'CompDescription': + component.set_description(_(value)) + elif field == 'CompDescriptionLong': + component.set_description_long(_(value)) + elif field == 'ParentComponent': + component.set_parent_component(value) + self.finish_template(template, component) + template = None + component = None + + def finish_template(self, template, component): + " finish the current tempalte " + if not template: + return + # reuse some properties of the parent template + if template.match_uri is None and template.child: + for t in template.parents: + if t.match_uri: + template.match_uri = t.match_uri + break + if template.mirror_set == {} and template.child: + for t in template.parents: + if t.match_uri: + template.mirror_set = t.mirror_set + break + if component and not template.has_component(component.name): + template.components.append(component) + component = None + # the official attribute is inherited + for t in template.parents: + template.official = t.official + self.templates.append(template) + + +if __name__ == "__main__": + d = DistInfo("Ubuntu", "/usr/share/python-apt/templates") + logging.info(d.changelogs_uri) + for template in d.templates: + logging.info("\nSuite: %s" % template.name) + logging.info("Desc: %s" % template.description) + logging.info("BaseURI: %s" % template.base_uri) + logging.info("MatchURI: %s" % template.match_uri) + if template.mirror_set != {}: + logging.info("Mirrors: %s" % list(template.mirror_set.keys())) + for comp in template.components: + logging.info(" %s -%s -%s" % (comp.name, + comp.description, + comp.description_long)) + for child in template.children: + logging.info(" %s" % child.description) diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/distro.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/distro.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/distro.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/distro.py 2015-11-26 16:33:29.000000000 +0000 @@ -0,0 +1,537 @@ +# distro.py - Provide a distro abstraction of the sources.list +# +# Copyright (c) 2004-2009 Canonical Ltd. +# Copyright (c) 2006-2007 Sebastian Heinlein +# +# Authors: Sebastian Heinlein +# Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import gettext +import logging +import re +import os + +from xml.etree.ElementTree import ElementTree + +from apt_pkg import gettext as _ + + +class NoDistroTemplateException(Exception): + pass + + +class Distribution(object): + + def __init__(self, id, codename, description, release): + """ Container for distribution specific informations """ + # LSB information + self.id = id + self.codename = codename + self.description = description + self.release = release + + self.binary_type = "deb" + self.source_type = "deb-src" + + def get_sources(self, sourceslist): + """ + Find the corresponding template, main and child sources + for the distribution + """ + + self.sourceslist = sourceslist + # corresponding sources + self.source_template = None + self.child_sources = [] + self.main_sources = [] + self.disabled_sources = [] + self.cdrom_sources = [] + self.download_comps = [] + self.enabled_comps = [] + self.cdrom_comps = [] + self.used_media = [] + self.get_source_code = False + self.source_code_sources = [] + + # location of the sources + self.default_server = "" + self.main_server = "" + self.nearest_server = "" + self.used_servers = [] + + # find the distro template + for template in self.sourceslist.matcher.templates: + if (self.is_codename(template.name) and + template.distribution == self.id): + #print "yeah! found a template for %s" % self.description + #print template.description, template.base_uri, \ + # template.components + self.source_template = template + break + if self.source_template is None: + raise NoDistroTemplateException( + "Error: could not find a distribution template for %s/%s" % + (self.id, self.codename)) + + # find main and child sources + media = [] + comps = [] + cdrom_comps = [] + enabled_comps = [] + #source_code = [] + for source in self.sourceslist.list: + if (not source.invalid and + self.is_codename(source.dist) and + source.template and + source.template.official and + self.is_codename(source.template.name)): + #print "yeah! found a distro repo: %s" % source.line + # cdroms need do be handled differently + if (source.uri.startswith("cdrom:") and + not source.disabled): + self.cdrom_sources.append(source) + cdrom_comps.extend(source.comps) + elif (source.uri.startswith("cdrom:") and + source.disabled): + self.cdrom_sources.append(source) + elif (source.type == self.binary_type and + not source.disabled): + self.main_sources.append(source) + comps.extend(source.comps) + media.append(source.uri) + elif (source.type == self.binary_type and + source.disabled): + self.disabled_sources.append(source) + elif (source.type == self.source_type and + not source.disabled): + self.source_code_sources.append(source) + elif (source.type == self.source_type and + source.disabled): + self.disabled_sources.append(source) + if (not source.invalid and + source.template in self.source_template.children): + if (not source.disabled and + source.type == self.binary_type): + self.child_sources.append(source) + elif (not source.disabled and + source.type == self.source_type): + self.source_code_sources.append(source) + else: + self.disabled_sources.append(source) + self.download_comps = set(comps) + self.cdrom_comps = set(cdrom_comps) + enabled_comps.extend(comps) + enabled_comps.extend(cdrom_comps) + self.enabled_comps = set(enabled_comps) + self.used_media = set(media) + self.get_mirrors() + + def get_mirrors(self, mirror_template=None): + """ + Provide a set of mirrors where you can get the distribution from + """ + # the main server is stored in the template + self.main_server = self.source_template.base_uri + + # other used servers + for medium in self.used_media: + if not medium.startswith("cdrom:"): + # seems to be a network source + self.used_servers.append(medium) + + if len(self.main_sources) == 0: + self.default_server = self.main_server + else: + self.default_server = self.main_sources[0].uri + + # get a list of country codes and real names + self.countries = {} + fname = "/usr/share/xml/iso-codes/iso_3166.xml" + if os.path.exists(fname): + et = ElementTree(file=fname) + # python2.6 compat, the next two lines can get removed + # once we do not use py2.6 anymore + if getattr(et, "iter", None) is None: + et.iter = et.getiterator + it = et.iter('iso_3166_entry') + for elm in it: + try: + descr = elm.attrib["common_name"] + except KeyError: + descr = elm.attrib["name"] + try: + code = elm.attrib["alpha_2_code"] + except KeyError: + code = elm.attrib["alpha_3_code"] + self.countries[code.lower()] = gettext.dgettext('iso_3166', + descr) + + # try to guess the nearest mirror from the locale + self.country = None + self.country_code = None + locale = os.getenv("LANG", default="en_UK") + a = locale.find("_") + z = locale.find(".") + if z == -1: + z = len(locale) + country_code = locale[a + 1:z].lower() + + if mirror_template: + self.nearest_server = mirror_template % country_code + + if country_code in self.countries: + self.country = self.countries[country_code] + self.country_code = country_code + + def _get_mirror_name(self, server): + ''' Try to get a human readable name for the main mirror of a country + Customize for different distributions ''' + country = None + i = server.find("://") + l = server.find(".archive.ubuntu.com") + if i != -1 and l != -1: + country = server[i + len("://"):l] + if country in self.countries: + # TRANSLATORS: %s is a country + return _("Server for %s") % self.countries[country] + else: + return("%s" % server.rstrip("/ ")) + + def get_server_list(self): + ''' Return a list of used and suggested servers ''' + + def compare_mirrors(mir1, mir2): + ''' Helper function that handles comaprision of mirror urls + that could contain trailing slashes''' + return re.match(mir1.strip("/ "), mir2.rstrip("/ ")) + + # Store all available servers: + # Name, URI, active + mirrors = [] + if (len(self.used_servers) < 1 or + (len(self.used_servers) == 1 and + compare_mirrors(self.used_servers[0], self.main_server))): + mirrors.append([_("Main server"), self.main_server, True]) + if self.nearest_server: + mirrors.append([self._get_mirror_name(self.nearest_server), + self.nearest_server, False]) + elif (len(self.used_servers) == 1 and not + compare_mirrors(self.used_servers[0], self.main_server)): + mirrors.append([_("Main server"), self.main_server, False]) + # Only one server is used + server = self.used_servers[0] + + # Append the nearest server if it's not already used + if self.nearest_server: + if not compare_mirrors(server, self.nearest_server): + mirrors.append([self._get_mirror_name(self.nearest_server), + self.nearest_server, False]) + if server: + mirrors.append([self._get_mirror_name(server), server, True]) + + elif len(self.used_servers) > 1: + # More than one server is used. Since we don't handle this case + # in the user interface we set "custom servers" to true and + # append a list of all used servers + mirrors.append([_("Main server"), self.main_server, False]) + if self.nearest_server: + mirrors.append([self._get_mirror_name(self.nearest_server), + self.nearest_server, False]) + mirrors.append([_("Custom servers"), None, True]) + for server in self.used_servers: + mirror_entry = [self._get_mirror_name(server), server, False] + if (compare_mirrors(server, self.nearest_server) or + compare_mirrors(server, self.main_server)): + continue + elif mirror_entry not in mirrors: + mirrors.append(mirror_entry) + + return mirrors + + def add_source(self, type=None, + uri=None, dist=None, comps=None, comment=""): + """ + Add distribution specific sources + """ + if uri is None: + # FIXME: Add support for the server selector + uri = self.default_server + if dist is None: + dist = self.codename + if comps is None: + comps = list(self.enabled_comps) + if type is None: + type = self.binary_type + new_source = self.sourceslist.add(type, uri, dist, comps, comment) + # if source code is enabled add a deb-src line after the new + # source + if self.get_source_code and type == self.binary_type: + self.sourceslist.add( + self.source_type, uri, dist, comps, comment, + file=new_source.file, + pos=self.sourceslist.list.index(new_source) + 1) + + def enable_component(self, comp): + """ + Enable a component in all main, child and source code sources + (excluding cdrom based sources) + + comp: the component that should be enabled + """ + comps = set([comp]) + # look for parent components that we may have to add + for source in self.main_sources: + for c in source.template.components: + if c.name == comp and c.parent_component: + comps.add(c.parent_component) + for c in comps: + self._enable_component(c) + + def _enable_component(self, comp): + + def add_component_only_once(source, comps_per_dist): + """ + Check if we already added the component to the repository, since + a repository could be splitted into different apt lines. If not + add the component + """ + # if we don't have that distro, just return (can happen for e.g. + # dapper-update only in deb-src + if source.dist not in comps_per_dist: + return + # if we have seen this component already for this distro, + # return (nothing to do) + if comp in comps_per_dist[source.dist]: + return + # add it + source.comps.append(comp) + comps_per_dist[source.dist].add(comp) + + sources = [] + sources.extend(self.main_sources) + sources.extend(self.child_sources) + # store what comps are enabled already per distro (where distro is + # e.g. "dapper", "dapper-updates") + comps_per_dist = {} + comps_per_sdist = {} + for s in sources: + if s.type == self.binary_type: + if s.dist not in comps_per_dist: + comps_per_dist[s.dist] = set() + for c in s.comps: + comps_per_dist[s.dist].add(c) + for s in self.source_code_sources: + if s.type == self.source_type: + if s.dist not in comps_per_sdist: + comps_per_sdist[s.dist] = set() + for c in s.comps: + comps_per_sdist[s.dist].add(c) + + # check if there is a main source at all + if len(self.main_sources) < 1: + # create a new main source + self.add_source(comps=["%s" % comp]) + else: + # add the comp to all main, child and source code sources + for source in sources: + add_component_only_once(source, comps_per_dist) + + for source in self.source_code_sources: + add_component_only_once(source, comps_per_sdist) + + # check if there is a main source code source at all + if self.get_source_code: + if len(self.source_code_sources) < 1: + # create a new main source + self.add_source(type=self.source_type, comps=["%s" % comp]) + else: + # add the comp to all main, child and source code sources + for source in self.source_code_sources: + add_component_only_once(source, comps_per_sdist) + + def disable_component(self, comp): + """ + Disable a component in all main, child and source code sources + (excluding cdrom based sources) + """ + sources = [] + sources.extend(self.main_sources) + sources.extend(self.child_sources) + sources.extend(self.source_code_sources) + if comp in self.cdrom_comps: + sources = [] + sources.extend(self.main_sources) + for source in sources: + if comp in source.comps: + source.comps.remove(comp) + if len(source.comps) < 1: + self.sourceslist.remove(source) + + def change_server(self, uri): + ''' Change the server of all distro specific sources to + a given host ''' + + def change_server_of_source(source, uri, seen): + # Avoid creating duplicate entries + source.uri = uri + for comp in source.comps: + if [source.uri, source.dist, comp] in seen: + source.comps.remove(comp) + else: + seen.append([source.uri, source.dist, comp]) + if len(source.comps) < 1: + self.sourceslist.remove(source) + + seen_binary = [] + seen_source = [] + self.default_server = uri + for source in self.main_sources: + change_server_of_source(source, uri, seen_binary) + for source in self.child_sources: + # Do not change the forces server of a child source + if (source.template.base_uri is None or + source.template.base_uri != source.uri): + change_server_of_source(source, uri, seen_binary) + for source in self.source_code_sources: + change_server_of_source(source, uri, seen_source) + + def is_codename(self, name): + ''' Compare a given name with the release codename. ''' + if name == self.codename: + return True + else: + return False + + +class DebianDistribution(Distribution): + ''' Class to support specific Debian features ''' + + def is_codename(self, name): + ''' Compare a given name with the release codename and check if + if it can be used as a synonym for a development releases ''' + if name == self.codename or self.release in ("testing", "unstable"): + return True + else: + return False + + def _get_mirror_name(self, server): + ''' Try to get a human readable name for the main mirror of a country + Debian specific ''' + country = None + i = server.find("://ftp.") + l = server.find(".debian.org") + if i != -1 and l != -1: + country = server[i + len("://ftp."):l] + if country in self.countries: + # TRANSLATORS: %s is a country + return _("Server for %s") % gettext.dgettext( + "iso_3166", self.countries[country].rstrip()).rstrip() + else: + return("%s" % server.rstrip("/ ")) + + def get_mirrors(self): + Distribution.get_mirrors( + self, mirror_template="http://ftp.%s.debian.org/debian/") + + +class UbuntuDistribution(Distribution): + ''' Class to support specific Ubuntu features ''' + + def get_mirrors(self): + Distribution.get_mirrors( + self, mirror_template="http://%s.archive.ubuntu.com/ubuntu/") + + +class UbuntuRTMDistribution(UbuntuDistribution): + ''' Class to support specific Ubuntu RTM features ''' + + def get_mirrors(self): + self.main_server = self.source_template.base_uri + + +def _lsb_release(): + """Call lsb_release --idrc and return a mapping.""" + from subprocess import Popen, PIPE + import errno + result = {'Codename': 'sid', 'Distributor ID': 'Debian', + 'Description': 'Debian GNU/Linux unstable (sid)', + 'Release': 'unstable'} + try: + out = Popen(['lsb_release', '-idrc'], stdout=PIPE).communicate()[0] + # Convert to unicode string, needed for Python 3.1 + out = out.decode("utf-8") + result.update(l.split(":\t") for l in out.split("\n") if ':\t' in l) + except OSError as exc: + if exc.errno != errno.ENOENT: + logging.warning('lsb_release failed, using defaults:' % exc) + return result + + +def _system_image_channel(): + """Get the current channel from system-image-cli -i if possible.""" + from subprocess import Popen, PIPE + import errno + try: + from subprocess import DEVNULL + except ImportError: + # no DEVNULL in 2.7 + DEVNULL = os.open(os.devnull, os.O_RDWR) + try: + out = Popen( + ['system-image-cli', '-i'], stdout=PIPE, stderr=DEVNULL, + universal_newlines=True).communicate()[0] + for l in out.splitlines(): + if l.startswith('channel: '): + return l.split(': ', 1)[1] + except OSError as exc: + if exc.errno != errno.ENOENT: + logging.warning( + 'system-image-cli failed, using defaults: %s' % exc) + return None + + +def get_distro(id=None, codename=None, description=None, release=None): + """ + Check the currently used distribution and return the corresponding + distriubtion class that supports distro specific features. + + If no paramter are given the distro will be auto detected via + a call to lsb-release + """ + # make testing easier + if not (id and codename and description and release): + result = _lsb_release() + id = result['Distributor ID'] + codename = result['Codename'] + description = result['Description'] + release = result['Release'] + if id == "Ubuntu": + channel = _system_image_channel() + if channel is not None and "ubuntu-rtm/" in channel: + id = "Ubuntu-RTM" + codename = channel.rsplit("/", 1)[1].split("-", 1)[0] + description = codename + release = codename + if id == "Ubuntu": + return UbuntuDistribution(id, codename, description, release) + if id == "Ubuntu-RTM": + return UbuntuRTMDistribution(id, codename, description, release) + elif id == "Debian": + return DebianDistribution(id, codename, description, release) + else: + return Distribution(id, codename, description, release) diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeApport.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeApport.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeApport.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeApport.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,109 @@ + +import os +import os.path +import logging +import subprocess +import sys +import gettext +import errno + +APPORT_WHITELIST = { + "apt.log": "Aptlog", + "apt-term.log": "Apttermlog", + "apt-clone_system_state.tar.gz": "Aptclonesystemstate.tar.gz", + "history.log": "Historylog", + "lspci.txt": "Lspcitxt", + "main.log": "Mainlog", + "term.log": "Termlog", + "screenlog.0": "Screenlog", + "xorg_fixup.log": "Xorgfixup" + } + + +def _apport_append_logfiles(report, logdir="/var/log/dist-upgrade/"): + dirname = 'VarLogDistupgrade' + for fname in APPORT_WHITELIST: + f = os.path.join(logdir, fname) + if not os.path.isfile(f) or os.path.getsize(f) == 0: + continue + ident = dirname + APPORT_WHITELIST[fname] + report[ident] = (open(f), ) + +def apport_crash(type, value, tb): + logging.debug("running apport_crash()") + try: + from apport_python_hook import apport_excepthook + from apport.report import Report + except ImportError, e: + logging.error("failed to import apport python module, can't report bug: %s" % e) + return False + # we pretend we are update-manager + sys.argv[0] = "/usr/bin/update-manager" + apport_excepthook(type, value, tb) + # now add the files in /var/log/dist-upgrade/* + if os.path.exists('/var/crash/_usr_bin_update-manager.0.crash'): + report = Report() + report.setdefault('Tags', 'dist-upgrade') + report['Tags'] += ' dist-upgrade' + _apport_append_logfiles(report) + report.add_to_existing('/var/crash/_usr_bin_update-manager.0.crash') + return True + +def apport_pkgfailure(pkg, errormsg): + logging.debug("running apport_pkgfailure() %s: %s", pkg, errormsg) + LOGDIR="/var/log/dist-upgrade/" + s = "/usr/share/apport/package_hook" + + # we do not report followup errors from earlier failures + # dpkg messages will not be translated if DPKG_UNTRANSLATED_MESSAGES is + # set which it is by default so check for the English message first + if "dependency problems - leaving unconfigured" in errormsg: + return False + if gettext.dgettext('dpkg', "dependency problems - leaving unconfigured") in errormsg: + return False + # we do not run apport_pkgfailure for full disk errors + if os.strerror(errno.ENOSPC) in errormsg: + logging.debug("dpkg error because of full disk, not reporting against %s " % pkg) + return False + + if os.path.exists(s): + args = [s, "-p", pkg] + for fname in APPORT_WHITELIST: + args.extend(["-l", os.path.join(LOGDIR, fname)]) + try: + p = subprocess.Popen(args, stdin=subprocess.PIPE) + p.stdin.write("ErrorMessage: %s\n" % errormsg) + p.stdin.close() + #p.wait() + except Exception, e: + logging.warning("Failed to run apport (%s)" % e) + return False + return True + return False + +def run_apport(): + " run apport, check if we have a display " + if "RELEASE_UPRADER_NO_APPORT" in os.environ: + logging.debug("RELEASE_UPRADER_NO_APPORT env set") + return False + if "DISPLAY" in os.environ: + for p in ["/usr/share/apport/apport-gtk", "/usr/share/apport/apport-qt"]: + if os.path.exists(p): + ret = -1 + try: + ret = subprocess.call(p) + except Exception: + logging.exception("Unable to launch '%s' " % p) + return (ret == 0) + elif os.path.exists("/usr/bin/apport-cli"): + try: + return (subprocess.call("/usr/bin/apport-cli") == 0) + except Exception: + logging.exception("Unable to launch '/usr/bin/apport-cli'") + return False + logging.debug("can't find apport") + return False + + +if __name__ == "__main__": + apport_crash(None, None, None) diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeAptCdrom.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeAptCdrom.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeAptCdrom.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeAptCdrom.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,298 @@ +# DistUpgradeAptCdrom.py +# +# Copyright (c) 2008 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import re +import os +import apt +import apt_pkg +import logging +import gzip +import shutil +import subprocess +from gettext import gettext as _ + + +class AptCdromError(Exception): + " base exception for apt cdrom errors " + pass + +class AptCdrom(object): + " represents a apt cdrom object " + + def __init__(self, view, path): + self.view = view + self.cdrompath = path + # the directories we found on disk with signatures, packages and i18n + self.packages = set() + self.signatures = set() + self.i18n = set() + + def restoreBackup(self, backup_ext): + " restore the backup copy of the cdroms.list file (*not* sources.list)! " + cdromstate = os.path.join(apt_pkg.Config.find_dir("Dir::State"), + apt_pkg.Config.find("Dir::State::cdroms")) + if os.path.exists(cdromstate+backup_ext): + shutil.copy(cdromstate+backup_ext, cdromstate) + # mvo: we don't have to care about restoring the sources.list here because + # aptsources will do this for us anyway + + + def comment_out_cdrom_entry(self): + """ comment out the cdrom entry """ + diskname = self._readDiskName() + pentry = self._generateSourcesListLine(diskname, self.packages) + sourceslist=apt_pkg.Config.find_file("Dir::Etc::sourcelist") + content = open(sourceslist).read() + content = content.replace(pentry, "# %s" % pentry) + open(sourceslist, "w").write(content) + + def _scanCD(self): + """ + scan the CD for interessting files and return them as: + (packagesfiles, signaturefiles, i18nfiles) + """ + packages = set() + signatures = set() + i18n = set() + for root, dirs, files in os.walk(self.cdrompath, topdown=True): + if (root.endswith("debian-installer") or + root.endswith("dist-upgrader")): + del dirs[:] + continue + elif ".aptignr" in files: + continue + elif "Packages" in files: + packages.add(os.path.join(root,"Packages")) + elif "Packages.gz" in files: + packages.add(os.path.join(root,"Packages.gz")) + elif "Sources" in files or "Sources.gz" in files: + logging.error("Sources entry found in %s but not supported" % root) + elif "Release.gpg" in files: + signatures.add(os.path.join(root,"Release.gpg")) + elif "i18n" in dirs: + for f in os.listdir(os.path.join(root,"i18n")): + i18n.add(os.path.join(root,"i18n",f)) + # there is nothing under pool but deb packages (no + # indexfiles, so we skip that here + elif os.path.split(root)[1] == ("pool"): + del dirs[:] + return (packages, signatures, i18n) + + def _writeDatabase(self): + " update apts cdrom.list " + dbfile = apt_pkg.Config.find_file("Dir::State::cdroms") + cdrom = apt_pkg.Cdrom() + id=cdrom.ident(apt.progress.base.CdromProgress()) + label = self._readDiskName() + out=open(dbfile,"a") + out.write('CD::%s "%s";\n' % (id, label)) + out.write('CD::%s::Label "%s";\n' % (id, label)) + + def _dropArch(self, packages): + " drop architectures that are not ours " + # create a copy + packages = set(packages) + # now go over the packagesdirs and drop stuff that is not + # our binary-$arch + arch = apt_pkg.Config.find("APT::Architecture") + for d in set(packages): + if "/binary-" in d and not arch in d: + packages.remove(d) + return packages + + def _readDiskName(self): + # default to cdrompath if there is no name + diskname = self.cdrompath + info = os.path.join(self.cdrompath, ".disk","info") + if os.path.exists(info): + diskname = open(info).read() + for special in ('"',']','[','_'): + diskname = diskname.replace(special,'_') + return diskname + + def _generateSourcesListLine(self, diskname, packages): + # see apts indexcopy.cc:364 for details + path = "" + dist = "" + comps = [] + for d in packages: + # match(1) is the path, match(2) the dist + # and match(3) the components + m = re.match("(.*)/dists/([^/]*)/(.*)/binary-*", d) + if not m: + raise AptCdromError, _("Could not calculate sources.list entry") + path = m.group(1) + dist = m.group(2) + comps.append(m.group(3)) + if not path or not comps: + return None + comps.sort() + pentry = "deb cdrom:[%s]/ %s %s" % (diskname, dist, " ".join(comps)) + return pentry + + def _copyTranslations(self, translations, targetdir=None): + if not targetdir: + targetdir=apt_pkg.Config.find_dir("Dir::State::lists") + diskname = self._readDiskName() + for f in translations: + fname = apt_pkg.URItoFileName("cdrom:[%s]/%s" % (diskname,f[f.find("dists"):])) + outf = os.path.join(targetdir,os.path.splitext(fname)[0]) + if f.endswith(".gz"): + g=gzip.open(f) + out=open(outf,"w") + # uncompress in 64k chunks + while True: + s=g.read(64000) + out.write(s) + if s == "": + break + else: + shutil.copy(f,outf) + return True + + def _copyPackages(self, packages, targetdir=None): + if not targetdir: + targetdir=apt_pkg.Config.find_dir("Dir::State::lists") + # CopyPackages() + diskname = self._readDiskName() + for f in packages: + fname = apt_pkg.URItoFileName("cdrom:[%s]/%s" % (diskname,f[f.find("dists"):])) + outf = os.path.join(targetdir,os.path.splitext(fname)[0]) + if f.endswith(".gz"): + g=gzip.open(f) + out=open(outf,"w") + # uncompress in 64k chunks + while True: + s=g.read(64000) + out.write(s) + if s == "": + break + else: + shutil.copy(f,outf) + return True + + def _verifyRelease(self, signatures): + " verify the signatues and hashes " + gpgv = apt_pkg.Config.find("Dir::Bin::gpg","/usr/bin/gpgv") + keyring = apt_pkg.Config.find("Apt::GPGV::TrustedKeyring", + "/etc/apt/trusted.gpg") + for sig in signatures: + basepath = os.path.split(sig)[0] + # do gpg checking + releasef = os.path.splitext(sig)[0] + cmd = [gpgv,"--keyring",keyring, + "--ignore-time-conflict", + sig, releasef] + ret = subprocess.call(cmd) + if not (ret == 0): + return False + # now do the hash sum checks + t=apt_pkg.ParseTagFile(open(releasef)) + t.step() + for entry in t.section["SHA256"].split("\n"): + (hash,size,name) = entry.split() + f=os.path.join(basepath,name) + if not os.path.exists(f): + logging.info("ignoring missing '%s'" % f) + continue + sum = apt_pkg.sha256sum(open(f)) + if not (sum == hash): + logging.error("hash sum mismatch expected %s but got %s" % (hash, sum)) + return False + return True + + def _copyRelease(self, signatures, targetdir=None): + " copy the release file " + if not targetdir: + targetdir=apt_pkg.Config.find_dir("Dir::State::lists") + diskname = self._readDiskName() + for sig in signatures: + releasef = os.path.splitext(sig)[0] + # copy both Release and Release.gpg + for f in (sig, releasef): + fname = apt_pkg.URItoFileName("cdrom:[%s]/%s" % (diskname,f[f.find("dists"):])) + shutil.copy(f,os.path.join(targetdir,fname)) + return True + + def _doAdd(self): + " reimplement pkgCdrom::Add() in python " + # os.walk() will not follow symlinks so we don't need + # pkgCdrom::Score() and not dropRepeats() that deal with + # killing the links + (self.packages, self.signatures, self.i18n) = self._scanCD() + self.packages = self._dropArch(self.packages) + if len(self.packages) == 0: + logging.error("no useable indexes found on CD, wrong ARCH?") + raise AptCdromError, _("Unable to locate any package files, perhaps this is not a Ubuntu Disc or the wrong architecture?") + + # CopyAndVerify + if self._verifyRelease(self.signatures): + self._copyRelease(self.signatures) + + # copy the packages and translations + self._copyPackages(self.packages) + self._copyTranslations(self.i18n) + + # add CD to cdroms.list "database" and update sources.list + diskname = self._readDiskName() + if not diskname: + logging.error("no .disk/ directory found") + return False + debline = self._generateSourcesListLine(diskname, self.packages) + + # prepend to the sources.list + sourceslist=apt_pkg.Config.find_file("Dir::Etc::sourcelist") + content=open(sourceslist).read() + open(sourceslist,"w").write("# added by the release upgrader\n%s\n%s" % (debline,content)) + self._writeDatabase() + + return True + + def add(self, backup_ext=None): + " add a cdrom to apt's database " + logging.debug("AptCdrom.add() called with '%s'", self.cdrompath) + # do backup (if needed) of the cdroms.list file + if backup_ext: + cdromstate = os.path.join(apt_pkg.Config.find_dir("Dir::State"), + apt_pkg.Config.find("Dir::State::cdroms")) + if os.path.exists(cdromstate): + shutil.copy(cdromstate, cdromstate+backup_ext) + # do the actual work + apt_pkg.Config.Set("Acquire::cdrom::mount",self.cdrompath) + apt_pkg.Config.Set("APT::CDROM::NoMount","true") + # FIXME: add cdrom progress here for the view + #progress = self.view.getCdromProgress() + try: + res = self._doAdd() + except (SystemError, AptCdromError), e: + logging.error("can't add cdrom: %s" % e) + self.view.error(_("Failed to add the CD"), + _("There was a error adding the CD, the " + "upgrade will abort. Please report this as " + "a bug if this is a valid Ubuntu CD.\n\n" + "The error message was:\n'%s'") % e) + return False + logging.debug("AptCdrom.add() returned: %s" % res) + return res + + def __nonzero__(self): + """ helper to use this as 'if cdrom:' """ + return self.cdrompath is not None diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeAufs.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeAufs.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeAufs.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeAufs.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,252 @@ +import string +import logging +import os +import os.path +import subprocess +import tempfile + +def aufsOptionsAndEnvironmentSetup(options, config): + """ setup the environment based on the config and options + It will use + config("Aufs","Enabled") - to show if its enabled + and + config("Aufs","RWDir") - for the writable overlay dir + """ + logging.debug("aufsOptionsAndEnvironmentSetup()") + # enabled from the commandline (full overlay by default) + if options and options.useAufs: + logging.debug("enabling full overlay from commandline") + config.set("Aufs","Enabled", "True") + config.set("Aufs","EnableFullOverlay","True") + + # setup environment based on config + tmprw = tempfile.mkdtemp(prefix="upgrade-rw-") + aufs_rw_dir = config.getWithDefault("Aufs","RWDir", tmprw) + logging.debug("using '%s' as aufs_rw_dir" % aufs_rw_dir) + os.environ["RELEASE_UPGRADE_AUFS_RWDIR"] = aufs_rw_dir + config.set("Aufs","RWDir",aufs_rw_dir) + # now the chroot tmpdir + tmpchroot = tempfile.mkdtemp(prefix="upgrade-chroot-") + os.chmod(tmpchroot, 0755) + aufs_chroot_dir = config.getWithDefault("Aufs","ChrootDir", tmpchroot) + logging.debug("using '%s' as aufs chroot dir" % aufs_chroot_dir) + + if config.getWithDefault("Aufs","EnableFullOverlay", False): + logging.debug("enabling aufs full overlay (from config)") + config.set("Aufs","Enabled", "True") + os.environ["RELEASE_UPGRADE_USE_AUFS_FULL_OVERLAY"] = "1" + if config.getWithDefault("Aufs","EnableChrootOverlay",False): + logging.debug("enabling aufs chroot overlay") + config.set("Aufs","Enabled", "True") + os.environ["RELEASE_UPGRADE_USE_AUFS_CHROOT"] = aufs_chroot_dir + if config.getWithDefault("Aufs","EnableChrootRsync", False): + logging.debug("enable aufs chroot rsync back to real system") + os.environ["RELEASE_UPGRADE_RSYNC_AUFS_CHROOT"] = "1" + + +def _bindMount(from_dir, to_dir, rbind=False): + " helper that bind mounts a given dir to a new place " + if not os.path.exists(to_dir): + os.makedirs(to_dir) + if rbind: + bind = "--rbind" + else: + bind = "--bind" + cmd = ["mount",bind, from_dir, to_dir] + logging.debug("cmd: %s" % cmd) + res = subprocess.call(cmd) + if res != 0: + # FIXME: revert already mounted stuff + logging.error("Failed to bind mount from '%s' to '%s'" % (from_dir, to_dir)) + return False + return True + +def _aufsOverlayMount(target, rw_dir, chroot_dir="/"): + """ + helper that takes a target dir and mounts a rw dir over it, e.g. + /var , /tmp/upgrade-rw + """ + if not os.path.exists(rw_dir+target): + os.makedirs(rw_dir+target) + if not os.path.exists(chroot_dir+target): + os.makedirs(chroot_dir+target) + # FIXME: figure out when to use aufs and when to use overlayfs + use_overlayfs = False + if use_overlayfs: + cmd = ["mount", + "-t","overlayfs", + "-o","upperdir=%s,lowerdir=%s" % (rw_dir+target, target), + "none", + chroot_dir+target] + else: + cmd = ["mount", + "-t","aufs", + "-o","br:%s:%s=ro" % (rw_dir+target, target), + "none", + chroot_dir+target] + res = subprocess.call(cmd) + if res != 0: + # FIXME: revert already mounted stuff + logging.error("Failed to mount rw aufs overlay for '%s'" % target) + return False + logging.debug("cmd '%s' return '%s' " % (cmd, res)) + return True + +def is_aufs_mount(dir): + " test if the given dir is already mounted with aufs overlay " + for line in open("/proc/mounts"): + (device, mountpoint, fstype, options, a, b) = line.split() + if device == "none" and fstype == "aufs" and mountpoint == dir: + return True + return False + +def is_submount(mountpoint, systemdirs): + " helper: check if the given mountpoint is a submount of a systemdir " + logging.debug("is_submount: %s %s" % (mountpoint, systemdirs)) + for d in systemdirs: + if not d.endswith("/"): + d += "/" + if mountpoint.startswith(d): + return True + return False + +def is_real_fs(fs): + if fs.startswith("fuse"): + return False + if fs in ["rootfs","tmpfs","proc","fusectrl","aufs", + "devpts","binfmt_misc", "sysfs"]: + return False + return True + +def doAufsChrootRsync(aufs_chroot_dir): + """ + helper that rsyncs the changes in the aufs chroot back to the + real system + """ + from DistUpgradeMain import SYSTEM_DIRS + for d in SYSTEM_DIRS: + if not os.path.exists(d): + continue + # its important to have the "/" at the end of source + # and dest so that rsync knows what to do + cmd = ["rsync","-aHAX","--del","-v", "--progress", + "/%s/%s/" % (aufs_chroot_dir, d), + "/%s/" % d] + logging.debug("running: '%s'" % cmd) + ret = subprocess.call(cmd) + logging.debug("rsync back result for %s: %i" % (d, ret)) + return True + +def doAufsChroot(aufs_rw_dir, aufs_chroot_dir): + " helper that sets the chroot up and does chroot() into it " + if not setupAufsChroot(aufs_rw_dir, aufs_chroot_dir): + return False + os.chroot(aufs_chroot_dir) + os.chdir("/") + return True + + +def setupAufsChroot(rw_dir, chroot_dir): + " setup aufs chroot that is based on / but with a writable overlay " + # with the chroot aufs we can just rsync the changes back + # from the chroot dir to the real dirs + # + # (if we run rsync with --backup --backup-dir we could even + # create something vaguely rollbackable + + # get the mount points before the aufs buisiness starts + mounts = open("/proc/mounts").read() + from DistUpgradeMain import SYSTEM_DIRS + systemdirs = SYSTEM_DIRS + + # aufs mount or bind mount required dirs + for d in os.listdir("/"): + d = os.path.join("/",d) + if os.path.isdir(d): + if d in systemdirs: + logging.debug("bind mounting %s" % d) + if not _aufsOverlayMount(d, rw_dir, chroot_dir): + return False + else: + logging.debug("overlay mounting %s" % d) + if not _bindMount(d, chroot_dir+d, rbind=True): + return False + + # create binds for the systemdirs + #needs_bind_mount = set() + for line in map(string.strip, mounts.split("\n")): + if not line: continue + (device, mountpoint, fstype, options, a, b) = line.split() + if (fstype != "aufs" and + not is_real_fs(fstype) and + is_submount(mountpoint, systemdirs)): + logging.debug("found %s that needs bind mount", mountpoint) + if not _bindMount(mountpoint, chroot_dir+mountpoint): + return False + return True + +def setupAufs(rw_dir): + " setup aufs overlay over the rootfs " + # * we need to find a way to tell all the existing daemon + # to look into the new namespace. so probably something + # like a reboot is required and some hackery in initramfs-tools + # to ensure that we boot into a overlay ready system + # * this is much less of a issue with the aufsChroot code + logging.debug("setupAufs") + if not os.path.exists("/proc/mounts"): + logging.debug("no /proc/mounts, can not do aufs overlay") + return False + + from DistUpgradeMain import SYSTEM_DIRS + systemdirs = SYSTEM_DIRS + # verify that there are no submounts of a systemdir and collect + # the stuff that needs bind mounting (because a aufs does not + # include sub mounts) + needs_bind_mount = set() + needs_bind_mount.add("/var/cache/apt/archives") + for line in open("/proc/mounts"): + (device, mountpoint, fstype, options, a, b) = line.split() + if is_real_fs(fstype) and is_submount(mountpoint, systemdirs): + logging.warning("mountpoint %s submount of systemdir" % mountpoint) + return False + if (fstype != "aufs" and not is_real_fs(fstype) and is_submount(mountpoint, systemdirs)): + logging.debug("found %s that needs bind mount", mountpoint) + needs_bind_mount.add(mountpoint) + + # aufs mounts do not support stacked filesystems, so + # if we mount /var we will loose the tmpfs stuff + # first bind mount varun and varlock into the tmpfs + for d in needs_bind_mount: + if not _bindMount(d, rw_dir+"/needs_bind_mount/"+d): + return False + # setup writable overlay into /tmp/upgrade-rw so that all + # changes are written there instead of the real fs + for d in systemdirs: + if not is_aufs_mount(d): + if not _aufsOverlayMount(d, rw_dir): + return False + # now bind back the tempfs to the original location + for d in needs_bind_mount: + if not _bindMount(rw_dir+"/needs_bind_mount/"+d, d): + return False + + # The below information is only of historical relevance: + # now what we *could* do to apply the changes is to + # mount -o bind / /orig + # (bind is important, *not* rbind that includes submounts) + # + # This will give us the original "/" without the + # aufs rw overlay - *BUT* only if "/" is all on one parition + # + # then apply the diff (including the whiteouts) to /orig + # e.g. by "rsync -av /tmp/upgrade-rw /orig" + # "script that search for whiteouts and removes them" + # (whiteout files start with .wh.$name + # whiteout dirs with .wh..? - check with aufs man page) + return True + +if __name__ == "__main__": + logging.basicConfig(level=logging.DEBUG) + #print setupAufs("/tmp/upgrade-rw") + print setupAufsChroot("/tmp/upgrade-chroot-rw", + "/tmp/upgrade-chroot") diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeCache.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeCache.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeCache.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeCache.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,1218 @@ +# DistUpgradeCache.py +# +# Copyright (c) 2004-2008 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import warnings +warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning) +import apt +import apt_pkg +import os +import os.path +import re +import logging +import string +import statvfs +import time +import datetime +import threading +import ConfigParser +from subprocess import Popen, PIPE + +from DistUpgradeGettext import gettext as _ +from DistUpgradeGettext import ngettext + +from utils import inside_chroot, estimate_kernel_size_in_boot + +class CacheException(Exception): + pass +class CacheExceptionLockingFailed(CacheException): + pass +class CacheExceptionDpkgInterrupted(CacheException): + pass + +# the initrd/vmlinuz/abi space required in /boot for each kernel +# we estimate based on the current kernel size and add a safety marging +def _set_kernel_initrd_size(): + size = estimate_kernel_size_in_boot() + if size == 0: + logging.warn("estimate_kernel_size_in_boot() returned '0'?") + size = 30*1024*1024 + # add small safety buffer + size += 2*1024*1024 + return size +KERNEL_INITRD_SIZE = _set_kernel_initrd_size() + +class FreeSpaceRequired(object): + """ FreeSpaceRequired object: + + This exposes: + - the total size required (size_total) + - the dir that requires the space (dir) + - the additional space that is needed (size_needed) + """ + def __init__(self, size_total, dir, size_needed): + self.size_total = size_total + self.dir = dir + self.size_needed = size_needed + def __str__(self): + return "FreeSpaceRequired Object: Dir: %s size_total: %s size_needed: %s" % (self.dir, self.size_total, self.size_needed) + + +class NotEnoughFreeSpaceError(CacheException): + """ + Exception if there is not enough free space for this operation + + """ + def __init__(self, free_space_required_list): + self.free_space_required_list = free_space_required_list + +class MyCache(apt.Cache): + ReInstReq = 1 + HoldReInstReq = 3 + + # init + def __init__(self, config, view, quirks, progress=None, lock=True): + apt.Cache.__init__(self, progress) + self.to_install = [] + self.to_remove = [] + self.view = view + self.quirks = quirks + self.lock = False + self.partialUpgrade = False + self.config = config + self.metapkgs = self.config.getlist("Distro","MetaPkgs") + # acquire lock + self._listsLock = -1 + if lock: + try: + apt_pkg.PkgSystemLock() + self.lockListsDir() + self.lock = True + except SystemError, e: + # checking for this is ok, its not translatable + if "dpkg --configure -a" in str(e): + raise CacheExceptionDpkgInterrupted, e + raise CacheExceptionLockingFailed, e + # a list of regexp that are not allowed to be removed + self.removal_blacklist = config.getListFromFile("Distro","RemovalBlacklistFile") + self.uname = Popen(["uname","-r"],stdout=PIPE).communicate()[0].strip() + self._initAptLog() + # from hardy on we use recommends by default, so for the + # transition to the new dist we need to enable them now + if (config.get("Sources","From") == "hardy" and + not "RELEASE_UPGRADE_NO_RECOMMENDS" in os.environ): + apt_pkg.Config.set("APT::Install-Recommends","true") + + def _apply_dselect_upgrade(self): + """ honor the dselect install state """ + for pkg in self: + if pkg.is_installed: + continue + if pkg._pkg.selected_state == apt_pkg.SELSTATE_INSTALL: + # upgrade() will take care of this + pkg.mark_install(auto_inst=False, auto_fix=False) + + @property + def reqReinstallPkgs(self): + " return the packages not downloadable packages in reqreinst state " + reqreinst = set() + for pkg in self: + if (not pkg.candidateDownloadable and + (pkg._pkg.inst_state == self.ReInstReq or + pkg._pkg.inst_state == self.HoldReInstReq)): + reqreinst.add(pkg.name) + return reqreinst + + def fixReqReinst(self, view): + " check for reqreinst state and offer to fix it " + reqreinst = self.reqReinstallPkgs + if len(reqreinst) > 0: + header = ngettext("Remove package in bad state", + "Remove packages in bad state", + len(reqreinst)) + summary = ngettext("The package '%s' is in an inconsistent " + "state and needs to be reinstalled, but " + "no archive can be found for it. " + "Do you want to remove this package " + "now to continue?", + "The packages '%s' are in an inconsistent " + "state and need to be reinstalled, but " + "no archives can be found for them. Do you " + "want to remove these packages now to " + "continue?", + len(reqreinst)) % ", ".join(reqreinst) + if view.askYesNoQuestion(header, summary): + self.releaseLock() + cmd = ["dpkg","--remove","--force-remove-reinstreq"] + list(reqreinst) + view.getTerminal().call(cmd) + self.getLock() + return True + return False + + # logging stuff + def _initAptLog(self): + " init logging, create log file" + logdir = self.config.getWithDefault("Files","LogDir", + "/var/log/dist-upgrade") + if not os.path.exists(logdir): + os.makedirs(logdir) + apt_pkg.Config.set("Dir::Log",logdir) + apt_pkg.Config.set("Dir::Log::Terminal","apt-term.log") + self.logfd = os.open(os.path.join(logdir,"apt.log"), + os.O_RDWR|os.O_CREAT|os.O_APPEND, 0644) + os.write(self.logfd, "Log time: %s\n" % datetime.datetime.now()) + # turn on debugging in the cache + apt_pkg.Config.set("Debug::pkgProblemResolver","true") + apt_pkg.Config.set("Debug::pkgDepCache::AutoInstall","true") + def _startAptResolverLog(self): + if hasattr(self, "old_stdout"): + os.close(self.old_stdout) + os.close(self.old_stderr) + self.old_stdout = os.dup(1) + self.old_stderr = os.dup(2) + os.dup2(self.logfd, 1) + os.dup2(self.logfd, 2) + def _stopAptResolverLog(self): + os.fsync(1) + os.fsync(2) + os.dup2(self.old_stdout, 1) + os.dup2(self.old_stderr, 2) + # use this decorator instead of the _start/_stop stuff directly + # FIXME: this should probably be a decorator class where all + # logging is moved into? + def withResolverLog(f): + " decorator to ensure that the apt output is logged " + def wrapper(*args, **kwargs): + args[0]._startAptResolverLog() + res = f(*args, **kwargs) + args[0]._stopAptResolverLog() + return res + return wrapper + + # properties + @property + def requiredDownload(self): + """ get the size of the packages that are required to download """ + pm = apt_pkg.PackageManager(self._depcache) + fetcher = apt_pkg.Acquire() + pm.get_archives(fetcher, self._list, self._records) + return fetcher.fetch_needed + @property + def additionalRequiredSpace(self): + """ get the size of the additional required space on the fs """ + return self._depcache.usr_size + @property + def isBroken(self): + """ is the cache broken """ + return self._depcache.broken_count > 0 + + # methods + def lockListsDir(self): + name = apt_pkg.Config.find_dir("Dir::State::Lists") + "lock" + self._listsLock = apt_pkg.GetLock(name) + if self._listsLock < 0: + e = "Can not lock '%s' " % name + raise CacheExceptionLockingFailed, e + def unlockListsDir(self): + if self._listsLock > 0: + os.close(self._listsLock) + self._listsLock = -1 + def update(self, fprogress=None): + """ + our own update implementation is required because we keep the lists + dir lock + """ + self.unlockListsDir() + res = apt.Cache.update(self, fprogress) + self.lockListsDir() + if fprogress and fprogress.release_file_download_error: + # FIXME: not ideal error message, but we just reuse a + # existing one here to avoid a new string + raise IOError(_("The server may be overloaded")) + if res == False: + raise IOError("apt.cache.update() returned False, but did not raise exception?!?") + + def commit(self, fprogress, iprogress): + logging.info("cache.commit()") + if self.lock: + self.releaseLock() + apt.Cache.commit(self, fprogress, iprogress) + + def releaseLock(self, pkgSystemOnly=True): + if self.lock: + try: + apt_pkg.PkgSystemUnLock() + self.lock = False + except SystemError, e: + logging.debug("failed to SystemUnLock() (%s) " % e) + + def getLock(self, pkgSystemOnly=True): + if not self.lock: + try: + apt_pkg.PkgSystemLock() + self.lock = True + except SystemError, e: + logging.debug("failed to SystemLock() (%s) " % e) + + def downloadable(self, pkg, useCandidate=True): + " check if the given pkg can be downloaded " + if useCandidate: + ver = self._depcache.get_candidate_ver(pkg._pkg) + else: + ver = pkg._pkg.CurrentVer + if ver == None: + logging.warning("no version information for '%s' (useCandidate=%s)" % (pkg.name, useCandidate)) + return False + return ver.downloadable + + def pkgAutoRemovable(self, pkg): + """ check if the pkg is auto-removable """ + return (pkg.is_installed and + self._depcache.is_garbage(pkg._pkg)) + + def fixBroken(self): + """ try to fix broken dependencies on the system, may throw + SystemError when it can't""" + return self._depcache.FixBroken() + + def create_snapshot(self): + """ create a snapshot of the current changes """ + self.to_install = [] + self.to_remove = [] + for pkg in self.get_changes(): + if pkg.marked_install or pkg.marked_upgrade: + self.to_install.append(pkg.name) + if pkg.marked_delete: + self.to_remove.append(pkg.name) + + def clear(self): + self._depcache.Init() + + def restore_snapshot(self): + """ restore a snapshot """ + actiongroup = apt_pkg.ActionGroup(self._depcache) + # just make pyflakes shut up, later we need to use + # with self.actiongroup(): + actiongroup + self.clear() + for name in self.to_remove: + pkg = self[name] + pkg.mark_delete() + for name in self.to_install: + pkg = self[name] + pkg.mark_install(auto_fix=False, auto_inst=False) + + def needServerMode(self): + """ + This checks if we run on a desktop or a server install. + + A server install has more freedoms, for a desktop install + we force a desktop meta package to be install on the upgrade. + + We look for a installed desktop meta pkg and for key + dependencies, if none of those are installed we assume + server mode + """ + #logging.debug("needServerMode() run") + # check for the MetaPkgs (e.g. ubuntu-desktop) + metapkgs = self.config.getlist("Distro","MetaPkgs") + for key in metapkgs: + # if it is installed we are done + if self.has_key(key) and self[key].is_installed: + logging.debug("needServerMode(): run in 'desktop' mode, (because of pkg '%s')" % key) + return False + # if it is not installed, but its key depends are installed + # we are done too (we auto-select the package later) + deps_found = True + for pkg in self.config.getlist(key,"KeyDependencies"): + deps_found &= self.has_key(pkg) and self[pkg].is_installed + if deps_found: + logging.debug("needServerMode(): run in 'desktop' mode, (because of key deps for '%s')" % key) + return False + logging.debug("needServerMode(): can not find a desktop meta package or key deps, running in server mode") + return True + + def sanityCheck(self, view): + """ check if the cache is ok and if the required metapkgs + are installed + """ + if self.isBroken: + try: + logging.debug("Have broken pkgs, trying to fix them") + self.fixBroken() + except SystemError: + view.error(_("Broken packages"), + _("Your system contains broken packages " + "that couldn't be fixed with this " + "software. " + "Please fix them first using synaptic or " + "apt-get before proceeding.")) + return False + return True + + def mark_install(self, pkg, reason=""): + logging.debug("Installing '%s' (%s)" % (pkg, reason)) + if self.has_key(pkg): + self[pkg].mark_install() + if not (self[pkg].marked_install or self[pkg].marked_upgrade): + logging.error("Installing/upgrading '%s' failed" % pkg) + #raise (SystemError, "Installing '%s' failed" % pkg) + return False + return True + def mark_upgrade(self, pkg, reason=""): + logging.debug("Upgrading '%s' (%s)" % (pkg, reason)) + if self.has_key(pkg) and self[pkg].is_installed: + self[pkg].mark_upgrade() + if not self[pkg].marked_upgrade: + logging.error("Upgrading '%s' failed" % pkg) + return False + return True + def mark_remove(self, pkg, reason=""): + logging.debug("Removing '%s' (%s)" % (pkg, reason)) + if self.has_key(pkg): + self[pkg].mark_delete() + def mark_purge(self, pkg, reason=""): + logging.debug("Purging '%s' (%s)" % (pkg, reason)) + if self.has_key(pkg): + self._depcache.mark_delete(self[pkg]._pkg,True) + + def _keepInstalled(self, pkgname, reason): + if (self.has_key(pkgname) + and self[pkgname].is_installed + and self[pkgname].marked_delete): + self.mark_install(pkgname, reason) + + def keepInstalledRule(self): + """ run after the dist-upgrade to ensure that certain + packages are kept installed """ + # first the global list + for pkgname in self.config.getlist("Distro","KeepInstalledPkgs"): + self._keepInstalled(pkgname, "Distro KeepInstalledPkgs rule") + # the the per-metapkg rules + for key in self.metapkgs: + if self.has_key(key) and (self[key].is_installed or + self[key].marked_install): + for pkgname in self.config.getlist(key,"KeepInstalledPkgs"): + self._keepInstalled(pkgname, "%s KeepInstalledPkgs rule" % key) + + # only enforce section if we have a network. Otherwise we run + # into CD upgrade issues for installed language packs etc + if self.config.get("Options","withNetwork") == "True": + logging.debug("Running KeepInstalledSection rules") + # now the KeepInstalledSection code + for section in self.config.getlist("Distro","KeepInstalledSection"): + for pkg in self: + if pkg.candidateDownloadable and pkg.marked_delete and pkg.section == section: + self._keepInstalled(pkg.name, "Distro KeepInstalledSection rule: %s" % section) + for key in self.metapkgs: + if self.has_key(key) and (self[key].is_installed or + self[key].marked_install): + for section in self.config.getlist(key,"KeepInstalledSection"): + for pkg in self: + if pkg.candidateDownloadable and pkg.marked_delete and pkg.section == section: + self._keepInstalled(pkg.name, "%s KeepInstalledSection rule: %s" % (key, section)) + + + def postUpgradeRule(self): + " run after the upgrade was done in the cache " + for (rule, action) in [("Install", self.mark_install), + ("Upgrade", self.mark_upgrade), + ("Remove", self.mark_remove), + ("Purge", self.mark_purge)]: + # first the global list + for pkg in self.config.getlist("Distro","PostUpgrade%s" % rule): + action(pkg, "Distro PostUpgrade%s rule" % rule) + for key in self.metapkgs: + if self.has_key(key) and (self[key].is_installed or + self[key].marked_install): + for pkg in self.config.getlist(key,"PostUpgrade%s" % rule): + action(pkg, "%s PostUpgrade%s rule" % (key, rule)) + # run the quirks handlers + if not self.partialUpgrade: + self.quirks.run("PostDistUpgradeCache") + + def identifyObsoleteKernels(self): + # we have a funny policy that we remove security updates + # for the kernel from the archive again when a new ABI + # version hits the archive. this means that we have + # e.g. + # linux-image-2.6.24-15-generic + # is obsolete when + # linux-image-2.6.24-19-generic + # is available + # ... + # This code tries to identify the kernels that can be removed + logging.debug("identifyObsoleteKernels()") + obsolete_kernels = set() + version = self.config.get("KernelRemoval","Version") + basenames = self.config.getlist("KernelRemoval","BaseNames") + types = self.config.getlist("KernelRemoval","Types") + for pkg in self: + for base in basenames: + basename = "%s-%s-" % (base,version) + for type in types: + if (pkg.name.startswith(basename) and + pkg.name.endswith(type) and + pkg.is_installed): + if (pkg.name == "%s-%s" % (base,self.uname)): + logging.debug("skipping running kernel %s" % pkg.name) + continue + logging.debug("removing obsolete kernel '%s'" % pkg.name) + obsolete_kernels.add(pkg.name) + logging.debug("identifyObsoleteKernels found '%s'" % obsolete_kernels) + return obsolete_kernels + + def checkForNvidia(self): + """ + this checks for nvidia hardware and checks what driver is needed + """ + logging.debug("nvidiaUpdate()") + # if the free drivers would give us a equally hard time, we would + # never be able to release + try: + from NvidiaDetector.nvidiadetector import NvidiaDetection + except ImportError, e: + logging.error("NvidiaDetector can not be imported %s" % e) + return False + try: + # get new detection module and use the modalises files + # from within the release-upgrader + nv = NvidiaDetection(obsolete="./nvidia-obsolete.pkgs") + #nv = NvidiaDetection() + # check if a binary driver is installed now + for oldDriver in nv.oldPackages: + if oldDriver in self and self[oldDriver].is_installed: + self.mark_remove(oldDriver, "old nvidia driver") + break + else: + logging.info("no old nvidia driver installed, installing no new") + return False + # check which one to use + driver = nv.selectDriver() + logging.debug("nv.selectDriver() returned '%s'" % driver) + if not driver in self: + logging.warning("no '%s' found" % driver) + return False + if not (self[driver].marked_install or self[driver].marked_upgrade): + self[driver].mark_install() + logging.info("installing %s as suggested by NvidiaDetector" % driver) + return True + except Exception, e: + logging.error("NvidiaDetection returned a error: %s" % e) + return False + + + def getKernelsFromBaseInstaller(self): + """get the list of recommended kernels from base-installer""" + p = Popen(["/bin/sh", "./get_kernel_list.sh"], stdout=PIPE) + res = p.wait() + if res != 0: + logging.warn("./get_kernel_list.sh returned non-zero exitcode") + return "" + kernels = p.communicate()[0] + kernels = filter(lambda x : len(x) > 0, + map(string.strip, kernels.split("\n"))) + logging.debug("./get_kernel_list.sh returns: %s" % kernels) + return kernels + + def _selectKernelFromBaseInstaller(self): + """ use the get_kernel_list.sh script (that uses base-installer) + to figure out what kernel is most suitable for the system + """ + # check if we have a kernel from that list installed first + kernels = self.getKernelsFromBaseInstaller() + for kernel in kernels: + if not kernel in self: + logging.debug("%s not available in cache" % kernel) + continue + # this can happen e.g. on cdrom -> cdrom only upgrades + # where on hardy we have linux-386 but on the lucid CD + # we only have linux-generic + if not self[kernel].candidateDownloadable: + logging.debug("%s not downloadable" % kernel) + continue + # check if installed + if self[kernel].is_installed or self[kernel].marked_install: + logging.debug("%s kernel already installed" % kernel) + if self[kernel].is_upgradable and not self[kernel].marked_upgrade: + self.mark_upgrade(kernel, "Upgrading kernel from base-installer") + return + # if we have not found a kernel yet, use the first one that installs + for kernel in kernels: + if self.mark_install(kernel, + "Selecting new kernel from base-installer"): + if self._has_kernel_headers_installed(): + prefix, sep, postfix = kernel.partition("-") + headers = "%s-header-%s" % (prefix, postfix) + self.mark_install( + headers, + "Selecting new kernel headers from base-installer") + else: + logging.debug("no kernel-headers installed") + return + + def _has_kernel_headers_installed(self): + for pkg in self: + if (pkg.name.startswith("linux-headers-") and + pkg.is_installed): + return True + return False + + def checkForKernel(self): + """ check for the running kernel and try to ensure that we have + an updated version + """ + logging.debug("Kernel uname: '%s' " % self.uname) + try: + (version, build, flavour) = self.uname.split("-") + except Exception, e: + logging.warning("Can't parse kernel uname: '%s' (self compiled?)" % e) + return False + # now check if we have a SMP system + dmesg = Popen(["dmesg"],stdout=PIPE).communicate()[0] + if "WARNING: NR_CPUS limit" in dmesg: + logging.debug("UP kernel on SMP system!?!") + # use base-installer to get the kernel we want (if it exists) + if os.path.exists("./get_kernel_list.sh"): + self._selectKernelFromBaseInstaller() + else: + logging.debug("skipping ./get_kernel_list.sh: not found") + return True + + def checkPriority(self): + # tuple of priorities we require to be installed + need = ('required', ) + # stuff that its ok not to have + removeEssentialOk = self.config.getlist("Distro","RemoveEssentialOk") + # check now + for pkg in self: + # WORKADOUND bug on the CD/python-apt #253255 + ver = pkg._pcache._depcache.get_candidate_ver(pkg._pkg) + if ver and ver.Priority == 0: + logging.error("Package %s has no priority set" % pkg.name) + continue + if (pkg.candidateDownloadable and + not (pkg.is_installed or pkg.marked_install) and + not pkg.name in removeEssentialOk and + # ignore multiarch priority required packages + not ":" in pkg.name and + pkg.priority in need): + self.mark_install(pkg.name, "priority in required set '%s' but not scheduled for install" % need) + + # FIXME: make this a decorator (just like the withResolverLog()) + def updateGUI(self, view, lock): + i = 0 + while lock.locked(): + if i % 15 == 0: + view.pulseProgress() + view.processEvents() + time.sleep(0.02) + i += 1 + view.pulseProgress(finished=True) + view.processEvents() + + @withResolverLog + def distUpgrade(self, view, serverMode, partialUpgrade): + # keep the GUI alive + lock = threading.Lock() + lock.acquire() + t = threading.Thread(target=self.updateGUI, args=(self.view, lock,)) + t.start() + try: + # mvo: disabled as it casues to many errornous installs + #self._apply_dselect_upgrade() + + # upgrade (and make sure this way that the cache is ok) + self.upgrade(True) + + # check that everything in priority required is installed + self.checkPriority() + + # see if our KeepInstalled rules are honored + self.keepInstalledRule() + + # check if we got a new kernel (if we are not inside a + # chroot) + if inside_chroot(): + logging.warn("skipping kernel checks because we run inside a chroot") + else: + self.checkForKernel() + + # check for nvidia stuff + self.checkForNvidia() + + # and if we have some special rules + self.postUpgradeRule() + + # install missing meta-packages (if not in server upgrade mode) + self._keepBaseMetaPkgsInstalled(view) + if not serverMode: + # if this fails, a system error is raised + self._installMetaPkgs(view) + + # see if it all makes sense, if not this function raises + self._verifyChanges() + + except SystemError, e: + # this should go into a finally: line, see below for the + # rationale why it doesn't + lock.release() + t.join() + # FIXME: change the text to something more useful + details = _("An unresolvable problem occurred while " + "calculating the upgrade:\n%s\n\n " + "This can be caused by:\n" + " * Upgrading to a pre-release version of Ubuntu\n" + " * Running the current pre-release version of Ubuntu\n" + " * Unofficial software packages not provided by Ubuntu\n" + "\n") % e + # we never have partialUpgrades (including removes) on a stable system + # with only ubuntu sources so we do not recommend reporting a bug + if partialUpgrade: + details += _("This is most likely a transient problem, " + "please try again later.") + else: + details += _("If none of this applies, then please report this bug using " + "the command 'ubuntu-bug update-manager' in a terminal.") + # make the error text available again on stdout for the + # text frontend + self._stopAptResolverLog() + view.error(_("Could not calculate the upgrade"), details) + # start the resolver log again because this is run with + # the withResolverLog decorator + self._startAptResolverLog() + logging.error("Dist-upgrade failed: '%s'", e) + return False + # would be nice to be able to use finally: here, but we need + # to run on python2.4 too + #finally: + # wait for the gui-update thread to exit + lock.release() + t.join() + + # check the trust of the packages that are going to change + untrusted = [] + for pkg in self.get_changes(): + if pkg.marked_delete: + continue + # special case because of a bug in pkg.candidateOrigin + if pkg.marked_downgrade: + for ver in pkg._pkg.version_list: + # version is lower than installed one + if apt_pkg.version_compare( + ver.ver_str, pkg.installed.version) < 0: + for (verFileIter, index) in ver.file_list: + indexfile = pkg._pcache._list.find_index(verFileIter) + if indexfile and not indexfile.is_trusted: + untrusted.append(pkg.name) + break + continue + origins = pkg.candidate.origins + trusted = False + for origin in origins: + #print origin + trusted |= origin.trusted + if not trusted: + untrusted.append(pkg.name) + # check if the user overwrote the unauthenticated warning + try: + b = self.config.getboolean("Distro","AllowUnauthenticated") + if b: + logging.warning("AllowUnauthenticated set!") + return True + except ConfigParser.NoOptionError, e: + pass + if len(untrusted) > 0: + untrusted.sort() + logging.error("Unauthenticated packages found: '%s'" % \ + " ".join(untrusted)) + # FIXME: maybe ask a question here? instead of failing? + self._stopAptResolverLog() + view.error(_("Error authenticating some packages"), + _("It was not possible to authenticate some " + "packages. This may be a transient network problem. " + "You may want to try again later. See below for a " + "list of unauthenticated packages."), + "\n".join(untrusted)) + # start the resolver log again because this is run with + # the withResolverLog decorator + self._startAptResolverLog() + return False + return True + + def _verifyChanges(self): + """ this function tests if the current changes don't violate + our constrains (blacklisted removals etc) + """ + removeEssentialOk = self.config.getlist("Distro","RemoveEssentialOk") + # check changes + for pkg in self.get_changes(): + if pkg.marked_delete and self._inRemovalBlacklist(pkg.name): + logging.debug("The package '%s' is marked for removal but it's in the removal blacklist", pkg.name) + raise SystemError, _("The package '%s' is marked for removal but it is in the removal blacklist.") % pkg.name + if pkg.marked_delete and (pkg._pkg.Essential == True and + not pkg.name in removeEssentialOk): + logging.debug("The package '%s' is marked for removal but it's an ESSENTIAL package", pkg.name) + raise SystemError, _("The essential package '%s' is marked for removal.") % pkg.name + # check bad-versions blacklist + badVersions = self.config.getlist("Distro","BadVersions") + for bv in badVersions: + (pkgname, ver) = bv.split("_") + if (self.has_key(pkgname) and + self[pkgname].candidateVersion == ver and + (self[pkgname].marked_install or + self[pkgname].marked_upgrade)): + raise SystemError, _("Trying to install blacklisted version '%s'") % bv + return True + + def _lookupPkgRecord(self, pkg): + """ + helper to make sure that the pkg._records is pointing to the right + location - needed because python-apt 0.7.9 dropped the python-apt + version but we can not yet use the new version because on upgrade + the old version is still installed + """ + ver = pkg._pcache._depcache.get_candidate_ver(pkg._pkg) + if ver is None: + print "No candidate ver: ", pkg.name + return False + if ver.file_list is None: + print "No FileList for: %s " % self._pkg.Name() + return False + f, index = ver.file_list.pop(0) + pkg._pcache._records.lookup((f, index)) + return True + + @property + def installedTasks(self): + tasks = {} + installed_tasks = set() + for pkg in self: + if not self._lookupPkgRecord(pkg): + logging.debug("no PkgRecord found for '%s', skipping " % pkg.name) + continue + for line in pkg._pcache._records.record.split("\n"): + if line.startswith("Task:"): + for task in (line[len("Task:"):]).split(","): + task = task.strip() + if not tasks.has_key(task): + tasks[task] = set() + tasks[task].add(pkg.name) + for task in tasks: + installed = True + for pkgname in tasks[task]: + if not self[pkgname].is_installed: + installed = False + break + if installed: + installed_tasks.add(task) + return installed_tasks + + def installTasks(self, tasks): + logging.debug("running installTasks") + for pkg in self: + if pkg.marked_install or pkg.is_installed: + continue + self._lookupPkgRecord(pkg) + if not (hasattr(pkg._pcache._records,"record") and pkg._pcache._records.record): + logging.warning("can not find Record for '%s'" % pkg.name) + continue + for line in pkg._pcache._records.record.split("\n"): + if line.startswith("Task:"): + for task in (line[len("Task:"):]).split(","): + task = task.strip() + if task in tasks: + pkg.mark_install() + return True + + def _keepBaseMetaPkgsInstalled(self, view): + for pkg in self.config.getlist("Distro","BaseMetaPkgs"): + self._keepInstalled(pkg, "base meta package keep installed rule") + + def _installMetaPkgs(self, view): + + def metaPkgInstalled(): + """ + internal helper that checks if at least one meta-pkg is + installed or marked install + """ + for key in metapkgs: + if self.has_key(key): + pkg = self[key] + if pkg.is_installed and pkg.marked_delete: + logging.debug("metapkg '%s' installed but marked_delete" % pkg.name) + if ((pkg.is_installed and not pkg.marked_delete) + or self[key].marked_install): + return True + return False + + # now check for ubuntu-desktop, kubuntu-desktop, edubuntu-desktop + metapkgs = self.config.getlist("Distro","MetaPkgs") + + # we never go without ubuntu-base + for pkg in self.config.getlist("Distro","BaseMetaPkgs"): + self[pkg].mark_install() + + # every meta-pkg that is installed currently, will be marked + # install (that result in a upgrade and removes a markDelete) + for key in metapkgs: + try: + if (self.has_key(key) and + self[key].is_installed and + self[key].is_upgradable): + logging.debug("Marking '%s' for upgrade" % key) + self[key].mark_upgrade() + except SystemError, e: + # warn here, but don't fail, its possible that meta-packages + # conflict (like ubuntu-desktop vs xubuntu-desktop) LP: #775411 + logging.warn("Can't mark '%s' for upgrade (%s)" % (key,e)) + + # check if we have a meta-pkg, if not, try to guess which one to pick + if not metaPkgInstalled(): + logging.debug("none of the '%s' meta-pkgs installed" % metapkgs) + for key in metapkgs: + deps_found = True + for pkg in self.config.getlist(key,"KeyDependencies"): + deps_found &= self.has_key(pkg) and self[pkg].is_installed + if deps_found: + logging.debug("guessing '%s' as missing meta-pkg" % key) + try: + self[key].mark_install() + except (SystemError, KeyError), e: + logging.error("failed to mark '%s' for install (%s)" % (key,e)) + view.error(_("Can't install '%s'") % key, + _("It was impossible to install a " + "required package. Please report " + "this as a bug using " + "'ubuntu-bug update-manager' in " + "a terminal.")) + return False + logging.debug("marked_install: '%s' -> '%s'" % (key, self[key].marked_install)) + break + # check if we actually found one + if not metaPkgInstalled(): + # FIXME: provide a list + view.error(_("Can't guess meta-package"), + _("Your system does not contain a " + "ubuntu-desktop, kubuntu-desktop, xubuntu-desktop or " + "edubuntu-desktop package and it was not " + "possible to detect which version of " + "Ubuntu you are running.\n " + "Please install one of the packages " + "above first using synaptic or " + "apt-get before proceeding.")) + return False + return True + + def _inRemovalBlacklist(self, pkgname): + for expr in self.removal_blacklist: + if re.compile(expr).match(pkgname): + logging.debug("blacklist expr '%s' matches '%s'" % (expr, pkgname)) + return True + return False + + @withResolverLog + def tryMarkObsoleteForRemoval(self, pkgname, remove_candidates, foreign_pkgs): + #logging.debug("tryMarkObsoleteForRemoval(): %s" % pkgname) + # sanity check, first see if it looks like a running kernel pkg + if pkgname.endswith(self.uname): + logging.debug("skipping running kernel pkg '%s'" % pkgname) + return False + if self._inRemovalBlacklist(pkgname): + logging.debug("skipping '%s' (in removalBlacklist)" % pkgname) + return False + # ensure we honor KeepInstalledSection here as well + for section in self.config.getlist("Distro","KeepInstalledSection"): + if self.has_key(pkgname) and self[pkgname].section == section: + logging.debug("skipping '%s' (in KeepInstalledSection)" % pkgname) + return False + # if we don't have the package anyway, we are fine (this can + # happen when forced_obsoletes are specified in the config file) + if not self.has_key(pkgname): + #logging.debug("package '%s' not in cache" % pkgname) + return True + # check if we want to purge + try: + purge = self.config.getboolean("Distro","PurgeObsoletes") + except ConfigParser.NoOptionError, e: + purge = False + + # this is a delete candidate, only actually delete, + # if it dosn't remove other packages depending on it + # that are not obsolete as well + actiongroup = apt_pkg.ActionGroup(self._depcache) + # just make pyflakes shut up, later we should use + # with self.actiongroup(): + actiongroup + self.create_snapshot() + try: + self[pkgname].markDelete(purge=purge) + self.view.processEvents() + #logging.debug("marking '%s' for removal" % pkgname) + for pkg in self.get_changes(): + if (pkg.name not in remove_candidates or + pkg.name in foreign_pkgs or + self._inRemovalBlacklist(pkg.name)): + logging.debug("package '%s' has unwanted removals, skipping" % pkgname) + self.restore_snapshot() + return False + except (SystemError,KeyError),e: + logging.warning("_tryMarkObsoleteForRemoval failed for '%s' (%s: %s)" % (pkgname, repr(e), e)) + self.restore_snapshot() + return False + return True + + def _getObsoletesPkgs(self): + " get all package names that are not downloadable " + obsolete_pkgs =set() + for pkg in self: + if pkg.is_installed: + # check if any version is downloadable. we need to check + # for older ones too, because there might be + # cases where e.g. firefox in gutsy-updates is newer + # than hardy + if not self.anyVersionDownloadable(pkg): + obsolete_pkgs.add(pkg.name) + return obsolete_pkgs + + def anyVersionDownloadable(self, pkg): + " helper that checks if any of the version of pkg is downloadable " + for ver in pkg._pkg.version_list: + if ver.downloadable: + return True + return False + + def _getUnusedDependencies(self): + " get all package names that are not downloadable " + unused_dependencies =set() + for pkg in self: + if pkg.is_installed and self._depcache.is_garbage(pkg._pkg): + unused_dependencies.add(pkg.name) + return unused_dependencies + + def get_installed_demoted_packages(self): + """ return list of installed and demoted packages + + If a demoted package is a automatic install it will be skipped + """ + demotions = set() + demotions_file = self.config.get("Distro","Demotions") + if os.path.exists(demotions_file): + map(lambda pkgname: demotions.add(pkgname.strip()), + filter(lambda line: not line.startswith("#"), + open(demotions_file).readlines())) + installed_demotions = set() + for demoted_pkgname in demotions: + if not self.has_key(demoted_pkgname): + continue + pkg = self[demoted_pkgname] + if (not pkg.is_installed or + self._depcache.is_auto_installed(pkg._pkg) or + pkg.marked_delete): + continue + installed_demotions.add(pkg) + return list(installed_demotions) + + def _getForeignPkgs(self, allowed_origin, fromDist, toDist): + """ get all packages that are installed from a foreign repo + (and are actually downloadable) + """ + foreign_pkgs=set() + for pkg in self: + if pkg.is_installed and self.downloadable(pkg): + # assume it is foreign and see if it is from the + # official archive + foreign=True + for origin in pkg.candidateOrigin: + # FIXME: use some better metric here + if fromDist in origin.archive and \ + origin.origin == allowed_origin: + foreign = False + if toDist in origin.archive and \ + origin.origin == allowed_origin: + foreign = False + if foreign: + foreign_pkgs.add(pkg.name) + return foreign_pkgs + + def checkFreeSpace(self, snapshots_in_use=False): + """ + this checks if we have enough free space on /var, /boot and /usr + with the given cache + + Note: this can not be fully accurate if there are multiple + mountpoints for /usr, /var, /boot + """ + + class FreeSpace(object): + " helper class that represents the free space on each mounted fs " + def __init__(self, initialFree): + self.free = initialFree + self.need = 0 + + def make_fs_id(d): + """ return 'id' of a directory so that directories on the + same filesystem get the same id (simply the mount_point) + """ + for mount_point in mounted: + if d.startswith(mount_point): + return mount_point + return "/" + + # this is all a bit complicated + # 1) check what is mounted (in mounted) + # 2) create FreeSpace objects for the dirs we are interested in + # (mnt_map) + # 3) use the mnt_map to check if we have enough free space and + # if not tell the user how much is missing + mounted = [] + mnt_map = {} + fs_free = {} + for line in open("/proc/mounts"): + try: + (what, where, fs, options, a, b) = line.split() + except ValueError, e: + logging.debug("line '%s' in /proc/mounts not understood (%s)" % (line, e)) + continue + if not where in mounted: + mounted.append(where) + # make sure mounted is sorted by longest path + mounted.sort(cmp=lambda a,b: cmp(len(a),len(b)), reverse=True) + archivedir = apt_pkg.Config.find_dir("Dir::Cache::archives") + aufs_rw_dir = "/tmp/" + if (hasattr(self, "config") and + self.config.getWithDefault("Aufs","Enabled", False)): + aufs_rw_dir = self.config.get("Aufs","RWDir") + if not os.path.exists(aufs_rw_dir): + os.makedirs(aufs_rw_dir) + logging.debug("cache aufs_rw_dir: %s" % aufs_rw_dir) + for d in ["/","/usr","/var","/boot", archivedir, aufs_rw_dir, "/home","/tmp/"]: + d = os.path.realpath(d) + fs_id = make_fs_id(d) + if os.path.exists(d): + st = os.statvfs(d) + free = st[statvfs.F_BAVAIL]*st[statvfs.F_FRSIZE] + else: + logging.warn("directory '%s' does not exists" % d) + free = 0 + if fs_id in mnt_map: + logging.debug("Dir %s mounted on %s" % (d,mnt_map[fs_id])) + fs_free[d] = fs_free[mnt_map[fs_id]] + else: + logging.debug("Free space on %s: %s" % (d,free)) + mnt_map[fs_id] = d + fs_free[d] = FreeSpace(free) + del mnt_map + logging.debug("fs_free contains: '%s'" % fs_free) + + # now calculate the space that is required on /boot + # we do this by checking how many linux-image-$ver packages + # are installed or going to be installed + space_in_boot = 0 + for pkg in self: + # we match against everything that looks like a kernel + # and add space check to filter out metapackages + if re.match("^linux-(image|image-debug)-[0-9.]*-.*", pkg.name): + if pkg.marked_install: + logging.debug("%s (new-install) added with %s to boot space" % (pkg.name, KERNEL_INITRD_SIZE)) + space_in_boot += KERNEL_INITRD_SIZE + # mvo: jaunty does not create .bak files anymore + #elif (pkg.marked_upgrade or pkg.is_installed): + # logging.debug("%s (upgrade|installed) added with %s to boot space" % (pkg.name, KERNEL_INITRD_SIZE)) + # space_in_boot += KERNEL_INITRD_SIZE # creates .bak + + # we check for various sizes: + # archivedir is were we download the debs + # /usr is assumed to get *all* of the install space (incorrect, + # but as good as we can do currently + safety buffer + # / has a small safety buffer as well + required_for_aufs = 0.0 + if (hasattr(self, "config") and + self.config.getWithDefault("Aufs","Enabled", False)): + logging.debug("taking aufs overlay into space calculation") + aufs_rw_dir = self.config.get("Aufs","RWDir") + # if we use the aufs rw overlay all the space is consumed + # the overlay dir + for pkg in self: + if pkg.marked_upgrade or pkg.marked_install: + required_for_aufs += pkg.candidate.installed_size + + # add old size of the package if we use snapshots + required_for_snapshots = 0.0 + if snapshots_in_use: + for pkg in self: + if (pkg.is_installed and + (pkg.marked_upgrade or pkg.marked_delete)): + required_for_snapshots += pkg.installed.installed_size + logging.debug("additional space for the snapshots: %s" % required_for_snapshots) + + # sum up space requirements + for (dir, size) in [(archivedir, self.requiredDownload), + # plus 50M safety buffer in /usr + ("/usr", self.additionalRequiredSpace), + ("/usr", 50*1024*1024), + ("/boot", space_in_boot), + ("/tmp", 5*1024*1024), # /tmp for dkms LP: #427035 + ("/", 10*1024*1024), # small safety buffer / + (aufs_rw_dir, required_for_aufs), + # if snapshots are in use + ("/usr", required_for_snapshots), + ]: + dir = os.path.realpath(dir) + logging.debug("dir '%s' needs '%s' of '%s' (%f)" % (dir, size, fs_free[dir], fs_free[dir].free)) + fs_free[dir].free -= size + fs_free[dir].need += size + + + # check for space required violations + required_list = {} + for dir in fs_free: + if fs_free[dir].free < 0: + free_at_least = apt_pkg.SizeToStr(float(abs(fs_free[dir].free)+1)) + # make_fs_id ensures we only get stuff on the same + # mountpoint, so we report the requirements only once + # per mountpoint + required_list[make_fs_id(dir)] = FreeSpaceRequired(apt_pkg.SizeToStr(fs_free[dir].need), make_fs_id(dir), free_at_least) + # raise exception if free space check fails + if len(required_list) > 0: + logging.error("Not enough free space: %s" % [str(i) for i in required_list]) + raise NotEnoughFreeSpaceError(required_list.values()) + return True + + + +if __name__ == "__main__": + import sys + import DistUpgradeConfigParser + import DistUpgradeView + print "foo" + c = MyCache(DistUpgradeConfigParser.DistUpgradeConfig("."), + DistUpgradeView.DistUpgradeView(), None) + #c.checkForNvidia() + #print c._identifyObsoleteKernels() + print c.checkFreeSpace() + sys.exit() + + c.clear() + c.create_snapshot() + c.installedTasks + c.installTasks(["ubuntu-desktop"]) + print c.get_changes() + c.restore_snapshot() diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,117 @@ +[View] +# the views will be tried in this order, if one fails to import, the next +# is tried +View=DistUpgradeViewGtk,DistUpgradeViewGtk3,DistUpgradeViewKDE,DistUpgradeViewText +#View=DistUpgradeViewNonInteractive +#Depends= python-apt (>= 0.6.0), apt (>= 0.6) +# the views below support upgrades over ssh connection +SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive + +# Distro contains global information about the upgrade +[Distro] +# the meta-pkgs we support +MetaPkgs=ubuntu-desktop, kubuntu-desktop, xubuntu-desktop, ubuntustudio-desktop, ichthux-desktop, mythbuntu-desktop, ubuntu-netbook, kubuntu-netbook, lubuntu-desktop +BaseMetaPkgs=ubuntu-minimal, ubuntu-standard +Demotions=demoted.cfg +RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin +RemovalBlacklistFile=removal_blacklist.cfg +# if those packages were installed, make sure to keep them installed +KeepInstalledPkgs=gnumeric, hpijs, xserver-xorg-video-all +KeepInstalledSection=translations +RemoveObsoletes=yes +ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools +# hints for for stuff that should be done early +PostUpgradePurge=ltsp-client, ltspfsd, linux-restricted-modules-common +PostUpgradeRemove=libflashsupport, kvm-source, gtk-qt-engine, libparted1.8-12, usplash, printconf, foomatic-db-gutenprint, ebox-printers, kbluetooth, kde-plasmoid-cwp +PostUpgradeUpgrade=brasero,edubuntu-desktop +#PostUpgradeInstall=apt +PostInstallScripts=./xorg_fix_proprietary.py +EnableApport=yes +# this supported blacklisting certain versions to ensure we do not upgrade +# - blcr-dkms fails to build on kernel 2.6.35 +BadVersions=blcr-dkms_0.8.2-13 +# ubiquity slideshow +#SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/ + +[KernelRemoval] +Version=3.0.0 +BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules,linux-header-lbm +Types=386,ec2,generic,rt,server,virtual + +# information about the individual meta-pkgs +[ubuntu-desktop] +KeyDependencies=gdm, ubuntu-artwork, ubuntu-sounds +# those pkgs will be marked remove right after the distUpgrade in the cache +PostUpgradeRemove=xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner +ForcedObsoletes=desktop-effects, cups-pdf, gnome-app-install, policykit-gnome, gnome-mount + +[kubuntu-desktop] +KeyDependencies=kdm, kubuntu-artwork +PostUpgradeRemove=powermanagement-interface, guidance-power-manager, kde-guidance-powermanager +# those packages are marked as obsolete right after the upgrade +ForcedObsoletes=ivman, cups-pdf, gtk-qt-engine + +[kubuntu-netbook] +KeyDependencies=kdm, kubuntu-netbook-default-settings + +[ubuntu-netbook] +KeyDependencies=gdm, ubuntu-netbook-default-settings + +[xubuntu-desktop] +KeyDependencies=xubuntu-artwork, xubuntu-default-settings, xfwm4 +PostUpgradeRemove=notification-daemon +ForcedObsoletes=cups-pdf + +[ubuntustudio-desktop] +KeyDependencies=ubuntustudio-default-settings, ubuntustudio-look + +[ichthux-desktop] +KeyDependencies=ichthux-artwork, ichthux-default-settings + +[mythbuntu-desktop] +KeyDependencies=mythbuntu-artwork, mythbuntu-default-settings + +[lubuntu-desktop] +KeyDependencies=lubuntu-core, lubuntu-default-settings +#Remove previous gnome component from lubuntu to avoid pulling gnome depends on upgrade (LP: #945215) +PostUpgradeRemove=gnome-bluetooth, gnome-power-manager + +[Files] +BackupExt=distUpgrade +LogDir=/var/log/dist-upgrade/ + +[Sources] +From=oneiric +To=precise +ValidOrigin=Ubuntu +ValidMirrors = mirrors.cfg +Components=main,restricted,universe,multiverse +Pockets=security,updates,proposed,backports +;AllowThirdParty=False + +;[PreRequists] +;Packages=release-upgrader-apt,release-upgrader-dpkg +;SourcesList=prerequists-sources.list +;SourcesList-ia64=prerequists-sources.ports.list +;SourcesList-hppa=prerequists-sources.ports.list + +[Aufs] +; this is a xor option, either full or chroot overlay +;EnableFullOverlay=yes +;EnableChrootOverlay=yes +; sync changes from the chroot back to the real system +;EnableChrootRsync=yes +; what chroot dir to use +;ChrootDir=/tmp/upgrade-chroot +; the RW dir to use (either for full overlay or chroot overlay) +;RWDir=/tmp/upgrade-rw + +[Network] +MaxRetries=3 + +[NonInteractive] +ForceOverwrite=yes +RealReboot=no +DebugBrokenScripts=no +DpkgProgressLog=no +;TerminalTimeout=2400 diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg.dapper update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg.dapper --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg.dapper 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg.dapper 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,56 @@ +[View] +View=DistUpgradeViewGtk,DistUpgradeViewKDE, DistUpgradeViewText + +# Distro contains global information about the upgrade +[Distro] +# the meta-pkgs we support +MetaPkgs=ubuntu-desktop, kubuntu-desktop, edubuntu-desktop, xubuntu-desktop +BaseMetaPkgs=ubuntu-minimal, ubuntu-standard, bash +PostUpgradePurge=xorg-common, libgl1-mesa, ltsp-client, ltspfsd, python2.3 +Demotions=demoted.cfg.dapper +RemoveEssentialOk=sysvinit +RemovalBlacklistFile=removal_blacklist.cfg +PostInstallScripts=/usr/lib/udev/migrate-fstab-to-uuid.sh +KeepInstalledPkgs=lvm2 +KeepInstalledSection=translations +RemoveObsoletes=yes +ForcedObsoletes=esound, esound-common, slocate, ksplash-engine-moodin + +# information about the individual meta-pkgs +[ubuntu-desktop] +KeyDependencies=gdm, gnome-panel, ubuntu-artwork +# those pkgs will be marked remove right after the distUpgrade in the cache +PostUpgradeRemove=xchat, xscreensaver, gnome-cups-manager + +[kubuntu-desktop] +KeyDependencies=kdm, kicker, kubuntu-artwork-usplash +# those packages are marked as obsolete right after the upgrade +ForcedObsoletes=ivman, slocate + +[edubuntu-desktop] +KeyDependencies=edubuntu-artwork, tuxpaint + +[xubuntu-desktop] +KeyDependencies=xubuntu-artwork-usplash, xubuntu-default-settings, xfwm4 + + +[Files] +BackupExt=distUpgrade +LogDir=/var/log/dist-upgrade + +[PreRequists] +Packages=release-upgrader-apt,release-upgrader-dpkg +SourcesList=prerequists-sources.dapper.list +SourcesList-ia64=prerequists-sources.dapper-ports.list +SourcesList-hppa=prerequists-sources.dapper-ports.list + +[Sources] +From=dapper +To=hardy +ValidOrigin=Ubuntu +ValidMirrors = mirrors.cfg + +[Network] +MaxRetries=3 + + diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg.hardy update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg.hardy --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg.hardy 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg.hardy 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,106 @@ +[View] +# the views will be tried in this order, if one fails to import, the next +# is tried +View=DistUpgradeViewGtk,DistUpgradeViewKDE,DistUpgradeViewText +#View=DistUpgradeViewNonInteractive +#Depends= python-apt (>= 0.6.0), apt (>= 0.6) +# the views below support upgrades over ssh connection +SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive + +# Distro contains global information about the upgrade +[Distro] +# the meta-pkgs we support +MetaPkgs=ubuntu-desktop, kubuntu-desktop, edubuntu-desktop, xubuntu-desktop, ubuntustudio-desktop, ichthux-desktop, mythbuntu-desktop, kubuntu-kde4-desktop +BaseMetaPkgs=ubuntu-minimal, ubuntu-standard +Demotions=demoted.cfg.hardy +RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin +RemovalBlacklistFile=removal_blacklist.cfg +# if those packages were installed, make sure to keep them installed +KeepInstalledPkgs=gnumeric, hpijs, xserver-xorg-video-all +KeepInstalledSection=translations +RemoveObsoletes=yes +ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools +# libflashsupport is now oboselete and causes problems so we remove it +# early +PostUpgradePurge=ltsp-client, ltspfsd, linux-restricted-modules-common +PostUpgradeRemove=libflashsupport, slocate, gtk-qt-engine, libparted1.8-12, usplash +#PostUpgradeInstall=apt +PostInstallScripts=./xorg_fix_proprietary.py +# this supported blacklisting certain versions to ensure we do not upgrade +# - the openoffice.org-filter-binfilter causes a pre-depends cycle error +# (#516727) +BadVersions=openoffice.org-filter-binfilter_1:3.2.0~rc4-1ubuntu1 +EnableApport=no + +[KernelRemoval] +Version=2.6.24 +BaseNames=linux-image,linux-headers,linux-image-debug,linux-ubuntu-modules,linux-header-lum,linux-backport-modules,linux-header-lbm,linux-restricted-modules +Types=386,generic,rt,server,virtual + +# information about the individual meta-pkgs +[ubuntu-desktop] +KeyDependencies=gdm, usplash-theme-ubuntu, ubuntu-artwork, ubuntu-sounds +# those pkgs will be marked remove right after the distUpgrade in the cache +PostUpgradeRemove=xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner, tracker +ForcedObsoletes=desktop-effects, cups-pdf + +[kubuntu-desktop] +KeyDependencies=kdm, kubuntu-artwork-usplash +PostUpgradeRemove=powermanagement-interface,adept +# those packages are marked as obsolete right after the upgrade +ForcedObsoletes=ivman, cups-pdf, guidance-power-manager, gtk-qt-engine + +[kubuntu-kde4-desktop] +KeyDependencies=kdebase-bin-kde4, kubuntu-artwork-usplash, kwin-kde4 + +[edubuntu-desktop] +KeyDependencies=edubuntu-artwork, tuxpaint + +[xubuntu-desktop] +KeyDependencies=xubuntu-artwork-usplash, xubuntu-default-settings, xfwm4 +PostUpgradeRemove=notification-daemon +ForcedObsoletes=cups-pdf + +[ubuntustudio-desktop] +KeyDependencies=ubuntustudio-default-settings, ubuntustudio-look, usplash-theme-ubuntustudio + +[ichthux-desktop] +KeyDependencies=ichthux-artwork-usplash, ichthux-default-settings + +[mythbuntu-desktop] +KeyDependencies=mythbuntu-artwork-usplash,mythbuntu-default-settings + +[Files] +BackupExt=distUpgrade +LogDir=/var/log/dist-upgrade/ + +[Sources] +From=hardy +To=lucid +ValidOrigin=Ubuntu +ValidMirrors = mirrors.cfg +Components=main,restricted,universe,multiverse + +;[PreRequists] +;Packages=release-upgrader-apt,release-upgrader-dpkg +;SourcesList=prerequists-sources.list +;SourcesList-ia64=prerequists-sources.ports.list +;SourcesList-hppa=prerequists-sources.ports.list + +[Aufs] +; this is a xor option, either full or chroot overlay +;EnableFullOverlay=yes +;EnableChrootOverlay=yes +; sync changes from the chroot back to the real system +;EnableChrootRsync=yes +; what chroot dir to use +;ChrootDir=/tmp/upgrade-chroot +; the RW dir to use (either for full overlay or chroot overlay) +;RWDir=/tmp/upgrade-rw + +[Network] +MaxRetries=3 + +[NonInteractive] +ForceOverwrite=no +RealReboot=no diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg.lucid update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg.lucid --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg.lucid 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg.lucid 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,114 @@ +[View] +# the views will be tried in this order, if one fails to import, the next +# is tried +View=DistUpgradeViewGtk,DistUpgradeViewGtk3,DistUpgradeViewKDE,DistUpgradeViewText +#View=DistUpgradeViewNonInteractive +#Depends= python-apt (>= 0.6.0), apt (>= 0.6) +# the views below support upgrades over ssh connection +SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive + +# Distro contains global information about the upgrade +[Distro] +# the meta-pkgs we support +MetaPkgs=ubuntu-desktop, kubuntu-desktop, xubuntu-desktop, ubuntustudio-desktop, ichthux-desktop, mythbuntu-desktop, ubuntu-netbook, kubuntu-netbook +BaseMetaPkgs=ubuntu-minimal, ubuntu-standard +Demotions=demoted.cfg +RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin +RemovalBlacklistFile=removal_blacklist.cfg +# if those packages were installed, make sure to keep them installed +KeepInstalledPkgs=gnumeric, hpijs, xserver-xorg-video-all +KeepInstalledSection=translations +RemoveObsoletes=yes +ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools +# hints for for stuff that should be done early +PostUpgradePurge=ltsp-client, ltspfsd, linux-restricted-modules-common +PostUpgradeRemove=libflashsupport, kvm-source, gtk-qt-engine, libparted1.8-12, usplash, printconf, foomatic-db-gutenprint, ebox-printers, kbluetooth, kde-plasmoid-cwp +PostUpgradeUpgrade=brasero,edubuntu-desktop +#PostUpgradeInstall=apt +PostInstallScripts=./xorg_fix_proprietary.py +EnableApport=yes +# this supported blacklisting certain versions to ensure we do not upgrade +# - blcr-dkms fails to build on kernel 2.6.35 +BadVersions=blcr-dkms_0.8.2-13 +# ubiquity slideshow +#SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/ +# useful for e.g. testing +;AllowUnauthenticated=yes + +[KernelRemoval] +Version=2.6.32 +BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules,linux-header-lbm +Types=386,ec2,generic,rt,server,virtual + +# information about the individual meta-pkgs +[ubuntu-desktop] +KeyDependencies=gdm, ubuntu-artwork, ubuntu-sounds +# those pkgs will be marked remove right after the distUpgrade in the cache +PostUpgradeRemove=xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner +ForcedObsoletes=desktop-effects, cups-pdf, gnome-app-install, policykit-gnome, gnome-mount + +[kubuntu-desktop] +KeyDependencies=kdm, kubuntu-artwork +PostUpgradeRemove=powermanagement-interface, guidance-power-manager, kde-guidance-powermanager +# those packages are marked as obsolete right after the upgrade +ForcedObsoletes=ivman, cups-pdf, gtk-qt-engine + +[kubuntu-netbook] +KeyDependencies=kdm, kubuntu-netbook-default-settings + +[ubuntu-netbook] +KeyDependencies=gdm, ubuntu-netbook-default-settings + +[xubuntu-desktop] +KeyDependencies=xubuntu-artwork, xubuntu-default-settings, xfwm4 +PostUpgradeRemove=notification-daemon +ForcedObsoletes=cups-pdf + +[ubuntustudio-desktop] +KeyDependencies=ubuntustudio-default-settings, ubuntustudio-look + +[ichthux-desktop] +KeyDependencies=ichthux-artwork, ichthux-default-settings + +[mythbuntu-desktop] +KeyDependencies=mythbuntu-artwork, mythbuntu-default-settings + +[Files] +BackupExt=distUpgrade +LogDir=/var/log/dist-upgrade/ + +[Sources] +From=lucid +To=precise +ValidOrigin=Ubuntu +ValidMirrors = mirrors.cfg +Components=main,restricted,universe,multiverse +Pockets=security,updates,proposed,backports +;AllowThirdParty=False + +[PreRequists] +Packages=libapt-pkg4.12,libapt-inst1.4,release-upgrader-python-apt +SourcesList=prerequists-sources.list +;SourcesList-ia64=prerequists-sources.ports.list +;SourcesList-hppa=prerequists-sources.ports.list + +[Aufs] +; this is a xor option, either full or chroot overlay +;EnableFullOverlay=yes +;EnableChrootOverlay=yes +; sync changes from the chroot back to the real system +;EnableChrootRsync=yes +; what chroot dir to use +;ChrootDir=/tmp/upgrade-chroot +; the RW dir to use (either for full overlay or chroot overlay) +;RWDir=/tmp/upgrade-rw + +[Network] +MaxRetries=3 + +[NonInteractive] +ForceOverwrite=yes +RealReboot=no +DebugBrokenScripts=no +DpkgProgressLog=no +;TerminalTimeout=2400 diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeConfigParser.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeConfigParser.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeConfigParser.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeConfigParser.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,70 @@ +from ConfigParser import SafeConfigParser, NoOptionError, NoSectionError +import subprocess +import os.path +import logging +import glob + +CONFIG_OVERRIDE_DIR = "/etc/update-manager/release-upgrades.d" + +class DistUpgradeConfig(SafeConfigParser): + def __init__(self, datadir, name="DistUpgrade.cfg", + override_dir=CONFIG_OVERRIDE_DIR, + defaults_dir=None): + SafeConfigParser.__init__(self) + # we support a config overwrite, if DistUpgrade.cfg.dapper exists + # and the user runs dapper, that one will be used + from_release = subprocess.Popen(["lsb_release","-c","-s"], + stdout=subprocess.PIPE).communicate()[0].strip() + self.datadir=datadir + if os.path.exists(name+"."+from_release): + name = name+"."+from_release + maincfg = os.path.join(datadir,name) + # defaults are read first + self.config_files = [] + if defaults_dir: + for cfg in glob.glob(defaults_dir+"/*.cfg"): + self.config_files.append(cfg) + # our config file + self.config_files += [maincfg] + # overrides are read later + for cfg in glob.glob(override_dir+"/*.cfg"): + self.config_files.append(cfg) + self.read(self.config_files) + def getWithDefault(self, section, option, default): + try: + if type(default) == bool: + return self.getboolean(section, option) + elif type(default) == float: + return self.getfloat(section, option) + elif type(default) == int: + return self.getint(section, option) + return self.get(section, option) + except (NoSectionError, NoOptionError): + return default + def getlist(self, section, option): + try: + tmp = self.get(section, option) + except (NoSectionError,NoOptionError): + return [] + items = [x.strip() for x in tmp.split(",")] + return items + def getListFromFile(self, section, option): + try: + filename = self.get(section, option) + except NoOptionError: + return [] + p = os.path.join(self.datadir,filename) + if not os.path.exists(p): + logging.error("getListFromFile: no '%s' found" % p) + items = [x.strip() for x in open(p)] + return filter(lambda s: not s.startswith("#") and not s == "", items) + + +if __name__ == "__main__": + c = DistUpgradeConfig(".") + print c.getlist("Distro","MetaPkgs") + print c.getlist("Distro","ForcedPurges") + print c.getListFromFile("Sources","ValidMirrors") + print c.getWithDefault("Distro","EnableApport", True) + print c.set("Distro","Foo", "False") + print c.getWithDefault("Distro","Foo", True) diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeController.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeController.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeController.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeController.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,1779 @@ +# DistUpgradeController.py +# +# Copyright (c) 2004-2008 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + + +import warnings +warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning) +import apt +import apt_pkg +import sys +import os +import subprocess +import locale +import logging +import shutil +import glob +import time +import copy +import ConfigParser +from utils import (country_mirror, + url_downloadable, + check_and_fix_xbit, + get_arch, + iptables_active, + inside_chroot, + get_string_with_no_auth_from_source_entry, + is_child_of_process_name) +from string import Template +from urlparse import urlsplit + +import DistUpgradeView +from DistUpgradeCache import MyCache +from DistUpgradeConfigParser import DistUpgradeConfig +from DistUpgradeQuirks import DistUpgradeQuirks +from DistUpgradeAptCdrom import AptCdrom +from DistUpgradeAufs import setupAufs, aufsOptionsAndEnvironmentSetup + +# workaround broken relative import in python-apt (LP: #871007), we +# want the local version of distinfo.py from oneiric, but because of +# a bug in python-apt we will get the natty version that does not +# know about "Component.parent_component" leading to a crash +import distinfo +import sourceslist +sourceslist.DistInfo = distinfo.DistInfo + +from sourceslist import SourcesList, is_mirror +from distro import get_distro, NoDistroTemplateException + +from DistUpgradeGettext import gettext as _ +from DistUpgradeGettext import ngettext +import gettext + +from DistUpgradeCache import (CacheExceptionDpkgInterrupted, + CacheExceptionLockingFailed, + NotEnoughFreeSpaceError) +from DistUpgradeApport import run_apport + +REBOOT_REQUIRED_FILE = "/var/run/reboot-required" + +class NoBackportsFoundException(Exception): + pass + + +class DistUpgradeController(object): + """ this is the controller that does most of the work """ + + def __init__(self, distUpgradeView, options=None, datadir=None): + # setup the paths + localedir = "/usr/share/locale/" + if datadir == None: + datadir = os.getcwd() + localedir = os.path.join(datadir,"mo") + self.datadir = datadir + self.options = options + + # init gettext + gettext.bindtextdomain("update-manager",localedir) + gettext.textdomain("update-manager") + + # setup the view + logging.debug("Using '%s' view" % distUpgradeView.__class__.__name__) + self._view = distUpgradeView + self._view.updateStatus(_("Reading cache")) + self.cache = None + + if not self.options or self.options.withNetwork == None: + self.useNetwork = True + else: + self.useNetwork = self.options.withNetwork + if options: + cdrompath = options.cdromPath + else: + cdrompath = None + self.aptcdrom = AptCdrom(distUpgradeView, cdrompath) + + # the configuration + self.config = DistUpgradeConfig(datadir) + self.sources_backup_ext = "."+self.config.get("Files","BackupExt") + + # move some of the options stuff into the self.config, + # ConfigParser deals only with strings it seems *sigh* + self.config.add_section("Options") + self.config.set("Options","withNetwork", str(self.useNetwork)) + + # aufs stuff + aufsOptionsAndEnvironmentSetup(self.options, self.config) + + # some constants here + self.fromDist = self.config.get("Sources","From") + self.toDist = self.config.get("Sources","To") + self.origin = self.config.get("Sources","ValidOrigin") + self.arch = get_arch() + + # we run with --force-overwrite by default + if not os.environ.has_key("RELEASE_UPGRADE_NO_FORCE_OVERWRITE"): + logging.debug("enable dpkg --force-overwrite") + apt_pkg.Config.set("DPkg::Options::","--force-overwrite") + + # we run in full upgrade mode by default + self._partialUpgrade = False + + # install the quirks handler + self.quirks = DistUpgradeQuirks(self, self.config) + + # setup env var + os.environ["RELEASE_UPGRADE_IN_PROGRESS"] = "1" + os.environ["PYCENTRAL_FORCE_OVERWRITE"] = "1" + os.environ["PATH"] = "%s:%s" % (os.getcwd()+"/imported", + os.environ["PATH"]) + check_and_fix_xbit("./imported/invoke-rc.d") + + # set max retries + maxRetries = self.config.getint("Network","MaxRetries") + apt_pkg.Config.set("Acquire::Retries", str(maxRetries)) + # max sizes for dpkgpm for large installs (see linux/limits.h and + # linux/binfmts.h) + apt_pkg.Config.set("Dpkg::MaxArgs", str(64*1024)) + apt_pkg.Config.set("Dpkg::MaxArgBytes", str(128*1024)) + + # smaller to avoid hangs + apt_pkg.Config.set("Acquire::http::Timeout","20") + apt_pkg.Config.set("Acquire::ftp::Timeout","20") + + # no list cleanup here otherwise a "cancel" in the upgrade + # will not restore the full state (lists will be missing) + apt_pkg.Config.set("Apt::Get::List-Cleanup", "false") + + # forced obsoletes + self.forced_obsoletes = self.config.getlist("Distro","ForcedObsoletes") + # list of valid mirrors that we can add + self.valid_mirrors = self.config.getListFromFile("Sources","ValidMirrors") + # third party mirrors + self.valid_3p_mirrors = [] + if self.config.has_section('ThirdPartyMirrors'): + self.valid_3p_mirrors = [pair[1] for pair in + self.config.items('ThirdPartyMirrors')] + # debugging + #apt_pkg.config.set("DPkg::Options::","--debug=0077") + + # apt cron job + self._aptCronJobPerms = 0755 + + def openCache(self, lock=True): + logging.debug("openCache()") + if self.cache is None: + self.quirks.run("PreCacheOpen") + else: + self.cache.releaseLock() + self.cache.unlockListsDir() + try: + self.cache = MyCache(self.config, + self._view, + self.quirks, + self._view.getOpCacheProgress(), + lock) + # alias name for the plugin interface code + self.apt_cache = self.cache + # if we get a dpkg error that it was interrupted, just + # run dpkg --configure -a + except CacheExceptionDpkgInterrupted, e: + logging.warning("dpkg interrupted, calling dpkg --configure -a") + cmd = ["/usr/bin/dpkg","--configure","-a"] + if os.environ.get("DEBIAN_FRONTEND") == "noninteractive": + cmd.append("--force-confold") + self._view.getTerminal().call(cmd) + self.cache = MyCache(self.config, + self._view, + self.quirks, + self._view.getOpCacheProgress()) + except CacheExceptionLockingFailed, e: + logging.error("Cache can not be locked (%s)" % e) + self._view.error(_("Unable to get exclusive lock"), + _("This usually means that another " + "package management application " + "(like apt-get or aptitude) " + "already running. Please close that " + "application first.")); + sys.exit(1) + self.cache.partialUpgrade = self._partialUpgrade + logging.debug("/openCache(), new cache size %i" % len(self.cache)) + + def _viewSupportsSSH(self): + """ + Returns True if this view support upgrades over ssh. + In theory all views should support it, but for savety + we do only allow text ssh upgrades (see LP: #322482) + """ + supported = self.config.getlist("View","SupportSSH") + if self._view.__class__.__name__ in supported: + return True + return False + + def _sshMagic(self): + """ this will check for server mode and if we run over ssh. + if this is the case, we will ask and spawn a additional + daemon (to be sure we have a spare one around in case + of trouble) + """ + pidfile = os.path.join("/var/run/release-upgrader-sshd.pid") + if (not os.path.exists(pidfile) and + os.path.isdir("/proc") and + is_child_of_process_name("sshd")): + # check if the frontend supports ssh upgrades (see lp: #322482) + if not self._viewSupportsSSH(): + logging.error("upgrade over ssh not alllowed") + self._view.error(_("Upgrading over remote connection not supported"), + _("You are running the upgrade over a " + "remote ssh connection with a frontend " + "that does " + "not support this. Please try a text " + "mode upgrade with 'do-release-upgrade'." + "\n\n" + "The upgrade will " + "abort now. Please try without ssh.") + ) + sys.exit(1) + return False + # ask for a spare one to start (and below 1024) + port = 1022 + res = self._view.askYesNoQuestion( + _("Continue running under SSH?"), + _("This session appears to be running under ssh. " + "It is not recommended to perform a upgrade " + "over ssh currently because in case of failure " + "it is harder to recover.\n\n" + "If you continue, an additional ssh daemon will be " + "started at port '%s'.\n" + "Do you want to continue?") % port) + # abort + if res == False: + sys.exit(1) + res = subprocess.call(["/usr/sbin/sshd", + "-o", "PidFile=%s" % pidfile, + "-p",str(port)]) + if res == 0: + summary = _("Starting additional sshd") + descr = _("To make recovery in case of failure easier, an " + "additional sshd will be started on port '%s'. " + "If anything goes wrong with the running ssh " + "you can still connect to the additional one.\n" + ) % port + if iptables_active(): + cmd = "iptables -I INPUT -p tcp --dport %s -j ACCEPT" % port + descr += _( + "If you run a firewall, you may need to " + "temporarily open this port. As this is " + "potentially dangerous it's not done automatically. " + "You can open the port with e.g.:\n'%s'") % cmd + self._view.information(summary, descr) + return True + + def _tryUpdateSelf(self): + """ this is a helper that is run if we are started from a CD + and we have network - we will then try to fetch a update + of ourself + """ + from MetaRelease import MetaReleaseCore + from DistUpgradeFetcherSelf import DistUpgradeFetcherSelf + # check if we run from a LTS + forceLTS=False + if (self.release == "dapper" or + self.release == "hardy" or + self.release == "lucid" or + self.release == "precise"): + forceLTS=True + m = MetaReleaseCore(useDevelopmentRelease=False, + forceLTS=forceLTS) + # this will timeout eventually + while m.downloading: + self._view.processEvents() + time.sleep(0.1) + if m.new_dist is None: + logging.error("No new dist found") + return False + # we have a new dist + progress = self._view.getFetchProgress() + fetcher = DistUpgradeFetcherSelf(new_dist=m.new_dist, + progress=progress, + options=self.options, + view=self._view) + fetcher.run() + + def _pythonSymlinkCheck(self): + """ sanity check that /usr/bin/python points to the default + python version. Users tend to modify this symlink, which + breaks stuff in obscure ways (Ubuntu #75557). + """ + logging.debug("_pythonSymlinkCheck run") + from ConfigParser import SafeConfigParser, NoOptionError + if os.path.exists('/usr/share/python/debian_defaults'): + config = SafeConfigParser() + config.readfp(file('/usr/share/python/debian_defaults')) + try: + expected_default = config.get('DEFAULT', 'default-version') + except NoOptionError: + logging.debug("no default version for python found in '%s'" % config) + return False + try: + fs_default_version = os.readlink('/usr/bin/python') + except OSError, e: + logging.error("os.readlink failed (%s)" % e) + return False + if not fs_default_version in (expected_default, os.path.join('/usr/bin', expected_default)): + logging.debug("python symlink points to: '%s', but expected is '%s' or '%s'" % (fs_default_version, expected_default, os.path.join('/usr/bin', expected_default))) + return False + return True + + + def prepare(self): + """ initial cache opening, sanity checking, network checking """ + # first check if that is a good upgrade + self.release = release = subprocess.Popen(["lsb_release","-c","-s"], + stdout=subprocess.PIPE).communicate()[0].strip() + logging.debug("lsb-release: '%s'" % release) + if not (release == self.fromDist or release == self.toDist): + logging.error("Bad upgrade: '%s' != '%s' " % (release, self.fromDist)) + self._view.error(_("Can not upgrade"), + _("An upgrade from '%s' to '%s' is not " + "supported with this tool." % (release, self.toDist))) + sys.exit(1) + + # setup aufs + if self.config.getWithDefault("Aufs", "EnableFullOverlay", False): + aufs_rw_dir = self.config.get("Aufs","RWDir") + if not setupAufs(aufs_rw_dir): + logging.error("aufs setup failed") + self._view.error(_("Sandbox setup failed"), + _("It was not possible to create the sandbox " + "environment.")) + return False + + # all good, tell the user about the sandbox mode + logging.info("running in aufs overlay mode") + self._view.information(_("Sandbox mode"), + _("This upgrade is running in sandbox " + "(test) mode. All changes are written " + "to '%s' and will be lost on the next " + "reboot.\n\n" + "*No* changes written to a system directory " + "from now until the next reboot are " + "permanent.") % aufs_rw_dir) + + # setup backports (if we have them) + if self.options and self.options.havePrerequists: + backportsdir = os.getcwd()+"/backports" + logging.info("using backports in '%s' " % backportsdir) + logging.debug("have: %s" % glob.glob(backportsdir+"/*.udeb")) + if os.path.exists(backportsdir+"/usr/bin/dpkg"): + apt_pkg.Config.set("Dir::Bin::dpkg",backportsdir+"/usr/bin/dpkg"); + if os.path.exists(backportsdir+"/usr/lib/apt/methods"): + apt_pkg.Config.set("Dir::Bin::methods",backportsdir+"/usr/lib/apt/methods") + conf = backportsdir+"/etc/apt/apt.conf.d/01ubuntu" + if os.path.exists(conf): + logging.debug("adding config '%s'" % conf) + apt_pkg.ReadConfigFile(apt_pkg.Config, conf) + + # do the ssh check and warn if we run under ssh + self._sshMagic() + # check python version + if not self._pythonSymlinkCheck(): + logging.error("pythonSymlinkCheck() failed, aborting") + self._view.error(_("Can not upgrade"), + _("Your python install is corrupted. " + "Please fix the '/usr/bin/python' symlink.")) + sys.exit(1) + # open cache + try: + self.openCache() + except SystemError, e: + logging.error("openCache() failed: '%s'" % e) + return False + if not self.cache.sanityCheck(self._view): + return False + + # now figure out if we need to go into desktop or + # server mode - we use a heuristic for this + self.serverMode = self.cache.needServerMode() + if self.serverMode: + os.environ["RELEASE_UPGRADE_MODE"] = "server" + else: + os.environ["RELEASE_UPGRADE_MODE"] = "desktop" + + if not self.checkViewDepends(): + logging.error("checkViewDepends() failed") + return False + + if os.path.exists("/usr/bin/debsig-verify"): + logging.error("debsig-verify is installed") + self._view.error(_("Package 'debsig-verify' is installed"), + _("The upgrade can not continue with that " + "package installed.\n" + "Please remove it with synaptic " + "or 'apt-get remove debsig-verify' first " + "and run the upgrade again.")) + self.abort() + + from DistUpgradeMain import SYSTEM_DIRS + for systemdir in SYSTEM_DIRS: + if os.path.exists(systemdir) and not os.access(systemdir, os.W_OK): + logging.error("%s not writable" % systemdir) + self._view.error( + _("Can not write to '%s'") % systemdir, + _("Its not possible to write to the system directory " + "'%s' on your system. The upgrade can not " + "continue.\n" + "Please make sure that the system directory is " + "writable.") % systemdir) + self.abort() + + + # FIXME: we may try to find out a bit more about the network + # connection here and ask more intelligent questions + if self.aptcdrom and self.options and self.options.withNetwork == None: + res = self._view.askYesNoQuestion(_("Include latest updates from the Internet?"), + _("The upgrade system can use the internet to " + "automatically download " + "the latest updates and install them during the " + "upgrade. If you have a network connection this is " + "highly recommended.\n\n" + "The upgrade will take longer, but when " + "it is complete, your system will be fully up to " + "date. You can choose not to do this, but you " + "should install the latest updates soon after " + "upgrading.\n" + "If you answer 'no' here, the network is not " + "used at all."), + 'Yes') + self.useNetwork = res + self.config.set("Options","withNetwork", str(self.useNetwork)) + logging.debug("useNetwork: '%s' (selected by user)" % res) + if res: + self._tryUpdateSelf() + return True + + def _sourcesListEntryDownloadable(self, entry): + """ + helper that checks if a sources.list entry points to + something downloadable + """ + logging.debug("verifySourcesListEntry: %s" % entry) + # no way to verify without network + if not self.useNetwork: + logging.debug("skiping downloadable check (no network)") + return True + # check if the entry points to something we can download + uri = "%s/dists/%s/Release" % (entry.uri, entry.dist) + return url_downloadable(uri, logging.debug) + + def rewriteSourcesList(self, mirror_check=True): + logging.debug("rewriteSourcesList()") + + sync_components = self.config.getlist("Sources","Components") + + # skip mirror check if special environment is set + # (useful for server admins with internal repos) + if (self.config.getWithDefault("Sources","AllowThirdParty",False) or + "RELEASE_UPRADER_ALLOW_THIRD_PARTY" in os.environ): + logging.warning("mirror check skipped, *overriden* via config") + mirror_check=False + + # check if we need to enable main + if mirror_check == True and self.useNetwork: + # now check if the base-meta pkgs are available in + # the archive or only available as "now" + # -> if not that means that "main" is missing and we + # need to enable it + for pkgname in self.config.getlist("Distro","BaseMetaPkgs"): + if ((not pkgname in self.cache or + not self.cache[pkgname].candidate or + len(self.cache[pkgname].candidate.origins) == 0) + or + (self.cache[pkgname].candidate and + len(self.cache[pkgname].candidate.origins) == 1 and + self.cache[pkgname].candidate.origins[0].archive == "now") + ): + logging.debug("BaseMetaPkg '%s' has no candidateOrigin" % pkgname) + try: + distro = get_distro() + distro.get_sources(self.sources) + distro.enable_component("main") + except NoDistroTemplateException: + # fallback if everything else does not work, + # we replace the sources.list with a single + # line to ubuntu-main + logging.warning('get_distro().enable_component("man") failed, overwriting sources.list instead as last resort') + s = "# auto generated by update-manager" + s += "deb http://archive.ubuntu.com/ubuntu %s main restricted" % self.toDist + s += "deb http://archive.ubuntu.com/ubuntu %s-updates main restricted" % self.toDist + s += "deb http://security.ubuntu.com/ubuntu %s-security main restricted" % self.toDist + open("/etc/apt/sources.list","w").write(s) + break + + # this must map, i.e. second in "from" must be the second in "to" + # (but they can be different, so in theory we could exchange + # component names here) + pockets = self.config.getlist("Sources","Pockets") + fromDists = [self.fromDist] + ["%s-%s" % (self.fromDist, x) + for x in pockets] + toDists = [self.toDist] + ["%s-%s" % (self.toDist,x) + for x in pockets] + self.sources_disabled = False + + # look over the stuff we have + foundToDist = False + # collect information on what components (main,universe) are enabled for what distro (sub)version + # e.g. found_components = { 'hardy':set("main","restricted"), 'hardy-updates':set("main") } + self.found_components = {} + for entry in self.sources.list[:]: + + # ignore invalid records or disabled ones + if entry.invalid or entry.disabled: + continue + + # we disable breezy cdrom sources to make sure that demoted + # packages are removed + if entry.uri.startswith("cdrom:") and entry.dist == self.fromDist: + logging.debug("disabled '%s' cdrom entry (dist == fromDist)" % entry) + entry.disabled = True + continue + # check if there is actually a lists file for them available + # and disable them if not + elif entry.uri.startswith("cdrom:"): + # + listdir = apt_pkg.Config.find_dir("Dir::State::lists") + if not os.path.exists("%s/%s%s_%s_%s" % + (listdir, + apt_pkg.URItoFileName(entry.uri), + "dists", + entry.dist, + "Release")): + logging.warning("disabling cdrom source '%s' because it has no Release file" % entry) + entry.disabled = True + continue + + # special case for archive.canonical.com that needs to + # be rewritten (for pre-gutsy upgrades) + cdist = "%s-commercial" % self.fromDist + if (not entry.disabled and + entry.uri.startswith("http://archive.canonical.com") and + entry.dist == cdist): + entry.dist = self.toDist + entry.comps = ["partner"] + logging.debug("transitioned commercial to '%s' " % entry) + continue + + # special case for landscape.canonical.com because they + # don't use a standard archive layout (gutsy->hardy) + if (not entry.disabled and + entry.uri.startswith("http://landscape.canonical.com/packages/%s" % self.fromDist)): + logging.debug("commenting landscape.canonical.com out") + entry.disabled = True + continue + + # handle upgrades from a EOL release and check if there + # is a supported release available + if (not entry.disabled and + "old-releases.ubuntu.com/" in entry.uri): + logging.debug("upgrade from old-releases.ubuntu.com detected") + # test country mirror first, then archive.u.c + for uri in ["http://%sarchive.ubuntu.com/ubuntu" % country_mirror(), + "http://archive.ubuntu.com/ubuntu"]: + test_entry = copy.copy(entry) + test_entry.uri = uri + test_entry.dist = self.toDist + if self._sourcesListEntryDownloadable(test_entry): + logging.info("transition from old-release.u.c to %s" % uri) + entry.uri = uri + break + + logging.debug("examining: '%s'" % get_string_with_no_auth_from_source_entry(entry)) + # check if it's a mirror (or official site) + validMirror = self.isMirror(entry.uri) + thirdPartyMirror = not mirror_check or self.isThirdPartyMirror(entry.uri) + if validMirror or thirdPartyMirror: + # disabled/security/commercial/extras are special cases + # we use validTo/foundToDist to figure out if we have a + # main archive mirror in the sources.list or if we + # need to add one + validTo = True + if (entry.disabled or + entry.type == "deb-src" or + "/security.ubuntu.com" in entry.uri or + "%s-security" % self.fromDist in entry.dist or + "/archive.canonical.com" in entry.uri or + "/extras.ubuntu.com" in entry.uri): + validTo = False + if entry.dist in toDists: + # so the self.sources.list is already set to the new + # distro + logging.debug("entry '%s' is already set to new dist" % get_string_with_no_auth_from_source_entry(entry)) + foundToDist |= validTo + elif entry.dist in fromDists: + foundToDist |= validTo + entry.dist = toDists[fromDists.index(entry.dist)] + logging.debug("entry '%s' updated to new dist" % get_string_with_no_auth_from_source_entry(entry)) + elif entry.type == 'deb-src': + continue + elif validMirror: + # disable all entries that are official but don't + # point to either "to" or "from" dist + entry.disabled = True + self.sources_disabled = True + logging.debug("entry '%s' was disabled (unknown dist)" % get_string_with_no_auth_from_source_entry(entry)) + + # if we make it to this point, we have a official or third-party mirror + + # check if the arch is powerpc or sparc and if so, transition + # to ports.ubuntu.com (powerpc got demoted in gutsy, sparc + # in hardy) + if (entry.type == "deb" and + not "ports.ubuntu.com" in entry.uri and + (self.arch == "powerpc" or self.arch == "sparc")): + logging.debug("moving %s source entry to 'ports.ubuntu.com' " % self.arch) + entry.uri = "http://ports.ubuntu.com/ubuntu-ports/" + + # gather what components are enabled and are inconsitent + for d in ["%s" % self.toDist, + "%s-updates" % self.toDist, + "%s-security" % self.toDist]: + # create entry if needed, ignore disabled + # entries and deb-src + self.found_components.setdefault(d,set()) + if (not entry.disabled and entry.dist == d and + entry.type == "deb"): + for comp in entry.comps: + # only sync components we know about + if not comp in sync_components: + continue + self.found_components[d].add(comp) + + else: + # disable anything that is not from a official mirror or a whitelisted third party + if entry.dist == self.fromDist: + entry.dist = self.toDist + entry.comment += " " + _("disabled on upgrade to %s") % self.toDist + entry.disabled = True + self.sources_disabled = True + logging.debug("entry '%s' was disabled (unknown mirror)" % get_string_with_no_auth_from_source_entry(entry)) + + # now go over the list again and check for missing components + # in $dist-updates and $dist-security and add them + for entry in self.sources.list[:]: + # skip all comps that are not relevant (including e.g. "hardy") + if (entry.invalid or entry.disabled or entry.type == "deb-src" or + entry.uri.startswith("cdrom:") or entry.dist == self.toDist): + continue + # now check for "$dist-updates" and "$dist-security" and add any inconsistencies + if self.found_components.has_key(entry.dist): + component_diff = self.found_components[self.toDist]-self.found_components[entry.dist] + if component_diff: + logging.info("fixing components inconsistency from '%s'" % get_string_with_no_auth_from_source_entry(entry)) + entry.comps.extend(list(component_diff)) + logging.info("to new entry '%s'" % get_string_with_no_auth_from_source_entry(entry)) + del self.found_components[entry.dist] + return foundToDist + + def updateSourcesList(self): + logging.debug("updateSourcesList()") + self.sources = SourcesList(matcherPath=".") + if not self.rewriteSourcesList(mirror_check=True): + logging.error("No valid mirror found") + res = self._view.askYesNoQuestion(_("No valid mirror found"), + _("While scanning your repository " + "information no mirror entry for " + "the upgrade was found. " + "This can happen if you run a internal " + "mirror or if the mirror information is " + "out of date.\n\n" + "Do you want to rewrite your " + "'sources.list' file anyway? If you choose " + "'Yes' here it will update all '%s' to '%s' " + "entries.\n" + "If you select 'No' the upgrade will cancel." + ) % (self.fromDist, self.toDist)) + if res: + # re-init the sources and try again + self.sources = SourcesList(matcherPath=".") + # its ok if rewriteSourcesList fails here if + # we do not use a network, the sources.list may be empty + if (not self.rewriteSourcesList(mirror_check=False) + and self.useNetwork): + #hm, still nothing useful ... + prim = _("Generate default sources?") + secon = _("After scanning your 'sources.list' no " + "valid entry for '%s' was found.\n\n" + "Should default entries for '%s' be " + "added? If you select 'No', the upgrade " + "will cancel.") % (self.fromDist, self.toDist) + if not self._view.askYesNoQuestion(prim, secon): + self.abort() + + # add some defaults here + # FIXME: find mirror here + logging.info("generate new default sources.list") + uri = "http://archive.ubuntu.com/ubuntu" + comps = ["main","restricted"] + self.sources.add("deb", uri, self.toDist, comps) + self.sources.add("deb", uri, self.toDist+"-updates", comps) + self.sources.add("deb", + "http://security.ubuntu.com/ubuntu/", + self.toDist+"-security", comps) + else: + self.abort() + + # write (well, backup first ;) ! + self.sources.backup(self.sources_backup_ext) + self.sources.save() + + # re-check if the written self.sources are valid, if not revert and + # bail out + # TODO: check if some main packages are still available or if we + # accidentally shot them, if not, maybe offer to write a standard + # sources.list? + try: + sourceslist = apt_pkg.SourceList() + sourceslist.read_main_list() + except SystemError: + logging.error("Repository information invalid after updating (we broke it!)") + self._view.error(_("Repository information invalid"), + _("Upgrading the repository information " + "resulted in a invalid file so a bug " + "reporting process is being started.")) + subprocess.Popen(["apport-bug", "update-manager"]) + return False + + if self.sources_disabled: + self._view.information(_("Third party sources disabled"), + _("Some third party entries in your sources.list " + "were disabled. You can re-enable them " + "after the upgrade with the " + "'software-properties' tool or " + "your package manager." + )) + return True + + def _logChanges(self): + # debugging output + logging.debug("About to apply the following changes") + inst = [] + up = [] + rm = [] + held = [] + keep = [] + for pkg in self.cache: + if pkg.marked_install: inst.append(pkg.name) + elif pkg.marked_upgrade: up.append(pkg.name) + elif pkg.marked_delete: rm.append(pkg.name) + elif (pkg.is_installed and pkg.is_upgradable): held.append(pkg.name) + elif pkg.is_installed and pkg.marked_keep: keep.append(pkg.name) + logging.debug("Keep at same version: %s" % " ".join(keep)) + logging.debug("Upgradable, but held- back: %s" % " ".join(held)) + logging.debug("Remove: %s" % " ".join(rm)) + logging.debug("Install: %s" % " ".join(inst)) + logging.debug("Upgrade: %s" % " ".join(up)) + + + def doPostInitialUpdate(self): + # check if we have packages in ReqReinst state that are not + # downloadable + logging.debug("doPostInitialUpdate") + self.quirks.run("PostInitialUpdate") + if len(self.cache.reqReinstallPkgs) > 0: + logging.warning("packages in reqReinstall state, trying to fix") + self.cache.fixReqReinst(self._view) + self.openCache() + if len(self.cache.reqReinstallPkgs) > 0: + reqreinst = self.cache.reqReinstallPkgs + header = ngettext("Package in inconsistent state", + "Packages in inconsistent state", + len(reqreinst)) + summary = ngettext("The package '%s' is in an inconsistent " + "state and needs to be reinstalled, but " + "no archive can be found for it. " + "Please reinstall the package manually " + "or remove it from the system.", + "The packages '%s' are in an inconsistent " + "state and need to be reinstalled, but " + "no archive can be found for them. " + "Please reinstall the packages manually " + "or remove them from the system.", + len(reqreinst)) % ", ".join(reqreinst) + self._view.error(header, summary) + return False + # FIXME: check out what packages are downloadable etc to + # compare the list after the update again + self.obsolete_pkgs = self.cache._getObsoletesPkgs() + self.foreign_pkgs = self.cache._getForeignPkgs(self.origin, self.fromDist, self.toDist) + if self.serverMode: + self.tasks = self.cache.installedTasks + logging.debug("Foreign: %s" % " ".join(self.foreign_pkgs)) + logging.debug("Obsolete: %s" % " ".join(self.obsolete_pkgs)) + return True + + def doUpdate(self, showErrors=True, forceRetries=None): + logging.debug("running doUpdate() (showErrors=%s)" % showErrors) + if not self.useNetwork: + logging.debug("doUpdate() will not use the network because self.useNetwork==false") + return True + self.cache._list.read_main_list() + progress = self._view.getFetchProgress() + # FIXME: also remove all files from the lists partial dir! + currentRetry = 0 + if forceRetries is not None: + maxRetries=forceRetries + else: + maxRetries = self.config.getint("Network","MaxRetries") + while currentRetry < maxRetries: + try: + self.cache.update(progress) + except (SystemError, IOError), e: + logging.error("IOError/SystemError in cache.update(): '%s'. Retrying (currentRetry: %s)" % (e,currentRetry)) + currentRetry += 1 + continue + # no exception, so all was fine, we are done + return True + + logging.error("doUpdate() failed completely") + if showErrors: + self._view.error(_("Error during update"), + _("A problem occurred during the update. " + "This is usually some sort of network " + "problem, please check your network " + "connection and retry."), "%s" % e) + return False + + + def _checkFreeSpace(self): + " this checks if we have enough free space on /var and /usr" + err_sum = _("Not enough free disk space") + err_long= _("The upgrade has aborted. " + "The upgrade needs a total of %s free space on disk '%s'. " + "Please free at least an additional %s of disk " + "space on '%s'. " + "Empty your trash and remove temporary " + "packages of former installations using " + "'sudo apt-get clean'.") + # allow override + if self.config.getWithDefault("FreeSpace","SkipCheck",False): + logging.warning("free space check skipped via config override") + return True + # do the check + with_snapshots = self._is_apt_btrfs_snapshot_supported() + try: + self.cache.checkFreeSpace(with_snapshots) + except NotEnoughFreeSpaceError, e: + # ok, showing multiple error dialog sucks from the UI + # perspective, but it means we do not need to break the + # string freeze + for required in e.free_space_required_list: + self._view.error(err_sum, err_long % (required.size_total, + required.dir, + required.size_needed, + required.dir)) + return False + return True + + + def askDistUpgrade(self): + self._view.updateStatus(_("Calculating the changes")) + if not self.cache.distUpgrade(self._view, self.serverMode, self._partialUpgrade): + return False + + if self.serverMode: + if not self.cache.installTasks(self.tasks): + return False + + # show changes and confirm + changes = self.cache.get_changes() + self._view.processEvents() + + # log the changes for debugging + self._logChanges() + self._view.processEvents() + + # check if we have enough free space + if not self._checkFreeSpace(): + return False + self._view.processEvents() + + # get the demotions + self.installed_demotions = self.cache.get_installed_demoted_packages() + if len(self.installed_demotions) > 0: + self.installed_demotions.sort() + logging.debug("demoted: '%s'" % " ".join([x.name for x in self.installed_demotions])) + logging.debug("found components: %s" % self.found_components) + + # flush UI + self._view.processEvents() + + # ask the user + res = self._view.confirmChanges(_("Do you want to start the upgrade?"), + changes, + self.installed_demotions, + self.cache.requiredDownload) + return res + + def _disableAptCronJob(self): + if os.path.exists("/etc/cron.daily/apt"): + #self._aptCronJobPerms = os.stat("/etc/cron.daily/apt")[ST_MODE] + logging.debug("disabling apt cron job (%s)" % oct(self._aptCronJobPerms)) + os.chmod("/etc/cron.daily/apt",0644) + def _enableAptCronJob(self): + if os.path.exists("/etc/cron.daily/apt"): + logging.debug("enabling apt cron job") + os.chmod("/etc/cron.daily/apt", self._aptCronJobPerms) + + def doDistUpgradeFetching(self): + # ensure that no apt cleanup is run during the download/install + self._disableAptCronJob() + # get the upgrade + currentRetry = 0 + fprogress = self._view.getFetchProgress() + #iprogress = self._view.getInstallProgress(self.cache) + # start slideshow + url = self.config.getWithDefault("Distro","SlideshowUrl",None) + if url: + try: + lang = locale.getdefaultlocale()[0].split('_')[0] + except: + logging.exception("getdefaultlocale") + lang = "en" + self._view.getHtmlView().open("%s#locale=%s" % (url, lang)) + # retry the fetching in case of errors + maxRetries = self.config.getint("Network","MaxRetries") + # FIXME: we get errors like + # "I wasn't able to locate file for the %s package" + # here sometimes. its unclear why and not reproducible, the + # current theory is that for some reason the file is not + # considered trusted at the moment + # pkgAcquireArchive::QueueNext() runs debReleaseIndex::IsTrused() + # (the later just checks for the existence of the .gpg file) + # OR + # the fact that we get a pm and fetcher here confuses something + # in libapt? + # POSSIBLE workaround: keep the list-dir locked so that + # no apt-get update can run outside from the release + # upgrader + user_canceled = False + while currentRetry < maxRetries: + try: + pm = apt_pkg.PackageManager(self.cache._depcache) + fetcher = apt_pkg.Acquire(fprogress) + self.cache._fetch_archives(fetcher, pm) + except apt.cache.FetchCancelledException, e: + logging.info("user canceled") + user_canceled = True + break + except IOError, e: + # fetch failed, will be retried + logging.error("IOError in cache.commit(): '%s'. Retrying (currentTry: %s)" % (e,currentRetry)) + currentRetry += 1 + continue + return True + + # maximum fetch-retries reached without a successful commit + if user_canceled: + self._view.information(_("Upgrade canceled"), + _("The upgrade will cancel now and the " + "original system state will be restored. " + "You can resume the upgrade at a later " + "time.")) + else: + logging.error("giving up on fetching after maximum retries") + self._view.error(_("Could not download the upgrades"), + _("The upgrade has aborted. Please check your " + "Internet connection or " + "installation media and try again. All files " + "downloaded so far have been kept."), + "%s" % e) + # abort here because we want our sources.list back + self._enableAptCronJob() + self.abort() + + def enableApport(self, fname="/etc/default/apport"): + """ enable apport """ + # startup apport just until the next reboot, it has the magic + # "force_start" environment for this + subprocess.call(["service","apport","start","force_start=1"]) + + def _is_apt_btrfs_snapshot_supported(self): + """ check if apt-btrfs-snapshot is usable """ + try: + import apt_btrfs_snapshot + except ImportError: + return + try: + apt_btrfs = apt_btrfs_snapshot.AptBtrfsSnapshot() + res = apt_btrfs.snapshots_supported() + except: + logging.exception("failed to check btrfs support") + return False + logging.debug("apt btrfs snapshots supported: %s" % res) + return res + + def _maybe_create_apt_btrfs_snapshot(self): + """ create btrfs snapshot (if btrfs layout is there) """ + if not self._is_apt_btrfs_snapshot_supported(): + return + import apt_btrfs_snapshot + apt_btrfs = apt_btrfs_snapshot.AptBtrfsSnapshot() + prefix = "release-upgrade-%s-" % self.toDist + res = apt_btrfs.create_btrfs_root_snapshot(prefix) + logging.info("creating snapshot '%s' (success=%s)" % (prefix, res)) + + def doDistUpgrade(self): + # check if we want apport running during the upgrade + if self.config.getWithDefault("Distro","EnableApport", False): + self.enableApport() + + # add debug code only here + #apt_pkg.config.set("Debug::pkgDpkgPM", "1") + #apt_pkg.config.set("Debug::pkgOrderList", "1") + #apt_pkg.config.set("Debug::pkgPackageManager", "1") + + # get the upgrade + currentRetry = 0 + fprogress = self._view.getFetchProgress() + iprogress = self._view.getInstallProgress(self.cache) + # retry the fetching in case of errors + maxRetries = self.config.getint("Network","MaxRetries") + if not self._partialUpgrade: + self.quirks.run("StartUpgrade") + # FIXME: take this into account for diskspace calculation + self._maybe_create_apt_btrfs_snapshot() + res = False + while currentRetry < maxRetries: + try: + res = self.cache.commit(fprogress,iprogress) + logging.debug("cache.commit() returned %s" % res) + except SystemError, e: + logging.error("SystemError from cache.commit(): %s" % e) + # if its a ordering bug we can cleanly revert to + # the previous release, no packages have been installed + # yet (LP: #328655, #356781) + if os.path.exists("/var/run/update-manager-apt-exception"): + e = open("/var/run/update-manager-apt-exception").read() + logging.error("found exception: '%s'" % e) + # if its a ordering bug we can cleanly revert but we need to write + # a marker for the parent process to know its this kind of error + pre_configure_errors = [ + "E:Internal Error, Could not perform immediate configuration", + "E:Couldn't configure pre-depend "] + for preconf_error in pre_configure_errors: + if str(e).startswith(preconf_error): + logging.debug("detected preconfigure error, restorting state") + self._enableAptCronJob() + # FIXME: strings are not good, but we are in string freeze + # currently + msg = _("Error during commit") + msg += "\n'%s'\n" % str(e) + msg += _("Restoring original system state") + self._view.error(_("Could not install the upgrades"), msg) + # abort() exits cleanly + self.abort() + + # invoke the frontend now and show a error message + msg = _("The upgrade has aborted. Your system " + "could be in an unusable state. A recovery " + "will run now (dpkg --configure -a).") + if not self._partialUpgrade: + if not run_apport(): + msg += _("\n\nPlease report this bug in a browser at " + "http://bugs.launchpad.net/ubuntu/+source/update-manager/+filebug " + "and attach the files in /var/log/dist-upgrade/ " + "to the bug report.\n" + "%s" % e) + self._view.error(_("Could not install the upgrades"), msg) + # installing the packages failed, can't be retried + cmd = ["dpkg","--configure","-a"] + if os.environ.get("DEBIAN_FRONTEND") == "noninteractive": + cmd.append("--force-confold") + self._view.getTerminal().call(cmd) + self._enableAptCronJob() + return False + except IOError, e: + # fetch failed, will be retried + logging.error("IOError in cache.commit(): '%s'. Retrying (currentTry: %s)" % (e,currentRetry)) + currentRetry += 1 + continue + except OSError, e: + logging.exception("cache.commit()") + # deal gracefully with: + # OSError: [Errno 12] Cannot allocate memory + if e.errno == 12: + self._enableAptCronJob() + msg = _("Error during commit") + msg += "\n'%s'\n" % str(e) + msg += _("Restoring original system state") + self._view.error(_("Could not install the upgrades"), msg) + # abort() exits cleanly + self.abort() + # no exception, so all was fine, we are done + self._enableAptCronJob() + return True + + # maximum fetch-retries reached without a successful commit + logging.error("giving up on fetching after maximum retries") + self._view.error(_("Could not download the upgrades"), + _("The upgrade has aborted. Please check your "\ + "Internet connection or "\ + "installation media and try again. "), + "%s" % e) + # abort here because we want our sources.list back + self.abort() + + def doPostUpgrade(self): + # reopen cache + self.openCache() + # run the quirks handler that does does like things adding + # missing groups or similar work arounds, only do it on real + # upgrades + self.quirks.run("PostUpgrade") + # check out what packages are cruft now + # use self.{foreign,obsolete}_pkgs here and see what changed + now_obsolete = self.cache._getObsoletesPkgs() + now_foreign = self.cache._getForeignPkgs(self.origin, self.fromDist, self.toDist) + logging.debug("Obsolete: %s" % " ".join(now_obsolete)) + logging.debug("Foreign: %s" % " ".join(now_foreign)) + # now sanity check - if a base meta package is in the obsolete list now, that means + # that something went wrong (see #335154) badly with the network. this should never happen, but it did happen + # at least once so we add extra paranoia here + for pkg in self.config.getlist("Distro","BaseMetaPkgs"): + if pkg in now_obsolete: + logging.error("the BaseMetaPkg '%s' is in the obsolete list, something is wrong, ignoring the obsoletes" % pkg) + now_obsolete = set() + break + # check if we actually want obsolete removal + if not self.config.getWithDefault("Distro","RemoveObsoletes", True): + logging.debug("Skipping obsolete Removal") + return True + + # now get the meta-pkg specific obsoletes and purges + for pkg in self.config.getlist("Distro","MetaPkgs"): + if self.cache.has_key(pkg) and self.cache[pkg].is_installed: + self.forced_obsoletes.extend(self.config.getlist(pkg,"ForcedObsoletes")) + # now add the obsolete kernels to the forced obsoletes + self.forced_obsoletes.extend(self.cache.identifyObsoleteKernels()) + logging.debug("forced_obsoletes: %s", self.forced_obsoletes) + + # mark packages that are now obsolete (and where not obsolete + # before) to be deleted. make sure to not delete any foreign + # (that is, not from ubuntu) packages + if self.useNetwork: + # we can only do the obsoletes calculation here if we use a + # network. otherwise after rewriting the sources.list everything + # that is not on the CD becomes obsolete (not-downloadable) + remove_candidates = now_obsolete - self.obsolete_pkgs + else: + # initial remove candidates when no network is used should + # be the demotions to make sure we don't leave potential + # unsupported software + remove_candidates = set([p.name for p in self.installed_demotions]) + remove_candidates |= set(self.forced_obsoletes) + + # no go for the unused dependencies + unused_dependencies = self.cache._getUnusedDependencies() + logging.debug("Unused dependencies: %s" %" ".join(unused_dependencies)) + remove_candidates |= set(unused_dependencies) + + # see if we actually have to do anything here + if not self.config.getWithDefault("Distro","RemoveObsoletes", True): + logging.debug("Skipping RemoveObsoletes as stated in the config") + remove_candidates = set() + logging.debug("remove_candidates: '%s'" % remove_candidates) + logging.debug("Start checking for obsolete pkgs") + progress = self._view.getOpCacheProgress() + for (i, pkgname) in enumerate(remove_candidates): + progress.update((i/float(len(remove_candidates)))*100.0) + if pkgname not in self.foreign_pkgs: + self._view.processEvents() + if not self.cache.tryMarkObsoleteForRemoval(pkgname, remove_candidates, self.foreign_pkgs): + logging.debug("'%s' scheduled for remove but not safe to remove, skipping", pkgname) + logging.debug("Finish checking for obsolete pkgs") + progress.done() + + # get changes + changes = self.cache.get_changes() + logging.debug("The following packages are marked for removal: %s" % " ".join([pkg.name for pkg in changes])) + summary = _("Remove obsolete packages?") + actions = [_("_Keep"), _("_Remove")] + # FIXME Add an explanation about what obsolete packages are + #explanation = _("") + if (len(changes) > 0 and + self._view.confirmChanges(summary, changes, [], 0, actions, False)): + fprogress = self._view.getFetchProgress() + iprogress = self._view.getInstallProgress(self.cache) + try: + self.cache.commit(fprogress,iprogress) + except (SystemError, IOError), e: + logging.error("cache.commit() in doPostUpgrade() failed: %s" % e) + self._view.error(_("Error during commit"), + _("A problem occurred during the clean-up. " + "Please see the below message for more " + "information. "), + "%s" % e) + # run stuff after cleanup + self.quirks.run("PostCleanup") + # run the post upgrade scripts that can do fixup like xorg.conf + # fixes etc - only do on real upgrades + if not self._partialUpgrade: + self.runPostInstallScripts() + return True + + def runPostInstallScripts(self): + """ + scripts that are run in any case after the distupgrade finished + whether or not it was successful + """ + # now run the post-upgrade fixup scripts (if any) + for script in self.config.getlist("Distro","PostInstallScripts"): + if not os.path.exists(script): + logging.warning("PostInstallScript: '%s' not found" % script) + continue + logging.debug("Running PostInstallScript: '%s'" % script) + try: + # work around kde tmpfile problem where it eats permissions + check_and_fix_xbit(script) + self._view.getTerminal().call([script], hidden=True) + except Exception, e: + logging.error("got error from PostInstallScript %s (%s)" % (script, e)) + + def abort(self): + """ abort the upgrade, cleanup (as much as possible) """ + logging.debug("abort called") + if hasattr(self, "sources"): + self.sources.restore_backup(self.sources_backup_ext) + if hasattr(self, "aptcdrom"): + self.aptcdrom.restoreBackup(self.sources_backup_ext) + # generate a new cache + self._view.updateStatus(_("Restoring original system state")) + self._view.abort() + self.openCache() + sys.exit(1) + + def _checkDep(self, depstr): + " check if a given depends can be satisfied " + for or_group in apt_pkg.ParseDepends(depstr): + logging.debug("checking: '%s' " % or_group) + for dep in or_group: + depname = dep[0] + ver = dep[1] + oper = dep[2] + if not self.cache.has_key(depname): + logging.error("_checkDep: '%s' not in cache" % depname) + return False + inst = self.cache[depname] + instver = inst.installedVersion + if (instver != None and + apt_pkg.CheckDep(instver,oper,ver) == True): + return True + logging.error("depends '%s' is not satisfied" % depstr) + return False + + def checkViewDepends(self): + " check if depends are satisfied " + logging.debug("checkViewDepends()") + res = True + # now check if anything from $foo-updates is required + depends = self.config.getlist("View","Depends") + depends.extend(self.config.getlist(self._view.__class__.__name__, + "Depends")) + for dep in depends: + logging.debug("depends: '%s'", dep) + res &= self._checkDep(dep) + if not res: + # FIXME: instead of error out, fetch and install it + # here + self._view.error(_("Required depends is not installed"), + _("The required dependency '%s' is not " + "installed. " % dep)) + sys.exit(1) + return res + + def _verifyBackports(self): + # run update (but ignore errors in case the countrymirror + # substitution goes wrong, real errors will be caught later + # when the cache is searched for the backport packages) + backportslist = self.config.getlist("PreRequists","Packages") + i=0 + noCache = apt_pkg.Config.find("Acquire::http::No-Cache","false") + maxRetries = self.config.getint("Network","MaxRetries") + while i < maxRetries: + self.doUpdate(showErrors=False) + self.openCache() + for pkgname in backportslist: + if not self.cache.has_key(pkgname): + logging.error("Can not find backport '%s'" % pkgname) + raise NoBackportsFoundException, pkgname + if self._allBackportsAuthenticated(backportslist): + break + # FIXME: move this to some more generic place + logging.debug("setting a cache control header to turn off caching temporarily") + apt_pkg.Config.set("Acquire::http::No-Cache","true") + i += 1 + if i == maxRetries: + logging.error("pre-requists item is NOT trusted, giving up") + return False + apt_pkg.Config.set("Acquire::http::No-Cache",noCache) + return True + + def _allBackportsAuthenticated(self, backportslist): + # check if the user overwrote the check + if apt_pkg.Config.find_b("APT::Get::AllowUnauthenticated",False) == True: + logging.warning("skip authentication check because of APT::Get::AllowUnauthenticated==true") + return True + try: + b = self.config.getboolean("Distro","AllowUnauthenticated") + if b: + return True + except ConfigParser.NoOptionError: + pass + for pkgname in backportslist: + pkg = self.cache[pkgname] + if not pkg.candidate: + return False + for cand in pkg.candidate.origins: + if cand.trusted: + break + else: + return False + return True + + def isMirror(self, uri): + """ check if uri is a known mirror """ + # deal with username:password in a netloc + raw_uri = uri.rstrip("/") + scheme, netloc, path, query, fragment = urlsplit(raw_uri) + if "@" in netloc: + netloc = netloc.split("@")[1] + # construct new mirror url without the username/pw + uri = "%s://%s%s" % (scheme, netloc, path) + for mirror in self.valid_mirrors: + mirror = mirror.rstrip("/") + if is_mirror(mirror, uri): + return True + # deal with mirrors like + # deb http://localhost:9977/security.ubuntu.com/ubuntu intrepid-security main restricted + # both apt-debtorrent and apt-cacher use this (LP: #365537) + mirror_host_part = mirror.split("//")[1] + if uri.endswith(mirror_host_part): + logging.debug("found apt-cacher/apt-torrent style uri %s" % uri) + return True + return False + + def isThirdPartyMirror(self, uri): + " check if uri is a whitelisted third-party mirror " + uri = uri.rstrip("/") + for mirror in self.valid_3p_mirrors: + mirror = mirror.rstrip("/") + if is_mirror(mirror, uri): + return True + return False + + def _getPreReqMirrorLines(self, dumb=False): + " get sources.list snippet lines for the current mirror " + lines = "" + sources = SourcesList(matcherPath=".") + for entry in sources.list: + if entry.invalid or entry.disabled: + continue + if (entry.type == "deb" and + entry.disabled == False and + self.isMirror(entry.uri) and + "main" in entry.comps and + "%s-updates" % self.fromDist in entry.dist and + not entry.uri.startswith("http://security.ubuntu.com") and + not entry.uri.startswith("http://archive.ubuntu.com") ): + new_line = "deb %s %s-updates main\n" % (entry.uri, self.fromDist) + if not new_line in lines: + lines += new_line + # FIXME: do we really need "dumb" mode? + #if (dumb and entry.type == "deb" and + # "main" in entry.comps): + # lines += "deb %s %s-proposed main\n" % (entry.uri, self.fromDist) + return lines + + def _addPreRequistsSourcesList(self, template, out, dumb=False): + " add prerequists based on template into the path outfile " + # go over the sources.list and try to find a valid mirror + # that we can use to add the backports dir + logging.debug("writing prerequists sources.list at: '%s' " % out) + outfile = open(out, "w") + mirrorlines = self._getPreReqMirrorLines(dumb) + for line in open(template): + template = Template(line) + outline = template.safe_substitute(mirror=mirrorlines) + outfile.write(outline) + logging.debug("adding '%s' prerequists" % outline) + outfile.close() + return True + + def getRequiredBackports(self): + " download the backports specified in DistUpgrade.cfg " + logging.debug("getRequiredBackports()") + res = True + backportsdir = os.path.join(os.getcwd(),"backports") + if not os.path.exists(backportsdir): + os.mkdir(backportsdir) + backportslist = self.config.getlist("PreRequists","Packages") + + # FIXME: this needs to be ported + # if we have them on the CD we are fine + if self.aptcdrom and not self.useNetwork: + logging.debug("Searching for pre-requists on CDROM") + p = os.path.join(self.aptcdrom.cdrompath, + "dists/stable/main/dist-upgrader/binary-%s/" % apt_pkg.Config.find("APT::Architecture")) + found_pkgs = set() + for deb in glob.glob(p+"*_*.deb"): + logging.debug("found pre-req '%s' to '%s'" % (deb, backportsdir)) + found_pkgs.add(os.path.basename(deb).split("_")[0]) + # now check if we got all backports on the CD + if not set(backportslist).issubset(found_pkgs): + logging.error("Expected backports: '%s' but got '%s'" % (set(backportslist), found_pkgs)) + return False + # now install them + self.cache.releaseLock() + p = subprocess.Popen( + ["/usr/bin/dpkg", "-i", ] + glob.glob(p+"*_*.deb"), + stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + res = None + while res is None: + res = p.poll() + self._view.pulseProgress() + time.sleep(0.02) + self._view.pulseProgress(finished=True) + self.cache.getLock() + logging.info("installing backport debs exit code '%s'" % res) + logging.debug("dpkg output:\n%s" % p.communicate()[0]) + if res != 0: + return False + # and re-start itself when it done + return self.setupRequiredBackports() + + # we support PreRequists/SourcesList-$arch sections here too + # + # logic for mirror finding works list this: + # - use the mirror template from the config, then: [done] + # + # - try to find known mirror (isMirror) and prepend it [done] + # - archive.ubuntu.com is always a fallback at the end [done] + # + # see if we find backports with that + # - if not, try guessing based on URI, Trust and Dist [done] + # in existing sources.list (internal mirror with no + # outside connection maybe) + # + # make sure to remove file on cancel + + # FIXME: use the DistUpgradeFetcherCore logic + # in mirror_from_sources_list() here + # (and factor that code out into a helper) + + conf_option = "SourcesList" + if self.config.has_option("PreRequists",conf_option+"-%s" % self.arch): + conf_option = conf_option + "-%s" % self.arch + prereq_template = self.config.get("PreRequists",conf_option) + if not os.path.exists(prereq_template): + logging.error("sourceslist not found '%s'" % prereq_template) + return False + outpath = os.path.join(apt_pkg.Config.find_dir("Dir::Etc::sourceparts"), prereq_template) + outfile = os.path.join(apt_pkg.Config.find_dir("Dir::Etc::sourceparts"), prereq_template) + self._addPreRequistsSourcesList(prereq_template, outfile) + try: + self._verifyBackports() + except NoBackportsFoundException, e: + self._addPreRequistsSourcesList(prereq_template, outfile, dumb=True) + try: + self._verifyBackports() + except NoBackportsFoundException, e: + logging.warning("no backport for '%s' found" % e) + return False + + # FIXME: sanity check the origin (just for safety) + for pkgname in backportslist: + pkg = self.cache[pkgname] + # look for the right version (backport) + ver = self.cache._depcache.GetCandidateVer(pkg._pkg) + if not ver: + logging.error("No candidate for '%s'" % pkgname) + os.unlink(outpath) + return False + if ver.FileList == None: + logging.error("No ver.FileList for '%s'" % pkgname) + os.unlink(outpath) + return False + logging.debug("marking '%s' for install" % pkgname) + # mark install + pkg.mark_install(auto_inst=False, auto_fix=False) + + # now get it + res = False + try: + res = self.cache.commit(self._view.getFetchProgress(), + self._view.getInstallProgress(self.cache)) + except IOError, e: + logging.error("fetchArchives returned '%s'" % e) + res = False + except SystemError as e: + logging.error("installArchives returned '%s'" % e) + res = False + + if res == False: + logging.warning("_fetchArchives for backports returned False") + + # all backports done, remove the pre-requirests.list file again + try: + os.unlink(outfile) + except Exception as e: + logging.error("failed to unlink pre-requists file: '%s'" % e) + return self.setupRequiredBackports() + + # used by both cdrom/http fetcher + def setupRequiredBackports(self): + # ensure that the new release upgrader uses the latest python-apt + # from the backport path + os.environ["PYTHONPATH"] = "/usr/lib/release-upgrader-python-apt" + # copy log so that it gets not overwritten + logging.shutdown() + shutil.copy("/var/log/dist-upgrade/main.log", + "/var/log/dist-upgrade/main_pre_req.log") + # now exec self again + args = sys.argv + ["--have-prerequists"] + if self.useNetwork: + args.append("--with-network") + else: + args.append("--without-network") + logging.info("restarting upgrader") + #print "restarting upgrader to make use of the backports" + # work around kde being clever and removing the x bit + check_and_fix_xbit(sys.argv[0]) + os.execve(sys.argv[0],args, os.environ) + + # this is the core + def fullUpgrade(self): + # sanity check (check for ubuntu-desktop, brokenCache etc) + self._view.updateStatus(_("Checking package manager")) + self._view.setStep(DistUpgradeView.STEP_PREPARE) + + if not self.prepare(): + logging.error("self.prepared() failed") + self._view.error(_("Preparing the upgrade failed"), + _("Preparing the system for the upgrade " + "failed so a bug reporting process is " + "being started.")) + subprocess.Popen(["apport-bug", "update-manager"]) + sys.exit(1) + + # mvo: commented out for now, see #54234, this needs to be + # refactored to use a arch=any tarball + if (self.config.has_section("PreRequists") and + self.options and + self.options.havePrerequists == False): + logging.debug("need backports") + # get backported packages (if needed) + if not self.getRequiredBackports(): + self._view.error(_("Getting upgrade prerequisites failed"), + _("The system was unable to get the " + "prerequisites for the upgrade. " + "The upgrade will abort now and restore " + "the original system state.\n" + "\n" + "Additionally, a bug reporting process is " + "being started.")) + subprocess.Popen(["apport-bug", "update-manager"]) + self.abort() + + # run a "apt-get update" now, its ok to ignore errors, + # because + # a) we disable any third party sources later + # b) we check if we have valid ubuntu sources later + # after we rewrite the sources.list and do a + # apt-get update there too + # because the (unmodified) sources.list of the user + # may contain bad/unreachable entries we run only + # with a single retry + self.doUpdate(showErrors=False, forceRetries=1) + self.openCache() + + # do pre-upgrade stuff (calc list of obsolete pkgs etc) + if not self.doPostInitialUpdate(): + self.abort() + + # update sources.list + self._view.setStep(DistUpgradeView.STEP_MODIFY_SOURCES) + self._view.updateStatus(_("Updating repository information")) + if not self.updateSourcesList(): + self.abort() + + # add cdrom (if we have one) + if (self.aptcdrom and + not self.aptcdrom.add(self.sources_backup_ext)): + self._view.error(_("Failed to add the cdrom"), + _("Sorry, adding the cdrom was not successful.")) + sys.exit(1) + + # then update the package index files + if not self.doUpdate(): + self.abort() + + # then open the cache (again) + self._view.updateStatus(_("Checking package manager")) + self.openCache() + # re-check server mode because we got new packages (it may happen + # that the system had no sources.list entries and therefore no + # desktop file information) + self.serverMode = self.cache.needServerMode() + # do it here as we neeed to know if we are in server or client mode + self.quirks.ensure_recommends_are_installed_on_desktops() + # now check if we still have some key packages available/downloadable + # after the update - if not something went seriously wrong + # (this happend e.g. during the intrepid->jaunty upgrade for some + # users when de.archive.ubuntu.com was overloaded) + for pkg in self.config.getlist("Distro","BaseMetaPkgs"): + if (not self.cache.has_key(pkg) or + not self.cache.anyVersionDownloadable(self.cache[pkg])): + # FIXME: we could offer to add default source entries here, + # but we need to be careful to not duplicate them + # (i.e. the error here could be something else than + # missing sources entries but network errors etc) + logging.error("No '%s' available/downloadable after sources.list rewrite+update" % pkg) + self._view.error(_("Invalid package information"), + _("After updating your package ", + "information, the essential package '%s' " + "could not be located. This may be " + "because you have no official mirrors " + "listed in your software sources, or " + "because of excessive load on the mirror " + "you are using. See /etc/apt/sources.list " + "for the current list of configured " + "software sources." + "\n" + "In the case of an overloaded mirror, you " + "may want to try the upgrade again later.") + % pkg) + subprocess.Popen(["apport-bug", "update-manager"]) + self.abort() + + # calc the dist-upgrade and see if the removals are ok/expected + # do the dist-upgrade + self._view.updateStatus(_("Calculating the changes")) + if not self.askDistUpgrade(): + self.abort() + + # fetch the stuff + self._view.setStep(DistUpgradeView.STEP_FETCH) + self._view.updateStatus(_("Fetching")) + if not self.doDistUpgradeFetching(): + self.abort() + + # now do the upgrade + self._view.setStep(DistUpgradeView.STEP_INSTALL) + self._view.updateStatus(_("Upgrading")) + if not self.doDistUpgrade(): + # run the post install scripts (for stuff like UUID conversion) + self.runPostInstallScripts() + # don't abort here, because it would restore the sources.list + self._view.information(_("Upgrade complete"), + _("The upgrade has completed but there " + "were errors during the upgrade " + "process.")) + sys.exit(1) + + # do post-upgrade stuff + self._view.setStep(DistUpgradeView.STEP_CLEANUP) + self._view.updateStatus(_("Searching for obsolete software")) + self.doPostUpgrade() + + # comment out cdrom source + if self.aptcdrom: + self.aptcdrom.comment_out_cdrom_entry() + + # done, ask for reboot + self._view.setStep(DistUpgradeView.STEP_REBOOT) + self._view.updateStatus(_("System upgrade is complete.")) + # FIXME should we look into /var/run/reboot-required here? + if (not inside_chroot() and + self._view.confirmRestart()): + subprocess.Popen("/sbin/reboot") + sys.exit(0) + return True + + def run(self): + self._view.processEvents() + return self.fullUpgrade() + + def doPartialUpgrade(self): + " partial upgrade mode, useful for repairing " + from DistUpgrade.DistUpgradeView import STEP_PREPARE, STEP_MODIFY_SOURCES, STEP_FETCH, STEP_INSTALL, STEP_CLEANUP, STEP_REBOOT + self._view.setStep(STEP_PREPARE) + self._view.hideStep(STEP_MODIFY_SOURCES) + self._view.hideStep(STEP_REBOOT) + self._partialUpgrade = True + self.prepare() + if not self.doPostInitialUpdate(): + return False + if not self.askDistUpgrade(): + return False + self._view.setStep(STEP_FETCH) + self._view.updateStatus(_("Fetching")) + if not self.doDistUpgradeFetching(): + return False + self._view.setStep(STEP_INSTALL) + self._view.updateStatus(_("Upgrading")) + if not self.doDistUpgrade(): + self._view.information(_("Upgrade complete"), + _("The upgrade has completed but there " + "were errors during the upgrade " + "process.")) + return False + self._view.setStep(STEP_CLEANUP) + if not self.doPostUpgrade(): + self._view.information(_("Upgrade complete"), + _("The upgrade has completed but there " + "were errors during the upgrade " + "process.")) + return False + + if os.path.exists(REBOOT_REQUIRED_FILE): + # we can not talk to session management here, we run as root + if self._view.confirmRestart(): + subprocess.Popen("/sbin/reboot") + else: + self._view.information(_("Upgrade complete"), + _("The partial upgrade was completed.")) + return True + + +if __name__ == "__main__": + from DistUpgradeViewText import DistUpgradeViewText + logging.basicConfig(level=logging.DEBUG) + v = DistUpgradeViewText() + dc = DistUpgradeController(v) + #dc.openCache() + dc._disableAptCronJob() + dc._enableAptCronJob() + #dc._addRelatimeToFstab() + #dc.prepare() + #dc.askDistUpgrade() + #dc._checkFreeSpace() + #dc._rewriteFstab() + #dc._checkAdminGroup() + #dc._rewriteAptPeriodic(2) diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeFetcherCore.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeFetcherCore.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeFetcherCore.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeFetcherCore.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,292 @@ +# DistUpgradeFetcherCore.py +# +# Copyright (c) 2006 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +from string import Template +import os +import apt_pkg +import logging +import tarfile +import tempfile +import shutil +import sys +import GnuPGInterface +from gettext import gettext as _ +from aptsources.sourceslist import SourcesList + +from utils import get_dist, url_downloadable, country_mirror + +class DistUpgradeFetcherCore(object): + " base class (without GUI) for the upgrade fetcher " + + DEFAULT_MIRROR="http://archive.ubuntu.com/ubuntu" + DEFAULT_COMPONENT="main" + DEBUG = "DEBUG_UPDATE_MANAGER" in os.environ + + def __init__(self, new_dist, progress): + self.new_dist = new_dist + self.current_dist_name = get_dist() + self._progress = progress + # options to pass to the release upgrader when it is run + self.run_options = [] + + def _debug(self, msg): + " helper to show debug information " + if self.DEBUG: + sys.stderr.write(msg+"\n") + + def showReleaseNotes(self): + return True + + def error(self, summary, message): + """ dummy implementation for error display, should be overwriten + by subclasses that want to more fancy method + """ + print summary + print message + return False + + def authenticate(self): + if self.new_dist.upgradeToolSig: + f = self.tmpdir+"/"+os.path.basename(self.new_dist.upgradeTool) + sig = self.tmpdir+"/"+os.path.basename(self.new_dist.upgradeToolSig) + print _("authenticate '%(file)s' against '%(signature)s' ") % { + 'file' : os.path.basename(f), + 'signature' : os.path.basename(sig)} + if self.gpgauthenticate(f, sig): + return True + return False + + def gpgauthenticate(self, file, signature, + keyring='/etc/apt/trusted.gpg'): + """ authenticated a file against a given signature, if no keyring + is given use the apt default keyring + """ + gpg = GnuPGInterface.GnuPG() + gpg.options.extra_args = ['--no-options', + '--homedir',self.tmpdir, + '--no-default-keyring', + '--ignore-time-conflict', + '--keyring', keyring] + proc = gpg.run(['--verify', signature, file], + create_fhs=['status','logger','stderr']) + gpgres = proc.handles['status'].read() + try: + proc.wait() + except IOError,e: + # gnupg returned a problem (non-zero exit) + print "exception from gpg: %s" % e + print "Debug information: " + print proc.handles['status'].read() + print proc.handles['stderr'].read() + print proc.handles['logger'].read() + return False + if "VALIDSIG" in gpgres: + return True + print "invalid result from gpg:" + print gpgres + return False + + def extractDistUpgrader(self): + # extract the tarbal + fname = os.path.join(self.tmpdir,os.path.basename(self.uri)) + print _("extracting '%s'") % os.path.basename(fname) + if not os.path.exists(fname): + return False + try: + tar = tarfile.open(self.tmpdir+"/"+os.path.basename(self.uri),"r") + for tarinfo in tar: + tar.extract(tarinfo) + tar.close() + except tarfile.ReadError, e: + logging.error("failed to open tarfile (%s)" % e) + return False + return True + + def verifyDistUprader(self): + # FIXME: check a internal dependency file to make sure + # that the script will run correctly + + # see if we have a script file that we can run + self.script = script = "%s/%s" % (self.tmpdir, self.new_dist.name) + if not os.path.exists(script): + return self.error(_("Could not run the upgrade tool"), + _("Could not run the upgrade tool") + ". " + _("This is most likely a bug in the upgrade tool. " + "Please report it as a bug using the command 'ubuntu-bug update-manager'.")) + return True + + def mirror_from_sources_list(self, uri, default_uri): + """ + try to figure what the mirror is from current sources.list + + do this by looing for matching DEFAULT_COMPONENT, current dist + in sources.list and then doing a http HEAD/ftp size request + to see if the uri is available on this server + """ + self._debug("mirror_from_sources_list: %s" % self.current_dist_name) + sources = SourcesList(withMatcher=False) + seen = set() + for e in sources.list: + if e.disabled or e.invalid or not e.type == "deb": + continue + # check if we probed this mirror already + if e.uri in seen: + continue + # we are using the main mirror already, so we are fine + if (e.uri.startswith(default_uri) and + e.dist == self.current_dist_name and + self.DEFAULT_COMPONENT in e.comps): + return uri + elif (e.dist == self.current_dist_name and + "main" in e.comps): + mirror_uri = e.uri+uri[len(default_uri):] + if url_downloadable(mirror_uri, self._debug): + return mirror_uri + seen.add(e.uri) + self._debug("no mirror found") + return "" + + def _expandUri(self, uri): + """ + expand the uri so that it uses a mirror if the url starts + with a well know string (like archive.ubuntu.com) + """ + # try to guess the mirror from the sources.list + if uri.startswith(self.DEFAULT_MIRROR): + self._debug("trying to find suitable mirror") + new_uri = self.mirror_from_sources_list(uri, self.DEFAULT_MIRROR) + if new_uri: + return new_uri + # if that fails, use old method + uri_template = Template(uri) + m = country_mirror() + new_uri = uri_template.safe_substitute(countrymirror=m) + # be paranoid and check if the given uri is really downloadable + try: + if not url_downloadable(new_uri, self._debug): + raise Exception("failed to download %s" % new_uri) + except Exception,e: + self._debug("url '%s' could not be downloaded" % e) + # else fallback to main server + new_uri = uri_template.safe_substitute(countrymirror='') + return new_uri + + def fetchDistUpgrader(self): + " download the tarball with the upgrade script " + self.tmpdir = tmpdir = tempfile.mkdtemp(prefix="update-manager-") + os.chdir(tmpdir) + logging.debug("using tmpdir: '%s'" % tmpdir) + # turn debugging on here (if required) + if self.DEBUG > 0: + apt_pkg.Config.Set("Debug::Acquire::http","1") + apt_pkg.Config.Set("Debug::Acquire::ftp","1") + #os.listdir(tmpdir) + fetcher = apt_pkg.Acquire(self._progress) + if self.new_dist.upgradeToolSig != None: + uri = self._expandUri(self.new_dist.upgradeToolSig) + af1 = apt_pkg.AcquireFile(fetcher, + uri, + descr=_("Upgrade tool signature")) + # reference it here to shut pyflakes up + af1 + if self.new_dist.upgradeTool != None: + self.uri = self._expandUri(self.new_dist.upgradeTool) + af2 = apt_pkg.AcquireFile(fetcher, + self.uri, + descr=_("Upgrade tool")) + # reference it here to shut pyflakes up + af2 + result = fetcher.run() + if result != fetcher.RESULT_CONTINUE: + logging.warn("fetch result != continue (%s)" % result) + return False + # check that both files are really there and non-null + for f in [os.path.basename(self.new_dist.upgradeToolSig), + os.path.basename(self.new_dist.upgradeTool)]: + if not (os.path.exists(f) and os.path.getsize(f) > 0): + logging.warn("file '%s' missing" % f) + return False + return True + return False + + def runDistUpgrader(self): + args = [self.script]+self.run_options + if os.getuid() != 0: + os.execv("/usr/bin/sudo",["sudo"]+args) + else: + os.execv(self.script,args) + + def cleanup(self): + # cleanup + os.chdir("..") + # del tmpdir + shutil.rmtree(self.tmpdir) + + def run(self): + # see if we have release notes + if not self.showReleaseNotes(): + return + if not self.fetchDistUpgrader(): + self.error(_("Failed to fetch"), + _("Fetching the upgrade failed. There may be a network " + "problem. ")) + return + if not self.authenticate(): + self.error(_("Authentication failed"), + _("Authenticating the upgrade failed. There may be a problem " + "with the network or with the server. ")) + self.cleanup() + return + if not self.extractDistUpgrader(): + self.error(_("Failed to extract"), + _("Extracting the upgrade failed. There may be a problem " + "with the network or with the server. ")) + + return + if not self.verifyDistUprader(): + self.error(_("Verification failed"), + _("Verifying the upgrade failed. There may be a problem " + "with the network or with the server. ")) + self.cleanup() + return + try: + # check if we can execute, if we run it via sudo we will + # not know otherwise, sudo/gksu will not raise a exception + if not os.access(self.script, os.X_OK): + ex = OSError("Can not execute '%s'" % self.script) + ex.errno = 13 + raise ex + self.runDistUpgrader() + except OSError, e: + if e.errno == 13: + self.error(_("Can not run the upgrade"), + _("This usually is caused by a system where /tmp " + "is mounted noexec. Please remount without " + "noexec and run the upgrade again.")) + return False + else: + self.error(_("Can not run the upgrade"), + _("The error message is '%s'.") % e.strerror) + return True + +if __name__ == "__main__": + d = DistUpgradeFetcherCore(None,None) +# print d.authenticate('/tmp/Release','/tmp/Release.gpg') + print "got mirror: '%s'" % d.mirror_from_sources_list("http://archive.ubuntu.com/ubuntu/dists/intrepid-proposed/main/dist-upgrader-all/0.93.34/intrepid.tar.gz", "http://archive.ubuntu.com/ubuntu") diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeFetcherSelf.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeFetcherSelf.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeFetcherSelf.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeFetcherSelf.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,30 @@ +import logging +import shutil + +from DistUpgradeFetcherCore import DistUpgradeFetcherCore + +class DistUpgradeFetcherSelf(DistUpgradeFetcherCore): + def __init__(self, new_dist, progress, options, view): + DistUpgradeFetcherCore.__init__(self,new_dist,progress) + self.view = view + # user chose to use the network, otherwise it would not be + # possible to download self + self.run_options += ["--with-network"] + # make sure to run self with proper options + if options.cdromPath is not None: + self.run_options += ["--cdrom=%s" % options.cdromPath] + if options.frontend is not None: + self.run_options += ["--frontend=%s" % options.frontend] + + def error(self, summary, message): + return self.view.error(summary, message) + + def runDistUpgrader(self): + " overwrite to ensure that the log is copied " + # copy log so it isn't overwritten + logging.info("runDistUpgrader() called, re-exec self") + logging.shutdown() + shutil.copy("/var/log/dist-upgrade/main.log", + "/var/log/dist-upgrade/main_update_self.log") + # re-exec self + DistUpgradeFetcherCore.runDistUpgrader(self) diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeGettext.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeGettext.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeGettext.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeGettext.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,59 @@ +# DistUpgradeGettext.py - safe wrapper around gettext +# +# Copyright (c) 2008 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import logging +import gettext as mygettext + +def _verify(message, translated): + """ + helper that verifies that the message and the translated + message have the same number (and type) of % args + """ + arguments_in_message = message.count("%") - message.count("\%") + arguments_in_translation = translated.count("%") - translated.count("\%") + return arguments_in_message == arguments_in_translation + +def gettext(message): + """ + version of gettext that logs errors but does not crash on incorrect + number of arguments + """ + if message == "": + return "" + translated_msg = mygettext.gettext(message) + if not _verify(message, translated_msg): + logging.error("incorrect translation for message '%s' to '%s' (wrong number of arguments)" % (message, translated_msg)) + return message + return translated_msg + +def ngettext(msgid1, msgid2, n): + """ + version of ngettext that logs errors but does not crash on incorrect + number of arguments + """ + translated_msg = mygettext.ngettext(msgid1, msgid2, n) + if not _verify(msgid1, translated_msg): + logging.error("incorrect translation for ngettext message '%s' plural: '%s' to '%s' (wrong number of arguments)" % (msgid1, msgid2, translated_msg)) + # dumb fallback to not crash + if n == 1: + return msgid1 + return msgid2 + return translated_msg diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeMain.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeMain.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeMain.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeMain.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,229 @@ +# DistUpgradeMain.py +# +# Copyright (c) 2004-2008 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import warnings +warnings.filterwarnings("ignore", "Accessed deprecated", DeprecationWarning) + +import apt +import atexit +import glob +import logging +import os +import shutil +import subprocess +import sys + +from datetime import datetime +from optparse import OptionParser +from gettext import gettext as _ + +# dirs that the packages will touch, this is needed for AUFS/overlayfs +# and also for the sanity check before the upgrade +SYSTEM_DIRS = ["/bin", + "/boot", + "/etc", + "/initrd", + "/lib", + "/lib32", # ??? + "/lib64", # ??? + "/sbin", + "/usr", + "/var", + ] + + + +from DistUpgradeController import DistUpgradeController +from DistUpgradeConfigParser import DistUpgradeConfig + + +def do_commandline(): + " setup option parser and parse the commandline " + parser = OptionParser() + parser.add_option("-s", "--sandbox", dest="useAufs", default=False, + action="store_true", + help=_("Sandbox upgrade using aufs")) + parser.add_option("-c", "--cdrom", dest="cdromPath", default=None, + help=_("Use the given path to search for a cdrom with upgradable packages")) + parser.add_option("--have-prerequists", dest="havePrerequists", + action="store_true", default=False) + parser.add_option("--with-network", dest="withNetwork",action="store_true") + parser.add_option("--without-network", dest="withNetwork",action="store_false") + parser.add_option("--frontend", dest="frontend",default=None, + help=_("Use frontend. Currently available: \n"\ + "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE")) + parser.add_option("--mode", dest="mode",default="desktop", + help=_("*DEPRECATED* this option will be ignored")) + parser.add_option("--partial", dest="partial", default=False, + action="store_true", + help=_("Perform a partial upgrade only (no sources.list rewriting)")) + parser.add_option("--disable-gnu-screen", action="store_true", + default=False, + help=_("Disable GNU screen support")) + parser.add_option("--datadir", dest="datadir", default=None, + help=_("Set datadir")) + return parser.parse_args() + +def setup_logging(options, config): + " setup the logging " + logdir = config.getWithDefault("Files","LogDir","/var/log/dist-upgrade/") + if not os.path.exists(logdir): + os.mkdir(logdir) + # check if logs exists and move logs into place + if glob.glob(logdir+"/*.log"): + now = datetime.now() + backup_dir = logdir+"/%04i%02i%02i-%02i%02i" % (now.year,now.month,now.day,now.hour,now.minute) + if not os.path.exists(backup_dir): + os.mkdir(backup_dir) + for f in glob.glob(logdir+"/*.log"): + shutil.move(f, os.path.join(backup_dir,os.path.basename(f))) + fname = os.path.join(logdir,"main.log") + # do not overwrite the default main.log + if options.partial: + fname += ".partial" + with open(fname, "a"): + pass + logging.basicConfig(level=logging.DEBUG, + filename=fname, + format='%(asctime)s %(levelname)s %(message)s', + filemode='w') + # log what config files are in use here to detect user + # changes + logging.info("Using config files '%s'" % config.config_files) + logging.info("uname information: '%s'" % " ".join(os.uname())) + logging.info("apt version: '%s'" % apt.apt_pkg.VERSION) + return logdir + +def save_system_state(logdir): + # save package state to be able to re-create failures + try: + from apt_clone import AptClone + except ImportError: + logging.error("failed to import AptClone") + return + target = os.path.join(logdir, "apt-clone_system_state.tar.gz") + logging.debug("creating statefile: '%s'" % target) + # this file may contain sensitive data so ensure we create with the + # right umask + old_umask = os.umask(0066) + clone = AptClone() + clone.save_state(sourcedir="/", target=target, with_dpkg_status=True, + scrub_sources=True) + # reset umask + os.umask(old_umask) + # lspci output + try: + s=subprocess.Popen(["lspci","-nn"], stdout=subprocess.PIPE).communicate()[0] + open(os.path.join(logdir, "lspci.txt"), "w").write(s) + except OSError, e: + logging.debug("lspci failed: %s" % e) + +def setup_view(options, config, logdir): + " setup view based on the config and commandline " + + # the commandline overwrites the configfile + for requested_view in [options.frontend]+config.getlist("View","View"): + if not requested_view: + continue + try: + view_modul = __import__(requested_view) + view_class = getattr(view_modul, requested_view) + instance = view_class(logdir=logdir) + break + except Exception, e: + logging.warning("can't import view '%s' (%s)" % (requested_view,e)) + print "can't load %s (%s)" % (requested_view, e) + else: + logging.error("No view can be imported, aborting") + print "No view can be imported, aborting" + sys.exit(1) + return instance + +def run_new_gnu_screen_window_or_reattach(): + """ check if there is a upgrade already running inside gnu screen, + if so, reattach + if not, create new screen window + """ + SCREENNAME = "ubuntu-release-upgrade-screen-window" + # get the active screen sockets + try: + out = subprocess.Popen( + ["screen","-ls"], stdout=subprocess.PIPE).communicate()[0] + logging.debug("screen returned: '%s'" % out) + except OSError: + logging.info("screen could not be run") + return + # check if a release upgrade is among them + if SCREENNAME in out: + logging.info("found active screen session, re-attaching") + # if we have it, attach to it + os.execv("/usr/bin/screen", ["screen", "-d", "-r", "-p", SCREENNAME]) + # otherwise re-exec inside screen with (-L) for logging enabled + os.environ["RELEASE_UPGRADER_NO_SCREEN"]="1" + # unset escape key to avoid confusing people who are not used to + # screen. people who already run screen will not be affected by this + # unset escape key with -e, enable log with -L, set name with -S + cmd = ["screen", + "-e", "\\0\\0", + "-L", + "-c", "screenrc", + "-S", SCREENNAME]+sys.argv + logging.info("re-exec inside screen: '%s'" % cmd) + os.execv("/usr/bin/screen", cmd) + + +def main(): + """ main method """ + + # commandline setup and config + (options, args) = do_commandline() + config = DistUpgradeConfig(".") + logdir = setup_logging(options, config) + + from DistUpgradeVersion import VERSION + logging.info("release-upgrader version '%s' started" % VERSION) + + # create view and app objects + view = setup_view(options, config, logdir) + + # gnu screen support + if (view.needs_screen and + not "RELEASE_UPGRADER_NO_SCREEN" in os.environ and + not options.disable_gnu_screen): + run_new_gnu_screen_window_or_reattach() + + app = DistUpgradeController(view, options, datadir=options.datadir) + atexit.register(app._enableAptCronJob) + + # partial upgrade only + if options.partial: + if not app.doPartialUpgrade(): + sys.exit(1) + sys.exit(0) + + # save system state (only if not doing just a partial upgrade) + save_system_state(logdir) + + # full upgrade, return error code for success/failure + if app.run(): + return 0 + return 1 + diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradePatcher.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradePatcher.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradePatcher.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradePatcher.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,106 @@ +# DistUpgradeEdPatcher.py +# +# Copyright (c) 2011 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import hashlib +import re +import string + + +class PatchError(Exception): + """ Error during the patch process """ + pass + +def patch(orig, edpatch, result_md5sum=None): + """ python implementation of enough "ed" to apply ed-style + patches. Note that this patches in memory so its *not* + suitable for big files + """ + + # we only have two states, waiting for command or reading data + (STATE_EXPECT_COMMAND, + STATE_EXPECT_DATA) = range(2) + + # this is inefficient for big files + orig_lines = open(orig).readlines() + start = end = 0 + + # we start in wait-for-commend state + state = STATE_EXPECT_COMMAND + for line in open(edpatch): + if state == STATE_EXPECT_COMMAND: + # in commands get rid of whitespace, + line = line.strip() + # check if we have a substitute command + if line.startswith("s/"): + # strip away the "s/" + line = line[2:] + # chop off the flags at the end + subs, flags = string.rsplit(line, sep="/", maxsplit=1) + if flags: + raise PatchError("flags for s// not supported yet") + # get the actual substitution regexp and replacement and + # execute it + regexp, sep, repl = subs.partition("/") + new, count = re.subn(regexp, repl, orig_lines[start], count=1) + orig_lines[start] = new + continue + # otherwise the last char is the command + command = line[-1] + # read address + (start_str, sep, end_str) = line[:-1].partition(",") + # ed starts with 1 while python with 0 + start = int(start_str) + start -= 1 + # if we don't have end, set it to the next line + if end_str is "": + end = start+1 + else: + end = int(end_str) + # interpret command + if command == "c": + del orig_lines[start:end] + state = STATE_EXPECT_DATA + start -= 1 + elif command == "a": + # not allowed to have a range in append + state = STATE_EXPECT_DATA + elif command == "d": + del orig_lines[start:end] + else: + raise PatchError("unknown command: '%s'" % line) + elif state == STATE_EXPECT_DATA: + # this is the data end marker + if line == ".\n": + state = STATE_EXPECT_COMMAND + else: + # copy line verbatim and increase position + start += 1 + orig_lines.insert(start, line) + + # done with the patching, (optional) verify and write result + result = "".join(orig_lines) + if result_md5sum: + md5 = hashlib.md5() + md5.update(result) + if md5.hexdigest() != result_md5sum: + raise PatchError("the md5sum after patching is not correct") + open(orig, "w").write(result) + return True diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/dist-upgrade.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/dist-upgrade.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/dist-upgrade.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/dist-upgrade.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,7 @@ +#!/usr/bin/python + +from DistUpgradeMain import main +import sys + +if __name__ == "__main__": + sys.exit(main()) diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeQuirks.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeQuirks.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeQuirks.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeQuirks.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,1262 @@ +# DistUpgradeQuirks.py +# +# Copyright (c) 2004-2010 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import apt +import atexit +import glob +import logging +import os +import os.path +import re +import hashlib +import shutil +import string +import sys +import subprocess +from subprocess import PIPE, Popen +from hashlib import md5 +from utils import lsmod, get_arch + +from DistUpgradeGettext import gettext as _ +from computerjanitor.plugin import PluginManager + +class DistUpgradeQuirks(object): + """ + This class collects the various quirks handlers that can + be hooked into to fix/work around issues that the individual + releases have + """ + + def __init__(self, controller, config): + self.controller = controller + self._view = controller._view + self.config = config + self.uname = Popen(["uname","-r"],stdout=PIPE).communicate()[0].strip() + self.arch = get_arch() + self.plugin_manager = PluginManager(self.controller, ["./plugins"]) + + # the quirk function have the name: + # $Name (e.g. PostUpgrade) + # $todist$Name (e.g. intrepidPostUpgrade) + # $from_$fromdist$Name (e.g. from_dapperPostUpgrade) + def run(self, quirksName): + """ + Run the specific quirks handler, the follow handlers are supported: + - PreCacheOpen: run *before* the apt cache is opened the first time + to set options that affect the cache + - PostInitialUpdate: run *before* the sources.list is rewritten but + after a initial apt-get update + - PostDistUpgradeCache: run *after* the dist-upgrade was calculated + in the cache + - StartUpgrade: before the first package gets installed (but the + download is finished) + - PostUpgrade: run *after* the upgrade is finished successfully and + packages got installed + - PostCleanup: run *after* the cleanup (orphaned etc) is finished + """ + # we do not run any quirks in partialUpgrade mode + if self.controller._partialUpgrade: + logging.info("not running quirks in partialUpgrade mode") + return + # first check for matching plugins + for condition in [ + quirksName, + "%s%s" % (self.config.get("Sources","To"), quirksName), + "from_%s%s" % (self.config.get("Sources","From"), quirksName) + ]: + for plugin in self.plugin_manager.get_plugins(condition): + logging.debug("running quirks plugin %s" % plugin) + plugin.do_cleanup_cruft() + + # run the handler that is common to all dists + funcname = "%s" % quirksName + func = getattr(self, funcname, None) + if func is not None: + logging.debug("quirks: running %s" % funcname) + func() + + # run the quirksHandler to-dist + funcname = "%s%s" % (self.config.get("Sources","To"), quirksName) + func = getattr(self, funcname, None) + if func is not None: + logging.debug("quirks: running %s" % funcname) + func() + + # now run the quirksHandler from_${FROM-DIST}Quirks + funcname = "from_%s%s" % (self.config.get("Sources","From"), quirksName) + func = getattr(self, funcname, None) + if func is not None: + logging.debug("quirks: running %s" % funcname) + func() + + # individual quirks handler that run *before* the cache is opened + def PreCacheOpen(self): + """ run before the apt cache is opened the first time """ + logging.debug("running Quirks.PreCacheOpen") + + def oneiricPreCacheOpen(self): + logging.debug("running Quirks.oneiricPreCacheOpen") + # enable i386 multiach temporarely during the upgrade if on amd64 + # this needs to be done very early as libapt caches the result + # of the "getArchitectures()" call in aptconfig and its not possible + # currently to invalidate this cache + if apt.apt_pkg.config.find("Apt::Architecture") == "amd64": + logging.debug("multiarch: enabling i386 as a additional architecture") + apt.apt_pkg.config.set("Apt::Architectures::", "i386") + # increase case size to workaround bug in natty apt that + # may cause segfault on cache grow + apt.apt_pkg.config.set("APT::Cache-Start", str(48*1024*1024)) + + + # individual quirks handler when the dpkg run is finished --------- + def PostCleanup(self): + " run after cleanup " + logging.debug("running Quirks.PostCleanup") + + def from_dapperPostUpgrade(self): + " this works around quirks for dapper->hardy upgrades " + logging.debug("running Controller.from_dapperQuirks handler") + self._rewriteFstab() + self._checkAdminGroup() + + def intrepidPostUpgrade(self): + " this applies rules for the hardy->intrepid upgrade " + logging.debug("running Controller.intrepidQuirks handler") + self._addRelatimeToFstab() + + def gutsyPostUpgrade(self): + """ this function works around quirks in the feisty->gutsy upgrade """ + logging.debug("running Controller.gutsyQuirks handler") + + def feistyPostUpgrade(self): + """ this function works around quirks in the edgy->feisty upgrade """ + logging.debug("running Controller.feistyQuirks handler") + self._rewriteFstab() + self._checkAdminGroup() + + def karmicPostUpgrade(self): + """ this function works around quirks in the jaunty->karmic upgrade """ + logging.debug("running Controller.karmicPostUpgrade handler") + self._ntfsFstabFixup() + self._checkLanguageSupport() + + # quirks when run when the initial apt-get update was run ---------------- + def from_lucidPostInitialUpdate(self): + """ Quirks that are run before the sources.list is updated to the + new distribution when upgrading from a lucid system (either + to maverick or the new LTS) + """ + logging.debug("running %s" % sys._getframe().f_code.co_name) + # systems < i686 will not upgrade + self._test_and_fail_on_non_i686() + self._test_and_warn_on_i8xx() + + def oneiricPostInitialUpdate(self): + self._test_and_warn_on_i8xx() + + def lucidPostInitialUpdate(self): + """ quirks that are run before the sources.list is updated to lucid """ + logging.debug("running %s" % sys._getframe().f_code.co_name) + # upgrades on systems with < arvm6 CPUs will break + self._test_and_fail_on_non_arm_v6() + # vserver+upstart are problematic + self._test_and_warn_if_vserver() + # fglrx dropped support for some cards + self._test_and_warn_on_dropped_fglrx_support() + + # quirks when the cache upgrade calculation is finished ------------------- + def from_dapperPostDistUpgradeCache(self): + self.hardyPostDistUpgradeCache() + self.gutsyPostDistUpgradeCache() + self.feistyPostDistUpgradeCache() + self.edgyPostDistUpgradeCache() + + def from_hardyPostDistUpgradeCache(self): + """ this function works around quirks in upgrades from hardy """ + logging.debug("running %s" % sys._getframe().f_code.co_name) + # ensure 386 -> generic transition happens + self._kernel386TransitionCheck() + # ensure kubuntu-kde4-desktop transition + self._kubuntuDesktopTransition() + # evms got removed after hardy, warn and abort + if self._usesEvmsInMounts(): + logging.error("evms in use in /etc/fstab") + self._view.error(_("evms in use"), + _("Your system uses the 'evms' volume manager " + "in /proc/mounts. " + "The 'evms' software is no longer supported, " + "please switch it off and run the upgrade " + "again when this is done.")) + self.controller.abort() + # check if "wl" module is loaded and if so, install bcmwl-kernel-source + self._checkAndInstallBroadcom() + # langpacks got re-organized in 9.10 + self._dealWithLanguageSupportTransition() + # nvidia-71, nvidia-96 got dropped + self._test_and_warn_on_old_nvidia() + # new nvidia needs a CPU with sse support + self._test_and_warn_on_nvidia_and_no_sse() + + def nattyPostDistUpgradeCache(self): + """ + this function works around quirks in the + maverick -> natty cache upgrade calculation + """ + self._add_kdegames_card_extra_if_installed() + + def maverickPostDistUpgradeCache(self): + """ + this function works around quirks in the + lucid->maverick upgrade calculation + """ + self._add_extras_repository() + self._gutenprint_fixup() + + def karmicPostDistUpgradeCache(self): + """ + this function works around quirks in the + jaunty->karmic upgrade calculation + """ + # check if "wl" module is loaded and if so, install + # bcmwl-kernel-source (this is needed for lts->lts as well) + self._checkAndInstallBroadcom() + self._dealWithLanguageSupportTransition() + self._kernel386TransitionCheck() + self._mysqlClusterCheck() + + def jauntyPostDistUpgradeCache(self): + """ + this function works around quirks in the + intrepid->jaunty upgrade calculation + """ + logging.debug("running %s" % sys._getframe().f_code.co_name) + # bug 332328 - make sure pidgin-libnotify is upgraded + for pkg in ["pidgin-libnotify"]: + if (self.controller.cache.has_key(pkg) and + self.controller.cache[pkg].is_installed and + not self.controller.cache[pkg].marked_upgrade): + logging.debug("forcing '%s' upgrade" % pkg) + self.controller.cache[pkg].mark_upgrade() + # deal with kipi/gwenview/kphotoalbum + for pkg in ["gwenview","digikam"]: + if (self.controller.cache.has_key(pkg) and + self.controller.cache[pkg].is_installed and + not self.controller.cache[pkg].marked_upgrade): + logging.debug("forcing libkipi '%s' upgrade" % pkg) + if self.controller.cache.has_key("libkipi0"): + logging.debug("removing libkipi0)") + self.controller.cache["libkipi0"].mark_delete() + self.controller.cache[pkg].mark_upgrade() + + def intrepidPostDistUpgradeCache(self): + """ + this function works around quirks in the + hardy->intrepid upgrade + """ + logging.debug("running %s" % sys._getframe().f_code.co_name) + # kdelibs4-dev is unhappy (#279621) + fromp = "kdelibs4-dev" + to = "kdelibs5-dev" + if (self.controller.cache.has_key(fromp) and + self.controller.cache[fromp].is_installed and + self.controller.cache.has_key(to)): + self.controller.cache.mark_install(to, "kdelibs4-dev -> kdelibs5-dev transition") + + def hardyPostDistUpgradeCache(self): + """ + this function works around quirks in the + {dapper,gutsy}->hardy upgrade + """ + logging.debug("running %s" % sys._getframe().f_code.co_name) + # deal with gnome-translator and help apt with the breaks + if (self.controller.cache.has_key("nautilus") and + self.controller.cache["nautilus"].is_installed and + not self.controller.cache["nautilus"].marked_upgrade): + # uninstallable and gutsy apt is unhappy about this + # breaks because it wants to upgrade it and gives up + # if it can't + for broken in ("link-monitor-applet"): + if self.controller.cache.has_key(broken) and self.controller.cache[broken].is_installed: + self.controller.cache[broken].mark_delete() + self.controller.cache["nautilus"].mark_install() + # evms gives problems, remove it if it is not in use + self._checkAndRemoveEvms() + # give the language-support-* packages a extra kick + # (if we have network, otherwise this will not work) + if self.config.get("Options","withNetwork") == "True": + for pkg in self.controller.cache: + if (pkg.name.startswith("language-support-") and + pkg.is_installed and + not pkg.marked_upgrade): + self.controller.cache.mark_install(pkg.name,"extra language-support- kick") + + def gutsyPostDistUpgradeCache(self): + """ this function works around quirks in the feisty->gutsy upgrade """ + logging.debug("running %s" % sys._getframe().f_code.co_name) + # lowlatency kernel flavour vanished from feisty->gutsy + try: + (version, build, flavour) = self.uname.split("-") + if (flavour == 'lowlatency' or + flavour == '686' or + flavour == 'k7'): + kernel = "linux-image-generic" + if not (self.controller.cache[kernel].is_installed or self.controller.cache[kernel].marked_install): + logging.debug("Selecting new kernel '%s'" % kernel) + self.controller.cache[kernel].mark_install() + except Exception, e: + logging.warning("problem while transitioning lowlatency kernel (%s)" % e) + # fix feisty->gutsy utils-linux -> nfs-common transition (LP: #141559) + try: + for line in map(string.strip, open("/proc/mounts")): + if line == '' or line.startswith("#"): + continue + try: + (device, mount_point, fstype, options, a, b) = line.split() + except Exception, e: + logging.error("can't parse line '%s'" % line) + continue + if "nfs" in fstype: + logging.debug("found nfs mount in line '%s', marking nfs-common for install " % line) + self.controller.cache["nfs-common"].mark_install() + break + except Exception, e: + logging.warning("problem while transitioning util-linux -> nfs-common (%s)" % e) + + def feistyPostDistUpgradeCache(self): + """ this function works around quirks in the edgy->feisty upgrade """ + logging.debug("running %s" % sys._getframe().f_code.co_name) + # ndiswrapper changed again *sigh* + for (fr, to) in [("ndiswrapper-utils-1.8","ndiswrapper-utils-1.9")]: + if self.controller.cache.has_key(fr) and self.controller.cache.has_key(to): + if self.controller.cache[fr].is_installed and not self.controller.cache[to].marked_install: + try: + self.controller.cache.mark_install(to,"%s->%s quirk upgrade rule" % (fr, to)) + except SystemError, e: + logging.warning("Failed to apply %s->%s install (%s)" % (fr, to, e)) + + + def edgyPostDistUpgradeCache(self): + """ this function works around quirks in the dapper->edgy upgrade """ + logging.debug("running %s" % sys._getframe().f_code.co_name) + for pkg in self.controller.cache: + # deal with the python2.4-$foo -> python-$foo transition + if (pkg.name.startswith("python2.4-") and + pkg.is_installed and + not pkg.marked_upgrade): + basepkg = "python-"+pkg.name[len("python2.4-"):] + if (self.controller.cache.has_key(basepkg) and + self.controller.cache[basepkg].candidateDownloadable and + not self.controller.cache[basepkg].marked_install): + try: + self.controller.cache.mark_install(basepkg, + "python2.4->python upgrade rule") + except SystemError, e: + logging.debug("Failed to apply python2.4->python install: %s (%s)" % (basepkg, e)) + # xserver-xorg-input-$foo gives us trouble during the upgrade too + if (pkg.name.startswith("xserver-xorg-input-") and + pkg.is_installed and + not pkg.marked_upgrade): + try: + self.controller.cache.mark_install(pkg.name, "xserver-xorg-input fixup rule") + except SystemError, e: + logging.debug("Failed to apply fixup: %s (%s)" % (pkg.name, e)) + + # deal with held-backs that are unneeded + for pkgname in ["hpijs", "bzr", "tomboy"]: + if (self.controller.cache.has_key(pkgname) and self.controller.cache[pkgname].is_installed and + self.controller.cache[pkgname].isUpgradable and not self.controller.cache[pkgname].marked_upgrade): + try: + self.controller.cache.mark_install(pkgname,"%s quirk upgrade rule" % pkgname) + except SystemError, e: + logging.debug("Failed to apply %s install (%s)" % (pkgname,e)) + # libgl1-mesa-dri from xgl.compiz.info (and friends) breaks the + # upgrade, work around this here by downgrading the package + if self.controller.cache.has_key("libgl1-mesa-dri"): + pkg = self.controller.cache["libgl1-mesa-dri"] + # the version from the compiz repo has a "6.5.1+cvs20060824" ver + if (pkg.candidateVersion == pkg.installedVersion and + "+cvs2006" in pkg.candidateVersion): + for ver in pkg._pkg.VersionList: + # the "official" edgy version has "6.5.1~20060817-0ubuntu3" + if "~2006" in ver.VerStr: + # ensure that it is from a trusted repo + for (VerFileIter, index) in ver.FileList: + indexfile = self.controller.cache._list.FindIndex(VerFileIter) + if indexfile and indexfile.IsTrusted: + logging.info("Forcing downgrade of libgl1-mesa-dri for xgl.compz.info installs") + self.controller.cache._depcache.SetCandidateVer(pkg._pkg, ver) + break + + # deal with general if $foo is installed, install $bar + for (fr, to) in [("xserver-xorg-driver-all","xserver-xorg-video-all")]: + if self.controller.cache.has_key(fr) and self.controller.cache.has_key(to): + if self.controller.cache[fr].is_installed and not self.controller.cache[to].marked_install: + try: + self.controller.cache.mark_install(to,"%s->%s quirk upgrade rule" % (fr, to)) + except SystemError, e: + logging.debug("Failed to apply %s->%s install (%s)" % (fr, to, e)) + + def dapperPostDistUpgradeCache(self): + """ this function works around quirks in the breezy->dapper upgrade """ + logging.debug("running %s" % sys._getframe().f_code.co_name) + if (self.controller.cache.has_key("nvidia-glx") and self.controller.cache["nvidia-glx"].is_installed and + self.controller.cache.has_key("nvidia-settings") and self.controller.cache["nvidia-settings"].is_installed): + logging.debug("nvidia-settings and nvidia-glx is installed") + self.controller.cache.mark_remove("nvidia-settings") + self.controller.cache.mark_install("nvidia-glx") + + # run right before the first packages get installed + def StartUpgrade(self): + self._applyPatches() + self._removeOldApportCrashes() + self._removeBadMaintainerScripts() + self._killUpdateNotifier() + self._killKBluetooth() + self._killScreensaver() + self._pokeScreensaver() + self._stopDocvertConverter() + def oneiricStartUpgrade(self): + logging.debug("oneiric StartUpgrade quirks") + # fix grub issue + if (os.path.exists("/usr/sbin/update-grub") and + not os.path.exists("/etc/kernel/postinst.d/zz-update-grub")): + # create a version of zz-update-grub to avoid depending on + # the upgrade order. if that file is missing, we may end + # up generating a broken grub.cfg + targetdir = "/etc/kernel/postinst.d" + if not os.path.exists(targetdir): + os.makedirs(targetdir) + logging.debug("copying zz-update-grub into %s" % targetdir) + shutil.copy("zz-update-grub", targetdir) + os.chmod(os.path.join(targetdir, "zz-update-grub"), 0755) + # enable multiarch permanently + if apt.apt_pkg.config.find("Apt::Architecture") == "amd64": + self._enable_multiarch(foreign_arch="i386") + + def from_hardyStartUpgrade(self): + logging.debug("from_hardyStartUpgrade quirks") + self._stopApparmor() + def jauntyStartUpgrade(self): + self._createPycentralPkgRemove() + # hal/NM triggers problem, if the old (intrepid) hal gets + # triggered for a restart this causes NM to drop all connections + # because (old) hal thinks it has no devices anymore (LP: #327053) + ap = "/var/lib/dpkg/info/hal.postinst" + if os.path.exists(ap): + # intrepid md5 of hal.postinst (jaunty one is different) + # md5 jaunty 22c146857d751181cfe299a171fc11c9 + md5sum = "146145275900af343d990a4dea968d7c" + if md5(open(ap).read()).hexdigest() == md5sum: + logging.debug("removing bad script '%s'" % ap) + os.unlink(ap) + + # helpers + def _get_pci_ids(self): + """ return a set of pci ids of the system (using lspci -n) """ + lspci = set() + try: + p = subprocess.Popen(["lspci","-n"],stdout=subprocess.PIPE) + except OSError: + return lspci + for line in p.communicate()[0].split("\n"): + if line: + lspci.add(line.split()[2]) + return lspci + + def _test_and_warn_on_i8xx(self): + I8XX_PCI_IDS = ["8086:7121", # i810 + "8086:7125", # i810e + "8086:1132", # i815 + "8086:3577", # i830 + "8086:2562", # i845 + "8086:3582", # i855 + "8086:2572", # i865 + ] + lspci = self._get_pci_ids() + if set(I8XX_PCI_IDS).intersection(lspci): + res = self._view.askYesNoQuestion( + _("Your graphics hardware may not be fully supported in " + "Ubuntu 12.04 LTS."), + _("The support in Ubuntu 12.04 LTS for your Intel " + "graphics hardware is limited " + "and you may encounter problems after the upgrade. " + "For more information see " + "https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx " + "Do you want to continue with the upgrade?") + ) + if res == False: + self.controller.abort() + + def _test_and_warn_on_nvidia_and_no_sse(self): + """ The current + """ + # check if we have sse + cache = self.controller.cache + for pkgname in ["nvidia-glx-180", "nvidia-glx-185", "nvidia-glx-195"]: + if (cache.has_key(pkgname) and + cache[pkgname].marked_install and + self._checkVideoDriver("nvidia")): + logging.debug("found %s video driver" % pkgname) + if not self._cpuHasSSESupport(): + logging.warning("nvidia driver that needs SSE but cpu has no SSE support") + res = self._view.askYesNoQuestion(_("Upgrading may reduce desktop " + "effects, and performance in games " + "and other graphically intensive " + "programs."), + _("This computer is currently using " + "the NVIDIA 'nvidia' " + "graphics driver. " + "No version of this driver is " + "available that works with your " + "video card in Ubuntu " + "10.04 LTS.\n\nDo you want to continue?")) + if res == False: + self.controller.abort() + # if the user continue, do not install the broken driver + # so that we can transiton him to the free "nv" one after + # the upgrade + self.controller.cache[pkgname].mark_keep() + + + def _test_and_warn_on_old_nvidia(self): + """ nvidia-glx-71 and -96 are no longer in the archive since 8.10 """ + # now check for nvidia and show a warning if needed + cache = self.controller.cache + for pkgname in ["nvidia-glx-71","nvidia-glx-96"]: + if (cache.has_key(pkgname) and + cache[pkgname].marked_install and + self._checkVideoDriver("nvidia")): + logging.debug("found %s video driver" % pkgname) + res = self._view.askYesNoQuestion(_("Upgrading may reduce desktop " + "effects, and performance in games " + "and other graphically intensive " + "programs."), + _("This computer is currently using " + "the NVIDIA 'nvidia' " + "graphics driver. " + "No version of this driver is " + "available that works with your " + "video card in Ubuntu " + "10.04 LTS.\n\nDo you want to continue?")) + if res == False: + self.controller.abort() + # if the user continue, do not install the broken driver + # so that we can transiton him to the free "nv" one after + # the upgrade + self.controller.cache[pkgname].mark_keep() + + def _test_and_warn_on_dropped_fglrx_support(self): + """ + Some cards are no longer supported by fglrx. Check if that + is the case and warn + """ + # this is to deal with the fact that support for some of the cards + # that fglrx used to support got dropped + if (self._checkVideoDriver("fglrx") and + not self._supportInModaliases("fglrx")): + res = self._view.askYesNoQuestion(_("Upgrading may reduce desktop " + "effects, and performance in games " + "and other graphically intensive " + "programs."), + _("This computer is currently using " + "the AMD 'fglrx' graphics driver. " + "No version of this driver is " + "available that works with your " + "hardware in Ubuntu " + "10.04 LTS.\n\nDo you want to continue?")) + if res == False: + self.controller.abort() + # if the user wants to continue we remove the fglrx driver + # here because its no use (no support for this card) + logging.debug("remove xorg-driver-fglrx,xorg-driver-fglrx-envy,fglrx-kernel-source") + l=self.controller.config.getlist("Distro","PostUpgradePurge") + l.append("xorg-driver-fglrx") + l.append("xorg-driver-fglrx-envy") + l.append("fglrx-kernel-source") + l.append("fglrx-amdcccle") + l.append("xorg-driver-fglrx-dev") + l.append("libamdxvba1") + self.controller.config.set("Distro","PostUpgradePurge",",".join(l)) + + def _test_and_fail_on_non_i686(self): + """ + Test and fail if the cpu is not i686 or more or if its a newer + CPU but does not have the cmov feature (LP: #587186) + """ + # check on i386 only + if self.arch == "i386": + logging.debug("checking for i586 CPU") + if not self._cpu_is_i686_and_has_cmov(): + logging.error("not a i686 or no cmov") + summary = _("No i686 CPU") + msg = _("Your system uses an i586 CPU or a CPU that does " + "not have the 'cmov' extension. " + "All packages were built with " + "optimizations requiring i686 as the " + "minimal architecture. It is not possible to " + "upgrade your system to a new Ubuntu release " + "with this hardware.") + self._view.error(summary, msg) + self.controller.abort() + + def _cpu_is_i686_and_has_cmov(self, cpuinfo_path="/proc/cpuinfo"): + if not os.path.exists(cpuinfo_path): + logging.error("cannot open %s ?!?" % cpuinfo_path) + return True + cpuinfo = open(cpuinfo_path).read() + # check family + if re.search("^cpu family\s*:\s*[345]\s*", cpuinfo, re.MULTILINE): + logging.debug("found cpu family [345], no i686+") + return False + # check flags for cmov + match = re.search("^flags\s*:\s*(.*)", cpuinfo, re.MULTILINE) + if match: + if not "cmov" in match.group(1).split(): + logging.debug("found flags '%s'" % match.group(1)) + logging.debug("can not find cmov in flags") + return False + return True + + + def _test_and_fail_on_non_arm_v6(self): + """ + Test and fail if the cpu is not a arm v6 or greater, + from 9.10 on we do no longer support those CPUs + """ + if self.arch == "armel": + if not self._checkArmCPU(): + self._view.error(_("No ARMv6 CPU"), + _("Your system uses an ARM CPU that is older " + "than the ARMv6 architecture. " + "All packages in karmic were built with " + "optimizations requiring ARMv6 as the " + "minimal architecture. It is not possible to " + "upgrade your system to a new Ubuntu release " + "with this hardware.")) + self.controller.abort() + + def _test_and_warn_if_vserver(self): + """ + upstart and vserver environments are not a good match, warn + if we find one + """ + # verver test (LP: #454783), see if there is a init around + try: + os.kill(1, 0) + except: + logging.warn("no init found") + res = self._view.askYesNoQuestion( + _("No init available"), + _("Your system appears to be a virtualised environment " + "without an init daemon, e.g. Linux-VServer. " + "Ubuntu 10.04 LTS cannot function within this type of " + "environment, requiring an update to your virtual " + "machine configuration first.\n\n" + "Are you sure you want to continue?")) + if res == False: + self.controller.abort() + self._view.processEvents() + + def _kubuntuDesktopTransition(self): + """ + check if a key depends of kubuntu-kde4-desktop is installed + and transition in this case as well + """ + deps_found = False + frompkg = "kubuntu-kde4-desktop" + topkg = "kubuntu-desktop" + if self.config.getlist(frompkg,"KeyDependencies"): + deps_found = True + for pkg in self.config.getlist(frompkg,"KeyDependencies"): + deps_found &= (self.controller.cache.has_key(pkg) and + self.controller.cache[pkg].is_installed) + if deps_found: + logging.debug("transitioning %s to %s (via key depends)" % (frompkg, topkg)) + self.controller.cache[topkg].mark_install() + + def _mysqlClusterCheck(self): + """ + check if ndb clustering is used and do not upgrade mysql + if it is (LP: #450837) + """ + logging.debug("_mysqlClusterCheck") + if (self.controller.cache.has_key("mysql-server") and + self.controller.cache["mysql-server"].is_installed): + # taken from the mysql-server-5.1.preinst + ret = subprocess.call([ + "egrep", "-q", "-i", "-r", + "^[^#]*ndb.connectstring|^[:space:]*\[[:space:]*ndb_mgmd", + "/etc/mysql/"]) + logging.debug("egrep returned %s" % ret) + # if clustering is used, do not upgrade to 5.1 and + # remove mysql-{server,client} + # metapackage and upgrade the 5.0 packages + if ret == 0: + logging.debug("mysql clustering in use, do not upgrade to 5.1") + for pkg in ("mysql-server", "mysql-client"): + self.controller.cache.mark_remove(pkg, "clustering in use") + # mark mysql-{server,client}-5.0 as manual install (#453513) + depcache = self.controller.cache._depcache + for pkg in ["mysql-server-5.0", "mysql-client-5.0"]: + if pkg.is_installed and depcache.IsAutoInstalled(pkg._pkg): + logging.debug("marking '%s' manual installed" % pkg.name) + autoInstDeps = False + fromUser = True + depcache.Mark_install(pkg._pkg, autoInstDeps, fromUser) + else: + self.controller.cache.mark_upgrade("mysql-server", "no clustering in use") + + def _checkArmCPU(self): + """ + parse /proc/cpuinfo and search for ARMv6 or greater + """ + logging.debug("checking for ARM CPU version") + if not os.path.exists("/proc/cpuinfo"): + logging.error("cannot open /proc/cpuinfo ?!?") + return False + cpuinfo = open("/proc/cpuinfo") + if re.search("^Processor\s*:\s*ARMv[45]", cpuinfo.read(), re.MULTILINE): + return False + return True + + def _dealWithLanguageSupportTransition(self): + """ + In karmic the language-support-translations-* metapackages + are gone and the direct dependencies will get marked for + auto removal - mark them as manual instead + """ + logging.debug("language-support-translations-* transition") + for pkg in self.controller.cache: + depcache = self.controller.cache._depcache + if (pkg.name.startswith("language-support-translations") and + pkg.is_installed): + for dp_or in pkg.installedDependencies: + for dpname in dp_or.or_dependencies: + dp = self.controller.cache[dpname.name] + if dp.is_installed and depcache.IsAutoInstalled(dp._pkg): + logging.debug("marking '%s' manual installed" % dp.name) + autoInstDeps = False + fromUser = True + depcache.mark_install(dp._pkg, autoInstDeps, fromUser) + + def _checkLanguageSupport(self): + """ + check if the language support is fully installed and if + not generate a update-notifier note on next login + """ + if not os.path.exists("/usr/bin/check-language-support"): + logging.debug("no check-language-support available") + return + p = subprocess.Popen(["check-language-support"],stdout=subprocess.PIPE) + for pkgname in p.communicate()[0].split(): + if (self.controller.cache.has_key(pkgname) and + not self.controller.cache[pkgname].is_installed): + logging.debug("language support package '%s' missing" % pkgname) + # check if kde/gnome and copy language-selector note + base = "/usr/share/language-support/" + target = "/var/lib/update-notifier/user.d" + for p in ("incomplete-language-support-gnome.note", + "incomplete-language-support-qt.note"): + if os.path.exists(os.path.join(base,p)): + shutil.copy(os.path.join(base,p), target) + return + + def _checkAndInstallBroadcom(self): + """ + check for the 'wl' kernel module and install bcmwl-kernel-source + if the module is loaded + """ + logging.debug("checking for 'wl' module") + if "wl" in lsmod(): + self.controller.cache.mark_install("bcmwl-kernel-source", + "'wl' module found in lsmod") + + def _stopApparmor(self): + """ /etc/init.d/apparmor stop (see bug #559433)""" + if os.path.exists("/etc/init.d/apparmor"): + logging.debug("/etc/init.d/apparmor stop") + subprocess.call(["/etc/init.d/apparmor","stop"]) + def _stopDocvertConverter(self): + " /etc/init.d/docvert-converter stop (see bug #450569)" + if os.path.exists("/etc/init.d/docvert-converter"): + logging.debug("/etc/init.d/docvert-converter stop") + subprocess.call(["/etc/init.d/docvert-converter","stop"]) + def _killUpdateNotifier(self): + "kill update-notifier" + # kill update-notifier now to suppress reboot required + if os.path.exists("/usr/bin/killall"): + logging.debug("killing update-notifier") + subprocess.call(["killall","-q","update-notifier"]) + def _killKBluetooth(self): + """killall kblueplugd kbluetooth (riddel requested it)""" + if os.path.exists("/usr/bin/killall"): + logging.debug("killing kblueplugd kbluetooth4") + subprocess.call(["killall", "-q", "kblueplugd", "kbluetooth4"]) + def _killScreensaver(self): + """killall gnome-screensaver """ + if os.path.exists("/usr/bin/killall"): + logging.debug("killing gnome-screensaver") + subprocess.call(["killall", "-q", "gnome-screensaver"]) + def _pokeScreensaver(self): + if os.path.exists("/usr/bin/xdg-screensaver") and os.environ.get('DISPLAY') : + logging.debug("setup poke timer for the scrensaver") + try: + self._poke = subprocess.Popen( + "while true; do /usr/bin/xdg-screensaver reset >/dev/null 2>&1; sleep 30; done", + shell=True) + atexit.register(self._stopPokeScreensaver) + except: + logging.exception("failed to setup screensaver poke") + def _stopPokeScreensaver(self): + if self._poke: + res = False + try: + self._poke.terminate() + res = self._poke.wait() + except: + logging.exception("failed to stop screensaver poke") + self._poke = None + return res + def _removeBadMaintainerScripts(self): + " remove bad/broken maintainer scripts (last resort) " + # apache: workaround #95325 (edgy->feisty) + # pango-libthai #103384 (edgy->feisty) + bad_scripts = ["/var/lib/dpkg/info/apache2-common.prerm", + "/var/lib/dpkg/info/pango-libthai.postrm", + ] + for ap in bad_scripts: + if os.path.exists(ap): + logging.debug("removing bad script '%s'" % ap) + os.unlink(ap) + + def _createPycentralPkgRemove(self): + """ + intrepid->jaunty, create /var/lib/pycentral/pkgremove flag file + to help python-central so that it removes all preinst links + on upgrade + """ + logging.debug("adding pkgremove file") + if not os.path.exists("/var/lib/pycentral/"): + os.makedirs("/var/lib/pycentral") + open("/var/lib/pycentral/pkgremove","w") + + def _removeOldApportCrashes(self): + " remove old apport crash files " + try: + for f in glob.glob("/var/crash/*.crash"): + logging.debug("removing old crash file '%s'" % f) + os.unlink(f) + except Exception, e: + logging.warning("error during unlink of old crash files (%s)" % e) + + def _cpuHasSSESupport(self, cpuinfo="/proc/cpuinfo"): + " helper that checks if the given cpu has sse support " + if not os.path.exists(cpuinfo): + return False + for line in open(cpuinfo): + if line.startswith("flags") and not " sse" in line: + return False + return True + + def _usesEvmsInMounts(self): + " check if evms is used in /proc/mounts " + logging.debug("running _usesEvmsInMounts") + for line in open("/proc/mounts"): + line = line.strip() + if line == '' or line.startswith("#"): + continue + try: + (device, mount_point, fstype, options, a, b) = line.split() + except Exception: + logging.error("can't parse line '%s'" % line) + continue + if "evms" in device: + logging.debug("found evms device in line '%s', skipping " % line) + return True + return False + + def _checkAndRemoveEvms(self): + " check if evms is in use and if not, remove it " + logging.debug("running _checkAndRemoveEvms") + if self._usesEvmsInMounts(): + return False + # if not in use, nuke it + for pkg in ["evms","libevms-2.5","libevms-dev", + "evms-ncurses", "evms-ha", + "evms-bootdebug", + "evms-gui", "evms-cli", + "linux-patch-evms"]: + if self.controller.cache.has_key(pkg) and self.controller.cache[pkg].is_installed: + self.controller.cache[pkg].mark_delete() + return True + + def _addRelatimeToFstab(self): + " add the relatime option to ext2/ext3 filesystems on upgrade " + logging.debug("_addRelatime") + replaced = False + lines = [] + for line in open("/etc/fstab"): + line = line.strip() + if line == '' or line.startswith("#"): + lines.append(line) + continue + try: + (device, mount_point, fstype, options, a, b) = line.split() + except Exception: + logging.error("can't parse line '%s'" % line) + lines.append(line) + continue + if (("ext2" in fstype or + "ext3" in fstype) and + (not "noatime" in options) and + (not "relatime" in options) ): + logging.debug("adding 'relatime' to line '%s' " % line) + line = line.replace(options,"%s,relatime" % options) + logging.debug("replaced line is '%s' " % line) + replaced=True + lines.append(line) + # we have converted a line + if replaced: + logging.debug("writing new /etc/fstab") + f=open("/etc/fstab.intrepid","w") + f.write("\n".join(lines)) + # add final newline (see LP: #279093) + f.write("\n") + f.close() + os.rename("/etc/fstab.intrepid","/etc/fstab") + return True + + def _ntfsFstabFixup(self, fstab="/etc/fstab"): + """change PASS 1 to 0 for ntfs entries (#441242)""" + logging.debug("_ntfsFstabFixup") + replaced = False + lines = [] + for line in open(fstab): + line = line.strip() + if line == '' or line.startswith("#"): + lines.append(line) + continue + try: + (device, mount_point, fstype, options, fdump, fpass) = line.split() + except Exception: + logging.error("can't parse line '%s'" % line) + lines.append(line) + continue + if ("ntfs" in fstype and fpass == "1"): + logging.debug("changing PASS for ntfs to 0 for '%s' " % line) + if line[-1] == "1": + line = line[:-1] + "0" + else: + logging.error("unexpected value in line") + logging.debug("replaced line is '%s' " % line) + replaced=True + lines.append(line) + # we have converted a line + if replaced: + suffix = ".jaunty" + logging.debug("writing new /etc/fstab") + f=open(fstab + suffix, "w") + f.write("\n".join(lines)) + # add final newline (see LP: #279093) + f.write("\n") + f.close() + os.rename(fstab+suffix, fstab) + return True + + + def _rewriteFstab(self): + " convert /dev/{hd?,scd0} to /dev/cdrom for the feisty upgrade " + logging.debug("_rewriteFstab()") + replaced = 0 + lines = [] + # we have one cdrom to convert + for line in open("/etc/fstab"): + line = line.strip() + if line == '' or line.startswith("#"): + lines.append(line) + continue + try: + (device, mount_point, fstype, options, a, b) = line.split() + except Exception: + logging.error("can't parse line '%s'" % line) + lines.append(line) + continue + # edgy kernel has /dev/cdrom -> /dev/hd? + # feisty kernel (for a lot of chipsets) /dev/cdrom -> /dev/scd0 + # this breaks static mounting (LP#86424) + # + # we convert here to /dev/cdrom only if current /dev/cdrom + # points to the device in /etc/fstab already. this ensures + # that we don't break anything or that we get it wrong + # for systems with two (or more) cdroms. this is ok, because + # we convert under the old kernel + if ("iso9660" in fstype and + device != "/dev/cdrom" and + os.path.exists("/dev/cdrom") and + os.path.realpath("/dev/cdrom") == device + ): + logging.debug("replacing '%s' " % line) + line = line.replace(device,"/dev/cdrom") + logging.debug("replaced line is '%s' " % line) + replaced += 1 + lines.append(line) + # we have converted a line (otherwise we would have exited already) + if replaced > 0: + logging.debug("writing new /etc/fstab") + shutil.copy("/etc/fstab","/etc/fstab.edgy") + f=open("/etc/fstab","w") + f.write("\n".join(lines)) + # add final newline (see LP: #279093) + f.write("\n") + f.close() + return True + + def _checkAdminGroup(self): + " check if the current sudo user is in the admin group " + logging.debug("_checkAdminGroup") + import grp + try: + admin_group = grp.getgrnam("admin").gr_mem + except KeyError, e: + logging.warning("System has no admin group (%s)" % e) + subprocess.call(["addgroup","--system","admin"]) + # double paranoia + try: + admin_group = grp.getgrnam("admin").gr_mem + except KeyError, e: + logging.warning("adding the admin group failed (%s)" % e) + return + # if the current SUDO_USER is not in the admin group + # we add him - this is no security issue because + # the user is already root so adding him to the admin group + # does not change anything + if (os.environ.has_key("SUDO_USER") and + not os.environ["SUDO_USER"] in admin_group): + admin_user = os.environ["SUDO_USER"] + logging.info("SUDO_USER=%s is not in admin group" % admin_user) + cmd = ["usermod","-a","-G","admin",admin_user] + res = subprocess.call(cmd) + logging.debug("cmd: %s returned %i" % (cmd, res)) + + def _checkVideoDriver(self, name): + " check if the given driver is in use in xorg.conf " + XORG="/etc/X11/xorg.conf" + if not os.path.exists(XORG): + return False + for line in open(XORG): + s=line.split("#")[0].strip() + # check for fglrx driver entry + if (s.lower().startswith("driver") and + s.endswith('"%s"' % name)): + return True + return False + + def _applyPatches(self, patchdir="./patches"): + """ + helper that applies the patches in patchdir. the format is + _path_to_file.md5sum + + and it will apply the diff to that file if the md5sum + matches + """ + if not os.path.exists(patchdir): + logging.debug("no patchdir") + return + for f in os.listdir(patchdir): + # skip, not a patch file, they all end with .$md5sum + if not "." in f: + logging.debug("skipping '%s' (no '.')" % f) + continue + logging.debug("check if patch '%s' needs to be applied" % f) + (encoded_path, md5sum, result_md5sum) = string.rsplit(f, ".", 2) + # FIXME: this is not clever and needs quoting support for + # filenames with "_" in the name + path = encoded_path.replace("_","/") + logging.debug("target for '%s' is '%s' -> '%s'" % ( + f, encoded_path, path)) + # target does not exist + if not os.path.exists(path): + logging.debug("target '%s' does not exist" % path) + continue + # check the input md5sum, this is not strictly needed as patch() + # will verify the result md5sum and discard the result if that + # does not match but this will remove a misleading error in the + # logs + md5 = hashlib.md5() + md5.update(open(path).read()) + if md5.hexdigest() == result_md5sum: + logging.debug("already at target hash, skipping '%s'" % path) + continue + elif md5.hexdigest() != md5sum: + logging.warn("unexpected target md5sum, skipping: '%s'" % path) + continue + # patchable, do it + from DistUpgradePatcher import patch + try: + patch(path, os.path.join(patchdir, f), result_md5sum) + logging.info("applied '%s' successfully" % f) + except Exception: + logging.exception("ed failed for '%s'" % f) + + def _supportInModaliases(self, pkgname, lspci=None): + """ + Check if pkgname will work on this hardware + + This helper will check with the modaliasesdir if the given + pkg will work on this hardware (or the hardware given + via the lspci argument) + """ + # get lspci info (if needed) + if not lspci: + lspci = self._get_pci_ids() + # get pkg + if (not pkgname in self.controller.cache or + not self.controller.cache[pkgname].candidate): + logging.warn("can not find '%s' in cache") + return False + pkg = self.controller.cache[pkgname] + for (module, pciid_list) in self._parse_modaliases_from_pkg_header(pkg.candidate.record): + for pciid in pciid_list: + m = re.match("pci:v0000(.+)d0000(.+)sv.*", pciid) + if m: + matchid = "%s:%s" % (m.group(1), m.group(2)) + if matchid.lower() in lspci: + logging.debug("found system pciid '%s' in modaliases" % matchid) + return True + logging.debug("checking for %s support in modaliases but none found" % pkgname) + return False + + def _parse_modaliases_from_pkg_header(self, pkgrecord): + """ return a list of (module1, (pciid, ...), (module2, (pciid, ...)))""" + if not "Modaliases" in pkgrecord: + return [] + # split the string + modules = [] + for m in pkgrecord["Modaliases"].split(")"): + m = m.strip(", ") + if not m: + continue + (module, pciids) = m.split("(") + modules.append ((module, [x.strip() for x in pciids.split(",")])) + return modules + + def _kernel386TransitionCheck(self): + """ test if the current kernel is 386 and if the system is + capable of using a generic one instead (#353534) + """ + logging.debug("_kernel386TransitionCheck") + # we test first if one of 386 is installed + # if so, check if the system could also work with -generic + # (we get that from base-installer) and try to installed + # that) + for pkgname in ["linux-386", "linux-image-386"]: + if (self.controller.cache.has_key(pkgname) and + self.controller.cache[pkgname].is_installed): + working_kernels = self.controller.cache.getKernelsFromBaseInstaller() + upgrade_to = ["linux-generic", "linux-image-generic"] + for pkgname in upgrade_to: + if pkgname in working_kernels: + logging.debug("386 kernel installed, but generic kernel will work on this machine") + if self.controller.cache.mark_install(pkgname, "386 -> generic transition"): + return + + + def _add_extras_repository(self): + logging.debug("_add_extras_repository") + cache = self.controller.cache + if not "ubuntu-extras-keyring" in cache: + logging.debug("no ubuntu-extras-keyring, no need to add repo") + return + if not (cache["ubuntu-extras-keyring"].marked_install or + cache["ubuntu-extras-keyring"].installed): + logging.debug("ubuntu-extras-keyring not installed/marked_install") + return + try: + import aptsources.sourceslist + sources = aptsources.sourceslist.SourcesList() + for entry in sources: + if "extras.ubuntu.com" in entry.uri: + logging.debug("found extras.ubuntu.com, no need to add it") + break + else: + logging.info("no extras.ubuntu.com, adding it to sources.list") + sources.add("deb","http://extras.ubuntu.com/ubuntu", + self.controller.toDist, ["main"], + "Third party developers repository") + sources.save() + except: + logging.exception("error adding extras.ubuntu.com") + + def _gutenprint_fixup(self): + """ foomatic-db-gutenprint get removed during the upgrade, + replace it with the compressed ijsgutenprint-ppds + (context is foomatic-db vs foomatic-db-compressed-ppds) + """ + try: + cache = self.controller.cache + if ("foomatic-db-gutenprint" in cache and + cache["foomatic-db-gutenprint"].marked_delete and + "ijsgutenprint-ppds" in cache): + logging.info("installing ijsgutenprint-ppds") + cache.mark_install( + "ijsgutenprint-ppds", + "foomatic-db-gutenprint -> ijsgutenprint-ppds rule") + except: + logging.exception("_gutenprint_fixup failed") + + def _enable_multiarch(self, foreign_arch="i386"): + """ enable multiarch via /etc/dpkg/dpkg.cfg.d/multiarch """ + cfg = "/etc/dpkg/dpkg.cfg.d/multiarch" + if not os.path.exists(cfg): + try: + os.makedirs("/etc/dpkg/dpkg.cfg.d/") + except OSError: + pass + open(cfg, "w").write("foreign-architecture %s\n" % foreign_arch) + + def _add_kdegames_card_extra_if_installed(self): + """ test if kdegames-card-data is installed and if so, + add kdegames-card-data-extra so that users do not + loose functionality (LP: #745396) + """ + try: + cache = self.controller.cache + if not ("kdegames-card-data" in cache or + "kdegames-card-data-extra" in cache): + return + if (cache["kdegames-card-data"].is_installed or + cache["kdegames-card-data"].marked_install): + cache.mark_install( + "kdegames-card-data-extra", + "kdegames-card-data -> k-c-d-extra transition") + except: + logging.exception("_add_kdegames_card_extra_if_installed failed") + + def ensure_recommends_are_installed_on_desktops(self): + """ ensure that on a desktop install recommends are installed + (LP: #759262) + """ + import apt + if not self.controller.serverMode: + if not apt.apt_pkg.config.find_b("Apt::Install-Recommends"): + logging.warn("Apt::Install-Recommends was disabled, enabling it just for the upgrade") + apt.apt_pkg.config.set("Apt::Install-Recommends", "1") + diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgrade.ui update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgrade.ui --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgrade.ui 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgrade.ui 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,1605 @@ + + + + + False + 6 + False + center-on-parent + dialog + True + True + True + + + True + False + 12 + + + True + False + end + + + _Cancel Upgrade + True + True + True + False + False + True + + + False + False + 0 + + + + + _Resume Upgrade + True + True + True + True + False + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + 6 + 12 + + + True + False + 0 + 0 + gtk-dialog-question + 6 + + + False + True + 0 + + + + + True + False + 0 + 0 + <b><big>Cancel the running upgrade?</big></b> + +The system could be in an unusable state if you cancel the upgrade. You are strongly adviced to resume the upgrade. + True + True + + + False + False + 1 + + + + + False + True + 1 + + + + + + button_cancel + button_resume + + + + False + 6 + center-on-parent + 500 + 550 + dialog + True + True + True + + + True + False + 6 + + + True + False + end + + + gtk-cancel + True + True + True + False + False + True + + + False + False + 0 + + + + + _Start Upgrade + True + True + True + False + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + 6 + 12 + + + True + False + 0 + 0 + gtk-dialog-question + 6 + + + False + True + 0 + + + + + True + False + 12 + + + True + True + 0 + True + True + True + + + False + True + 0 + + + + + True + False + 0 + True + True + + + False + True + 1 + + + + + True + True + 6 + + + 200 + True + True + in + + + True + True + False + + + + + + + True + False + Details + + + + + True + True + 2 + + + + + True + True + 1 + + + + + True + True + 1 + + + + + + button_cancel_changes + button_confirm_changes + + + + False + 5 + False + True + center-on-parent + dialog + + + True + False + 12 + + + True + False + end + + + True + True + True + True + False + False + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-cancel + + + False + False + 0 + + + + + True + False + _Keep + True + + + False + False + 1 + + + + + + + + + False + False + 0 + + + + + True + True + True + False + False + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-ok + + + False + False + 0 + + + + + True + False + _Replace + True + + + False + False + 1 + + + + + + + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + 6 + 12 + + + True + False + 0 + 0 + gtk-dialog-question + 6 + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 0 + True + True + + + False + False + 0 + + + + + True + True + 1 + + + + + False + True + 1 + + + + + True + True + + + True + False + + + True + True + in + + + 300 + True + True + False + False + + + + + False + False + 0 + + + + + + + True + False + Difference between the files + + + + + False + True + 2 + + + + + + button9 + button10 + + + + False + 6 + False + center-on-parent + dialog + True + True + True + + + True + False + 12 + + + True + False + end + + + _Report Bug + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-close + True + True + True + True + False + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + 6 + 12 + + + True + False + 0 + 0 + gtk-dialog-error + 6 + + + False + True + 0 + + + + + True + False + 12 + + + True + True + 0 + True + True + True + + + False + True + 0 + + + + + 400 + 200 + True + in + + + True + True + 4 + 4 + False + 4 + 4 + + + + + True + True + 1 + + + + + True + True + 1 + + + + + False + True + 1 + + + + + + button_bugreport + button6 + + + + False + 6 + False + center-on-parent + dialog + True + True + True + + + True + False + 12 + + + True + False + end + + + gtk-close + True + True + True + True + False + False + True + + + False + False + 0 + + + + + False + True + end + 0 + + + + + True + False + 6 + 12 + + + True + False + 0 + 0 + gtk-dialog-info + 6 + + + False + True + 0 + + + + + True + False + 12 + + + True + True + 0 + True + True + True + + + False + True + 0 + + + + + 400 + 200 + True + in + + + True + True + 4 + 4 + False + 4 + 4 + + + + + True + True + 1 + + + + + True + True + 1 + + + + + False + True + 1 + + + + + + button12 + + + + False + 6 + False + center-on-parent + 500 + 400 + dialog + True + True + True + + + True + False + 6 + + + True + False + end + + + gtk-cancel + True + True + True + False + False + True + + + False + False + 0 + + + + + _Continue + True + True + True + False + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + 6 + 12 + + + True + False + 12 + + + True + False + 0 + 0 + gtk-dialog-warning + 6 + + + False + True + 0 + + + + + True + False + 12 + + + True + False + 0 + 0 + <b><big>Start the upgrade?</big></b> + True + True + + + False + False + 0 + + + + + True + False + 0 + 0 + True + + + False + False + 1 + + + + + True + True + + + 400 + 200 + True + True + in + + + True + True + False + + + + + + + True + False + Details + + + + + False + False + 2 + + + + + False + False + 1 + + + + + False + False + 0 + + + + + False + True + 1 + + + + + + button7 + button8 + + + + False + 6 + False + center-on-parent + dialog + True + True + True + + + True + False + 12 + + + True + False + end + + + True + True + True + False + False + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-refresh + + + False + False + 0 + + + + + True + False + _Restart Now + True + + + False + False + 1 + + + + + + + + + False + False + 0 + + + + + gtk-close + True + True + True + False + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + 6 + 12 + + + True + False + 0 + 0 + gtk-dialog-info + 6 + + + False + True + 0 + + + + + True + False + 0 + 0 + <b><big>Restart the system to complete the upgrade</big></b> + +Please save your work before continuing. + True + + + False + False + 1 + + + + + False + True + 1 + + + + + + button_restart + button_restart1 + + + + True + False + 6 + Distribution Upgrade + False + center + True + + + + True + False + 12 + + + True + False + 6 + 12 + + + True + False + 0 + <b><big>Upgrading Ubuntu to version 12.04</big></b> + True + + + False + False + 0 + + + + + True + False + + + True + False + + + + False + False + 0 + + + + + True + False + 6 + 2 + 6 + 6 + + + True + False + 0 + Preparing to upgrade + + + 1 + 2 + GTK_FILL + + + + + + True + False + 0 + Setting new software channels + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + True + False + 0 + Getting new packages + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + True + False + + + False + + + True + True + 0 + + + + + 18 + 18 + False + + + True + True + 1 + + + + + GTK_FILL + GTK_FILL + + + + + True + False + + + False + + + True + True + 0 + + + + + 18 + 18 + False + + + True + True + 1 + + + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + False + + + False + + + True + True + 0 + + + + + 18 + 18 + False + + + True + True + 1 + + + + + 2 + 3 + GTK_FILL + GTK_FILL + + + + + True + False + 0 + Restarting the computer + + + 1 + 2 + 5 + 6 + GTK_FILL + + + + + + True + False + + + False + + + True + True + 0 + + + + + 18 + 18 + False + + + True + True + 1 + + + + + 5 + 6 + GTK_FILL + GTK_FILL + + + + + True + False + + + False + + + True + True + 0 + + + + + 18 + 18 + False + + + True + True + 1 + + + + + 4 + 5 + GTK_FILL + GTK_FILL + + + + + True + False + 0 + Cleaning up + + + 1 + 2 + 4 + 5 + GTK_FILL + + + + + + True + False + 0 + Installing the upgrades + + + 1 + 2 + 3 + 4 + GTK_FILL + + + + + + True + False + + + False + + + True + True + 0 + + + + + 18 + 18 + False + + + True + True + 1 + + + + + 3 + 4 + GTK_FILL + GTK_FILL + + + + + True + True + 1 + + + + + True + True + 1 + + + + + True + False + 4 + + + 350 + True + False + 0.10000000149 + + end + + + False + False + 0 + + + + + True + False + 0 + True + end + + + False + False + 1 + + + + + True + True + 2 + + + + + True + False + + + True + False + True + 4 + + + True + False + + + + + True + False + Terminal + + + + + True + True + 0 + + + + + gtk-cancel + True + False + False + True + + + False + False + 1 + + + + + True + True + 3 + + + + + True + True + 0 + + + + + + diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeVersion.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeVersion.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeVersion.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeVersion.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1 @@ +VERSION='0.123' diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeViewGtk3.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeViewGtk3.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeViewGtk3.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeViewGtk3.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,747 @@ +# DistUpgradeViewGtk3.py +# +# Copyright (c) 2011 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import gi +gi.require_version("Gtk", "3.0") +gi.require_version("Vte", "2.90") + +from gi.repository import Gtk +from gi.repository import Gdk +from gi.repository import Vte +from gi.repository import GLib +from gi.repository import GObject +from gi.repository import Pango + +import sys +import locale +import logging +import time +import subprocess + +import apt +import apt_pkg +import os + +from DistUpgradeApport import run_apport, apport_crash + +from DistUpgradeView import DistUpgradeView, FuzzyTimeToStr, InstallProgress, FetchProgress +from SimpleGtk3builderApp import SimpleGtkbuilderApp + +import gettext +from DistUpgradeGettext import gettext as _ + +GObject.threads_init() + +def utf8(str): + return unicode(str, 'latin1').encode('utf-8') + +class GtkCdromProgressAdapter(apt.progress.CdromProgress): + """ Report the cdrom add progress + Subclass this class to implement cdrom add progress reporting + """ + def __init__(self, parent): + self.status = parent.label_status + self.progress = parent.progressbar_cache + self.parent = parent + def update(self, text, step): + """ update is called regularly so that the gui can be redrawn """ + if text: + self.status.set_text(text) + self.progress.set_fraction(step/float(self.totalSteps)) + while Gtk.events_pending(): + Gtk.main_iteration() + def askCdromName(self): + return (False, "") + def changeCdrom(self): + return False + +class GtkOpProgress(apt.progress.base.OpProgress): + def __init__(self, progressbar): + self.progressbar = progressbar + #self.progressbar.set_pulse_step(0.01) + #self.progressbar.pulse() + self.fraction = 0.0 + + def update(self, percent): + #if percent > 99: + # self.progressbar.set_fraction(1) + #else: + # self.progressbar.pulse() + new_fraction = percent/100.0 + if abs(self.fraction-new_fraction) > 0.1: + self.fraction = new_fraction + self.progressbar.set_fraction(self.fraction) + while Gtk.events_pending(): + Gtk.main_iteration() + + def done(self): + self.progressbar.set_text(" ") + + +class GtkFetchProgressAdapter(FetchProgress): + # FIXME: we really should have some sort of "we are at step" + # xy in the gui + # FIXME2: we need to thing about mediaCheck here too + def __init__(self, parent): + super(GtkFetchProgressAdapter, self).__init__() + # if this is set to false the download will cancel + self.status = parent.label_status + self.progress = parent.progressbar_cache + self.parent = parent + self.canceled = False + self.button_cancel = parent.button_fetch_cancel + self.button_cancel.connect('clicked', self.cancelClicked) + def cancelClicked(self, widget): + logging.debug("cancelClicked") + self.canceled = True + def media_change(self, medium, drive): + #print "mediaChange %s %s" % (medium, drive) + msg = _("Please insert '%s' into the drive '%s'") % (medium,drive) + dialog = Gtk.MessageDialog(parent=self.parent.window_main, + flags=Gtk.DialogFlags.MODAL, + type=Gtk.MessageType.QUESTION, + buttons=Gtk.ButtonsType.OK_CANCEL) + dialog.set_markup(msg) + res = dialog.run() + dialog.set_title("") + dialog.destroy() + if res == Gtk.ResponseType.OK: + return True + return False + def start(self): + #logging.debug("start") + super(GtkFetchProgressAdapter, self).start() + self.progress.set_fraction(0) + self.status.show() + self.button_cancel.show() + def stop(self): + #logging.debug("stop") + self.progress.set_text(" ") + self.status.set_text(_("Fetching is complete")) + self.button_cancel.hide() + def pulse(self, owner): + super(GtkFetchProgressAdapter, self).pulse(owner) + # only update if there is a noticable change + if abs(self.percent-self.progress.get_fraction()*100.0) > 0.1: + self.progress.set_fraction(self.percent/100.0) + currentItem = self.current_items + 1 + if currentItem > self.total_items: + currentItem = self.total_items + if self.current_cps > 0: + self.status.set_text(_("Fetching file %li of %li at %sB/s") % ( + currentItem, self.total_items, + apt_pkg.size_to_str(self.current_cps))) + self.progress.set_text(_("About %s remaining") % FuzzyTimeToStr( + self.eta)) + else: + self.status.set_text(_("Fetching file %li of %li") % ( + currentItem, self.total_items)) + self.progress.set_text(" ") + while Gtk.events_pending(): + Gtk.main_iteration() + return (not self.canceled) + +class GtkInstallProgressAdapter(InstallProgress): + # timeout with no status change when the terminal is expanded + # automatically + TIMEOUT_TERMINAL_ACTIVITY = 300 + + def __init__(self,parent): + InstallProgress.__init__(self) + self._cache = None + self.label_status = parent.label_status + self.progress = parent.progressbar_cache + self.expander = parent.expander_terminal + self.term = parent._term + self.term.connect("child-exited", self.child_exited) + self.parent = parent + # setup the child waiting + # some options for dpkg to make it die less easily + apt_pkg.Config.set("DPkg::StopOnError","False") + + def start_update(self): + InstallProgress.start_update(self) + self.finished = False + # FIXME: add support for the timeout + # of the terminal (to display something useful then) + # -> longer term, move this code into python-apt + self.label_status.set_text(_("Applying changes")) + self.progress.set_fraction(0.0) + self.progress.set_text(" ") + self.expander.set_sensitive(True) + self.term.show() + self.term.connect("contents-changed", self._on_term_content_changed) + # if no libgtk2-perl is installed show the terminal + frontend= os.environ.get("DEBIAN_FRONTEND") or "gnome" + if frontend == "gnome" and self._cache: + if (not "libgtk2-perl" in self._cache or + not self._cache["libgtk2-perl"].is_installed): + frontend = "dialog" + self.expander.set_expanded(True) + self.env = ["VTE_PTY_KEEP_FD=%s"% self.writefd, + "APT_LISTCHANGES_FRONTEND=none"] + if not os.environ.has_key("DEBIAN_FRONTEND"): + self.env.append("DEBIAN_FRONTEND=%s" % frontend) + # do a bit of time-keeping + self.start_time = 0.0 + self.time_ui = 0.0 + self.last_activity = 0.0 + + def error(self, pkg, errormsg): + InstallProgress.error(self, pkg, errormsg) + logging.error("got an error from dpkg for pkg: '%s': '%s'" % (pkg, errormsg)) + # we do not report followup errors from earlier failures + if gettext.dgettext('dpkg', "dependency problems - leaving unconfigured") in errormsg: + return False + + #self.expander_terminal.set_expanded(True) + self.parent.dialog_error.set_transient_for(self.parent.window_main) + summary = _("Could not install '%s'") % pkg + msg = _("The upgrade will continue but the '%s' package may not " + "be in a working state. Please consider submitting a " + "bug report about it.") % pkg + markup="%s\n\n%s" % (summary, msg) + self.parent.dialog_error.realize() + self.parent.dialog_error.set_title("") + self.parent.dialog_error.get_window().set_functions(Gdk.WMFunction.MOVE) + self.parent.label_error.set_markup(markup) + self.parent.textview_error.get_buffer().set_text(utf8(errormsg)) + self.parent.scroll_error.show() + self.parent.dialog_error.run() + self.parent.dialog_error.hide() + + def conffile(self, current, new): + logging.debug("got a conffile-prompt from dpkg for file: '%s'" % current) + start = time.time() + #self.expander.set_expanded(True) + prim = _("Replace the customized configuration file\n'%s'?") % current + sec = _("You will lose any changes you have made to this " + "configuration file if you choose to replace it with " + "a newer version.") + markup = "%s \n\n%s" % (prim, sec) + self.parent.label_conffile.set_markup(markup) + self.parent.dialog_conffile.set_title("") + self.parent.dialog_conffile.set_transient_for(self.parent.window_main) + + # workaround silly dpkg + if not os.path.exists(current): + current = current+".dpkg-dist" + + # now get the diff + if os.path.exists("/usr/bin/diff"): + cmd = ["/usr/bin/diff", "-u", current, new] + diff = utf8(subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0]) + self.parent.textview_conffile.get_buffer().set_text(diff) + else: + self.parent.textview_conffile.get_buffer().set_text(_("The 'diff' command was not found")) + res = self.parent.dialog_conffile.run() + self.parent.dialog_conffile.hide() + self.time_ui += time.time() - start + # if replace, send this to the terminal + if res == Gtk.ResponseType.YES: + self.term.feed_child("y\n", -1) + else: + self.term.feed_child("n\n", -1) + + def fork(self): + pty = Vte.Pty.new(Vte.PtyFlags.DEFAULT) + pid = os.fork() + if pid == 0: + # WORKAROUND for broken feisty vte where envv does not work) + for env in self.env: + (key, value) = env.split("=") + os.environ[key] = value + # MUST be called + pty.child_setup() + # force dpkg terminal messages untranslated for better bug + # duplication detection + os.environ["DPKG_UNTRANSLATED_MESSAGES"] = "1" + else: + self.term.set_pty_object(pty) + self.term.watch_child(pid) + return pid + + def _on_term_content_changed(self, term): + """ helper function that is called when the terminal changed + to ensure that we have a accurate idea when something hangs + """ + self.last_activity = time.time() + self.activity_timeout_reported = False + + def status_change(self, pkg, percent, status): + # start the timer when the first package changes its status + if self.start_time == 0.0: + #print "setting start time to %s" % self.start_time + self.start_time = time.time() + # only update if there is a noticable change + if abs(percent-self.progress.get_fraction()*100.0) > 0.1: + self.progress.set_fraction(float(percent)/100.0) + self.label_status.set_text(status.strip()) + # start showing when we gathered some data + if percent > 1.0: + delta = self.last_activity - self.start_time + # time wasted in conffile questions (or other ui activity) + delta -= self.time_ui + time_per_percent = (float(delta)/percent) + eta = (100.0 - percent) * time_per_percent + # only show if we have some sensible data (60sec < eta < 2days) + if eta > 61.0 and eta < (60*60*24*2): + self.progress.set_text(_("About %s remaining") % FuzzyTimeToStr(eta)) + else: + self.progress.set_text(" ") + # 2 == WEBKIT_LOAD_FINISHED - the enums is not exposed via python + if (self.parent._webkit_view and + self.parent._webkit_view.get_property("load-status") == 2): + self.parent._webkit_view.execute_script('progress("%s")' % percent) + + def child_exited(self, term): + # we need to capture the full status here (not only the WEXITSTATUS) + self.apt_status = term.get_child_exit_status() + self.finished = True + + def wait_child(self): + while not self.finished: + self.update_interface() + return self.apt_status + + def finish_update(self): + self.label_status.set_text("") + + def update_interface(self): + InstallProgress.update_interface(self) + # check if we haven't started yet with packages, pulse then + if self.start_time == 0.0: + self.progress.pulse() + time.sleep(0.2) + # check about terminal activity + if self.last_activity > 0 and \ + (self.last_activity + self.TIMEOUT_TERMINAL_ACTIVITY) < time.time(): + if not self.activity_timeout_reported: + logging.warning("no activity on terminal for %s seconds (%s)" % (self.TIMEOUT_TERMINAL_ACTIVITY, self.label_status.get_text())) + self.activity_timeout_reported = True + self.parent.expander_terminal.set_expanded(True) + # process events + while Gtk.events_pending(): + Gtk.main_iteration() + time.sleep(0.01) + +class DistUpgradeVteTerminal(object): + def __init__(self, parent, term): + self.term = term + self.parent = parent + def call(self, cmd, hidden=False): + def wait_for_child(widget): + #print "wait for child finished" + self.finished=True + self.term.show() + self.term.connect("child-exited", wait_for_child) + self.parent.expander_terminal.set_sensitive(True) + if hidden==False: + self.parent.expander_terminal.set_expanded(True) + self.finished = False + (success, pid) = self.term.fork_command_full(Vte.PtyFlags.DEFAULT, + "/", + cmd, + None, + 0, # GLib.SpawnFlags + None, # child_setup + None, # child_setup_data + ) + if not success or pid < 0: + # error + return + while not self.finished: + while Gtk.events_pending(): + Gtk.main_iteration() + time.sleep(0.1) + del self.finished + +class HtmlView(object): + def __init__(self, webkit_view): + self._webkit_view = webkit_view + def open(self, url): + if not self._webkit_view: + return + self._webkit_view.open(url) + self._webkit_view.connect("load-finished", self._on_load_finished) + def show(self): + self._webkit_view.show() + def hide(self): + self._webkit_view.hide() + def _on_load_finished(self, view, frame): + view.show() + +class DistUpgradeViewGtk3(DistUpgradeView,SimpleGtkbuilderApp): + " gtk frontend of the distUpgrade tool " + def __init__(self, datadir=None, logdir=None): + DistUpgradeView.__init__(self) + self.logdir = logdir + if not datadir: + localedir=os.path.join(os.getcwd(),"mo") + gladedir=os.getcwd() + else: + localedir="/usr/share/locale/" + gladedir=os.path.join(datadir, "gtkbuilder") + + # check if we have a display etc + Gtk.init_check(sys.argv) + + try: + locale.bindtextdomain("update-manager",localedir) + gettext.textdomain("update-manager") + except Exception, e: + logging.warning("Error setting locales (%s)" % e) + + SimpleGtkbuilderApp.__init__(self, + gladedir+"/DistUpgrade.ui", + "update-manager") + + icons = Gtk.IconTheme.get_default() + try: + self.window_main.set_default_icon(icons.load_icon("system-software-update", 32, 0)) + except GObject.GError, e: + logging.debug("error setting default icon, ignoring (%s)" % e) + pass + + # terminal stuff + self.create_terminal() + + self.prev_step = 0 # keep a record of the latest step + # we don't use this currently + #self.window_main.set_keep_above(True) + self.icontheme = Gtk.IconTheme.get_default() + try: + from gi.repository import WebKit + self._webkit_view = WebKit.WebView() + self.vbox_main.pack_end(self._webkit_view, True, True, 0) + except: + logging.exception("html widget") + self._webkit_view = None + self.window_main.realize() + self.window_main.get_window().set_functions(Gdk.WMFunction.MOVE) + self._opCacheProgress = GtkOpProgress(self.progressbar_cache) + self._fetchProgress = GtkFetchProgressAdapter(self) + self._cdromProgress = GtkCdromProgressAdapter(self) + self._installProgress = GtkInstallProgressAdapter(self) + # details dialog + self.details_list = Gtk.TreeStore(GObject.TYPE_STRING) + column = Gtk.TreeViewColumn("") + render = Gtk.CellRendererText() + column.pack_start(render, True) + column.add_attribute(render, "markup", 0) + self.treeview_details.append_column(column) + self.details_list.set_sort_column_id(0, Gtk.SortType.ASCENDING) + self.treeview_details.set_model(self.details_list) + # FIXME: portme + # Use italic style in the status labels + #attrlist=Pango.AttrList() + #attr = Pango.AttrStyle(Pango.Style.ITALIC, 0, -1) + #attr = Pango.AttrScale(Pango.SCALE_SMALL, 0, -1) + #attrlist.insert(attr) + #self.label_status.set_property("attributes", attrlist) + # reasonable fault handler + sys.excepthook = self._handleException + + def _handleException(self, type, value, tb): + # we handle the exception here, hand it to apport and run the + # apport gui manually after it because we kill u-m during the upgrade + # to prevent it from poping up for reboot notifications or FF restart + # notifications or somesuch + import traceback + lines = traceback.format_exception(type, value, tb) + logging.error("not handled expection:\n%s" % "\n".join(lines)) + # we can't be sure that apport will run in the middle of a upgrade + # so we still show a error message here + apport_crash(type, value, tb) + if not run_apport(): + self.error(_("A fatal error occurred"), + _("Please report this as a bug (if you haven't already) and include the " + "files /var/log/dist-upgrade/main.log and " + "/var/log/dist-upgrade/apt.log " + "in your report. The upgrade has aborted.\n" + "Your original sources.list was saved in " + "/etc/apt/sources.list.distUpgrade."), + "\n".join(lines)) + sys.exit(1) + + def getTerminal(self): + return DistUpgradeVteTerminal(self, self._term) + def getHtmlView(self): + return HtmlView(self._webkit_view) + + def _key_press_handler(self, widget, keyev): + # user pressed ctrl-c + if len(keyev.string) == 1 and ord(keyev.string) == 3: + summary = _("Ctrl-c pressed") + msg = _("This will abort the operation and may leave the system " + "in a broken state. Are you sure you want to do that?") + res = self.askYesNoQuestion(summary, msg) + logging.warning("ctrl-c press detected, user decided to pass it " + "on: %s", res) + return not res + return False + + def create_terminal(self): + " helper to create a vte terminal " + self._term = Vte.Terminal() + self._term.connect("key-press-event", self._key_press_handler) + self._term.set_font_from_string("monospace 10") + self._terminal_lines = [] + self.hbox_custom.pack_start(self._term, True, True, 0) + self._term.realize() + self.vscrollbar_terminal = Gtk.VScrollbar() + self.vscrollbar_terminal.show() + self.hbox_custom.pack_start(self.vscrollbar_terminal, True, True, 0) + self.vscrollbar_terminal.set_adjustment(self._term.get_vadjustment()) + + try: + self._terminal_log = open(os.path.join(self.logdir,"term.log"),"w") + except Exception: + # if something goes wrong (permission denied etc), use stdout + self._terminal_log = sys.stdout + return self._term + + def getFetchProgress(self): + return self._fetchProgress + def getInstallProgress(self, cache): + self._installProgress._cache = cache + return self._installProgress + def getOpCacheProgress(self): + return self._opCacheProgress + def getCdromProgress(self): + return self._cdromProgress + def updateStatus(self, msg): + self.label_status.set_text("%s" % msg) + def hideStep(self, step): + image = getattr(self,"image_step%i" % step) + label = getattr(self,"label_step%i" % step) + #arrow = getattr(self,"arrow_step%i" % step) + image.hide() + label.hide() + def showStep(self, step): + image = getattr(self,"image_step%i" % step) + label = getattr(self,"label_step%i" % step) + image.show() + label.show() + def abort(self): + size = Gtk.IconSize.MENU + step = self.prev_step + if step > 0: + image = getattr(self,"image_step%i" % step) + arrow = getattr(self,"arrow_step%i" % step) + image.set_from_stock(Gtk.STOCK_CANCEL, size) + image.show() + arrow.hide() + def setStep(self, step): + if self.icontheme.rescan_if_needed(): + logging.debug("icon theme changed, re-reading") + # first update the "previous" step as completed + size = Gtk.IconSize.MENU + attrlist=Pango.AttrList() + if self.prev_step: + image = getattr(self,"image_step%i" % self.prev_step) + label = getattr(self,"label_step%i" % self.prev_step) + arrow = getattr(self,"arrow_step%i" % self.prev_step) + label.set_property("attributes",attrlist) + image.set_from_stock(Gtk.STOCK_APPLY, size) + image.show() + arrow.hide() + self.prev_step = step + # show the an arrow for the current step and make the label bold + image = getattr(self,"image_step%i" % step) + label = getattr(self,"label_step%i" % step) + arrow = getattr(self,"arrow_step%i" % step) + # check if that step was not hidden with hideStep() + if not label.get_property("visible"): + return + arrow.show() + image.hide() + # FIXME: portme + #attr = Pango.AttrWeight(Pango.Weight.BOLD, 0, -1) + #attrlist.insert(attr) + #label.set_property("attributes",attrlist) + + def information(self, summary, msg, extended_msg=None): + self.dialog_information.set_title("") + self.dialog_information.set_transient_for(self.window_main) + msg = "%s\n\n%s" % (summary,msg) + self.label_information.set_markup(msg) + if extended_msg != None: + buffer = self.textview_information.get_buffer() + buffer.set_text(extended_msg) + self.scroll_information.show() + else: + self.scroll_information.hide() + self.dialog_information.realize() + self.dialog_information.get_window().set_functions(Gdk.WMFunction.MOVE) + self.dialog_information.run() + self.dialog_information.hide() + while Gtk.events_pending(): + Gtk.main_iteration() + + def error(self, summary, msg, extended_msg=None): + self.dialog_error.set_title("") + self.dialog_error.set_transient_for(self.window_main) + #self.expander_terminal.set_expanded(True) + msg="%s\n\n%s" % (summary, msg) + self.label_error.set_markup(msg) + if extended_msg != None: + buffer = self.textview_error.get_buffer() + buffer.set_text(extended_msg) + self.scroll_error.show() + else: + self.scroll_error.hide() + self.dialog_error.realize() + self.dialog_error.get_window().set_functions(Gdk.WMFunction.MOVE) + self.dialog_error.run() + self.dialog_error.hide() + return False + + def confirmChanges(self, summary, changes, demotions, downloadSize, + actions=None, removal_bold=True): + # FIXME: add a whitelist here for packages that we expect to be + # removed (how to calc this automatically?) + if not DistUpgradeView.confirmChanges(self, summary, changes, + demotions, downloadSize): + return False + # append warning + self.confirmChangesMessage += "\n\n%s" % \ + _("To prevent data loss close all open " + "applications and documents.") + + if actions != None: + self.button_cancel_changes.set_use_stock(False) + self.button_cancel_changes.set_use_underline(True) + self.button_cancel_changes.set_label(actions[0]) + self.button_confirm_changes.set_label(actions[1]) + + self.label_summary.set_markup("%s" % summary) + self.label_changes.set_markup(self.confirmChangesMessage) + # fill in the details + self.details_list.clear() + for (parent_text, details_list) in ( + ( _("No longer supported by Canonical (%s)"), self.demotions), + ( _("Downgrade (%s)"), self.toDowngrade), + ( _("Remove (%s)"), self.toRemove), + ( _("No longer needed (%s)"), self.toRemoveAuto), + ( _("Install (%s)"), self.toInstall), + ( _("Upgrade (%s)"), self.toUpgrade), + ): + if details_list: + node = self.details_list.append(None, + [parent_text % len(details_list)]) + for pkg in details_list: + self.details_list.append(node, ["%s - %s" % ( + pkg.name, GLib.markup_escape_text(pkg.summary))]) + # prepare dialog + self.dialog_changes.realize() + self.dialog_changes.set_transient_for(self.window_main) + self.dialog_changes.set_title("") + self.dialog_changes.get_window().set_functions(Gdk.WMFunction.MOVE| + Gdk.WMFunction.RESIZE) + res = self.dialog_changes.run() + self.dialog_changes.hide() + if res == Gtk.ResponseType.YES: + return True + return False + + def askYesNoQuestion(self, summary, msg, default='No'): + msg = "%s\n\n%s" % (summary,msg) + dialog = Gtk.MessageDialog(parent=self.window_main, + flags=Gtk.DialogFlags.MODAL, + type=Gtk.MessageType.QUESTION, + buttons=Gtk.ButtonsType.YES_NO) + dialog.set_title("") + if default == 'No': + dialog.set_default_response(Gtk.ResponseType.NO) + else: + dialog.set_default_response(Gtk.ResponseType.YES) + dialog.set_markup(msg) + res = dialog.run() + dialog.destroy() + if res == Gtk.ResponseType.YES: + return True + return False + + def confirmRestart(self): + self.dialog_restart.set_transient_for(self.window_main) + self.dialog_restart.set_title("") + self.dialog_restart.realize() + self.dialog_restart.get_window().set_functions(Gdk.WMFunction.MOVE) + res = self.dialog_restart.run() + self.dialog_restart.hide() + if res == Gtk.ResponseType.YES: + return True + return False + + def processEvents(self): + while Gtk.events_pending(): + Gtk.main_iteration() + + def pulseProgress(self, finished=False): + self.progressbar_cache.pulse() + if finished: + self.progressbar_cache.set_fraction(1.0) + + def on_window_main_delete_event(self, widget, event): + self.dialog_cancel.set_transient_for(self.window_main) + self.dialog_cancel.set_title("") + self.dialog_cancel.realize() + self.dialog_cancel.get_window().set_functions(Gdk.WMFunction.MOVE) + res = self.dialog_cancel.run() + self.dialog_cancel.hide() + if res == Gtk.ResponseType.CANCEL: + sys.exit(1) + return True + +if __name__ == "__main__": + + view = DistUpgradeViewGtk3() + fp = GtkFetchProgressAdapter(view) + ip = GtkInstallProgressAdapter(view) + + view.getTerminal().call(["/usr/bin/dpkg","--configure","-a"]) + Gtk.main() + sys.exit(0) + + cache = apt.Cache() + for pkg in sys.argv[1:]: + if cache[pkg].is_installed: + cache[pkg].mark_delete() + else: + cache[pkg].mark_install() + cache.commit(fp,ip) + Gtk.main() + + #sys.exit(0) + ip.conffile("TODO","TODO~") + view.getTerminal().call(["/usr/bin/dpkg","--configure","-a"]) + #view.getTerminal().call(["ls","-R","/usr"]) + view.error("short","long", + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + ) + view.confirmChanges("xx",[], 100) diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeViewGtk.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeViewGtk.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeViewGtk.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeViewGtk.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,748 @@ +# DistUpgradeViewGtk.py +# +# Copyright (c) 2004-2006 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import pygtk +pygtk.require('2.0') +import glib +import gtk +import gtk.gdk +import vte +import gobject +import pango +import sys +import locale +import logging +import time +import subprocess + +import apt +import apt_pkg +import os + +from DistUpgradeApport import run_apport, apport_crash + +from DistUpgradeView import DistUpgradeView, FuzzyTimeToStr, InstallProgress, FetchProgress +from SimpleGtkbuilderApp import SimpleGtkbuilderApp + +import gettext +from DistUpgradeGettext import gettext as _ + +gobject.threads_init() + +def utf8(str): + return unicode(str, 'latin1').encode('utf-8') + +class GtkCdromProgressAdapter(apt.progress.CdromProgress): + """ Report the cdrom add progress + Subclass this class to implement cdrom add progress reporting + """ + def __init__(self, parent): + self.status = parent.label_status + self.progress = parent.progressbar_cache + self.parent = parent + def update(self, text, step): + """ update is called regularly so that the gui can be redrawn """ + if text: + self.status.set_text(text) + self.progress.set_fraction(step/float(self.totalSteps)) + while gtk.events_pending(): + gtk.main_iteration() + def askCdromName(self): + return (False, "") + def changeCdrom(self): + return False + +class GtkOpProgress(apt.progress.base.OpProgress): + def __init__(self, progressbar): + self.progressbar = progressbar + #self.progressbar.set_pulse_step(0.01) + #self.progressbar.pulse() + self.fraction = 0.0 + + def update(self, percent): + #if percent > 99: + # self.progressbar.set_fraction(1) + #else: + # self.progressbar.pulse() + new_fraction = percent/100.0 + if abs(self.fraction-new_fraction) > 0.1: + self.fraction = new_fraction + self.progressbar.set_fraction(self.fraction) + while gtk.events_pending(): + gtk.main_iteration() + + def done(self): + self.progressbar.set_text(" ") + + +class GtkFetchProgressAdapter(FetchProgress): + # FIXME: we really should have some sort of "we are at step" + # xy in the gui + # FIXME2: we need to thing about mediaCheck here too + def __init__(self, parent): + super(GtkFetchProgressAdapter, self).__init__() + # if this is set to false the download will cancel + self.status = parent.label_status + self.progress = parent.progressbar_cache + self.parent = parent + self.canceled = False + self.button_cancel = parent.button_fetch_cancel + self.button_cancel.connect('clicked', self.cancelClicked) + def cancelClicked(self, widget): + logging.debug("cancelClicked") + self.canceled = True + def media_change(self, medium, drive): + #print "mediaChange %s %s" % (medium, drive) + msg = _("Please insert '%s' into the drive '%s'") % (medium,drive) + dialog = gtk.MessageDialog(parent=self.parent.window_main, + flags=gtk.DIALOG_MODAL, + type=gtk.MESSAGE_QUESTION, + buttons=gtk.BUTTONS_OK_CANCEL) + dialog.set_markup(msg) + res = dialog.run() + dialog.set_title("") + dialog.destroy() + if res == gtk.RESPONSE_OK: + return True + return False + def start(self): + #logging.debug("start") + super(GtkFetchProgressAdapter, self).start() + self.progress.set_fraction(0) + self.status.show() + self.button_cancel.show() + def stop(self): + #logging.debug("stop") + self.progress.set_text(" ") + self.status.set_text(_("Fetching is complete")) + self.button_cancel.hide() + def pulse(self, owner): + super(GtkFetchProgressAdapter, self).pulse(owner) + # only update if there is a noticable change + if abs(self.percent-self.progress.get_fraction()*100.0) > 0.1: + self.progress.set_fraction(self.percent/100.0) + currentItem = self.current_items + 1 + if currentItem > self.total_items: + currentItem = self.total_items + if self.current_cps > 0: + self.status.set_text(_("Fetching file %li of %li at %sB/s") % ( + currentItem, self.total_items, + apt_pkg.size_to_str(self.current_cps))) + self.progress.set_text(_("About %s remaining") % FuzzyTimeToStr( + self.eta)) + else: + self.status.set_text(_("Fetching file %li of %li") % ( + currentItem, self.total_items)) + self.progress.set_text(" ") + while gtk.events_pending(): + gtk.main_iteration() + return (not self.canceled) + +class GtkInstallProgressAdapter(InstallProgress): + # timeout with no status change when the terminal is expanded + # automatically + TIMEOUT_TERMINAL_ACTIVITY = 240 + + def __init__(self,parent): + InstallProgress.__init__(self) + self._cache = None + self.label_status = parent.label_status + self.progress = parent.progressbar_cache + self.expander = parent.expander_terminal + self.term = parent._term + self.term.connect("child-exited", self.child_exited) + self.parent = parent + # setup the child waiting + # some options for dpkg to make it die less easily + apt_pkg.Config.set("DPkg::StopOnError","False") + + def start_update(self): + InstallProgress.start_update(self) + self.finished = False + # FIXME: add support for the timeout + # of the terminal (to display something useful then) + # -> longer term, move this code into python-apt + self.label_status.set_text(_("Applying changes")) + self.progress.set_fraction(0.0) + self.progress.set_text(" ") + self.expander.set_sensitive(True) + self.term.show() + # if no libgtk2-perl is installed show the terminal + frontend= os.environ.get("DEBIAN_FRONTEND") or "gnome" + if frontend == "gnome" and self._cache: + if (not "libgtk2-perl" in self._cache or + not self._cache["libgtk2-perl"].is_installed): + frontend = "dialog" + self.expander.set_expanded(True) + self.env = ["VTE_PTY_KEEP_FD=%s"% self.writefd, + "APT_LISTCHANGES_FRONTEND=none"] + if not os.environ.has_key("DEBIAN_FRONTEND"): + self.env.append("DEBIAN_FRONTEND=%s" % frontend) + # do a bit of time-keeping + self.start_time = 0.0 + self.time_ui = 0.0 + self.last_activity = 0.0 + + def error(self, pkg, errormsg): + InstallProgress.error(self, pkg, errormsg) + logging.error("got an error from dpkg for pkg: '%s': '%s'" % (pkg, errormsg)) + # we do not report followup errors from earlier failures + if gettext.dgettext('dpkg', "dependency problems - leaving unconfigured") in errormsg: + return False + + #self.expander_terminal.set_expanded(True) + self.parent.dialog_error.set_transient_for(self.parent.window_main) + summary = _("Could not install '%s'") % pkg + msg = _("The upgrade will continue but the '%s' package may not " + "be in a working state. Please consider submitting a " + "bug report about it.") % pkg + markup="%s\n\n%s" % (summary, msg) + self.parent.dialog_error.realize() + self.parent.dialog_error.set_title("") + self.parent.dialog_error.window.set_functions(gtk.gdk.FUNC_MOVE) + self.parent.label_error.set_markup(markup) + self.parent.textview_error.get_buffer().set_text(utf8(errormsg)) + self.parent.scroll_error.show() + self.parent.dialog_error.run() + self.parent.dialog_error.hide() + + def conffile(self, current, new): + logging.debug("got a conffile-prompt from dpkg for file: '%s'" % current) + start = time.time() + #self.expander.set_expanded(True) + prim = _("Replace the customized configuration file\n'%s'?") % current + sec = _("You will lose any changes you have made to this " + "configuration file if you choose to replace it with " + "a newer version.") + markup = "%s \n\n%s" % (prim, sec) + self.parent.label_conffile.set_markup(markup) + self.parent.dialog_conffile.set_title("") + self.parent.dialog_conffile.set_transient_for(self.parent.window_main) + + # workaround silly dpkg + if not os.path.exists(current): + current = current+".dpkg-dist" + + # now get the diff + if os.path.exists("/usr/bin/diff"): + cmd = ["/usr/bin/diff", "-u", current, new] + diff = utf8(subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0]) + self.parent.textview_conffile.get_buffer().set_text(diff) + else: + self.parent.textview_conffile.get_buffer().set_text(_("The 'diff' command was not found")) + res = self.parent.dialog_conffile.run() + self.parent.dialog_conffile.hide() + self.time_ui += time.time() - start + # if replace, send this to the terminal + if res == gtk.RESPONSE_YES: + self.term.feed_child("y\n", -1) + else: + self.term.feed_child("n\n", -1) + + def fork(self): + pid = self.term.forkpty(envv=self.env) + if pid == 0: + # WORKAROUND for broken feisty vte where envv does not work) + for env in self.env: + (key, value) = env.split("=") + os.environ[key] = value + # force dpkg terminal messages untranslated for better bug + # duplication detection + os.environ["DPKG_UNTRANSLATED_MESSAGES"] = "1" + # HACK to work around bug in python/vte and unregister the logging + # atexit func in the child + sys.exitfunc = lambda: True + return pid + + def status_change(self, pkg, percent, status): + # start the timer when the first package changes its status + if self.start_time == 0.0: + #print "setting start time to %s" % self.start_time + self.start_time = time.time() + # only update if there is a noticable change + if abs(percent-self.progress.get_fraction()*100.0) > 0.1: + self.progress.set_fraction(float(percent)/100.0) + self.label_status.set_text(status.strip()) + # start showing when we gathered some data + if percent > 1.0: + self.last_activity = time.time() + self.activity_timeout_reported = False + delta = self.last_activity - self.start_time + # time wasted in conffile questions (or other ui activity) + delta -= self.time_ui + time_per_percent = (float(delta)/percent) + eta = (100.0 - percent) * time_per_percent + # only show if we have some sensible data (60sec < eta < 2days) + if eta > 61.0 and eta < (60*60*24*2): + self.progress.set_text(_("About %s remaining") % FuzzyTimeToStr(eta)) + else: + self.progress.set_text(" ") + # 2 == WEBKIT_LOAD_FINISHED - the enums is not exposed via python + if (self.parent._webkit_view and + self.parent._webkit_view.get_property("load-status") == 2): + self.parent._webkit_view.execute_script('progress("%s")' % percent) + + def child_exited(self, term): + # we need to capture the full status here (not only the WEXITSTATUS) + self.apt_status = term.get_child_exit_status() + self.finished = True + + def wait_child(self): + while not self.finished: + self.update_interface() + return self.apt_status + + def finish_update(self): + self.label_status.set_text("") + + def update_interface(self): + InstallProgress.update_interface(self) + # check if we haven't started yet with packages, pulse then + if self.start_time == 0.0: + self.progress.pulse() + time.sleep(0.2) + # check about terminal activity + if self.last_activity > 0 and \ + (self.last_activity + self.TIMEOUT_TERMINAL_ACTIVITY) < time.time(): + if not self.activity_timeout_reported: + logging.warning("no activity on terminal for %s seconds (%s)" % (self.TIMEOUT_TERMINAL_ACTIVITY, self.label_status.get_text())) + self.activity_timeout_reported = True + self.parent.expander_terminal.set_expanded(True) + # process events + while gtk.events_pending(): + gtk.main_iteration() + time.sleep(0.01) + +class DistUpgradeVteTerminal(object): + def __init__(self, parent, term): + self.term = term + self.parent = parent + def call(self, cmd, hidden=False): + def wait_for_child(widget): + #print "wait for child finished" + self.finished=True + self.term.show() + self.term.connect("child-exited", wait_for_child) + self.parent.expander_terminal.set_sensitive(True) + if hidden==False: + self.parent.expander_terminal.set_expanded(True) + self.finished = False + pid = self.term.fork_command(command=cmd[0],argv=cmd) + if pid < 0: + # error + return + while not self.finished: + while gtk.events_pending(): + gtk.main_iteration() + time.sleep(0.1) + del self.finished + +class HtmlView(object): + def __init__(self, webkit_view): + self._webkit_view = webkit_view + def open(self, url): + if not self._webkit_view: + return + self._webkit_view.open(url) + self._webkit_view.connect("load-finished", self._on_load_finished) + def show(self): + self._webkit_view.show() + def hide(self): + self._webkit_view.hide() + def _on_load_finished(self, view, frame): + view.show() + +class DistUpgradeViewGtk(DistUpgradeView,SimpleGtkbuilderApp): + " gtk frontend of the distUpgrade tool " + def __init__(self, datadir=None, logdir=None): + DistUpgradeView.__init__(self) + self.logdir = logdir + if not datadir: + localedir=os.path.join(os.getcwd(),"mo") + gladedir=os.getcwd() + else: + localedir="/usr/share/locale/" + gladedir=os.path.join(datadir, "gtkbuilder") + + # check if we have a display etc + gtk.init_check() + + try: + locale.bindtextdomain("update-manager",localedir) + gettext.textdomain("update-manager") + except Exception, e: + logging.warning("Error setting locales (%s)" % e) + + icons = gtk.icon_theme_get_default() + try: + gtk.window_set_default_icon(icons.load_icon("system-software-update", 32, 0)) + except gobject.GError, e: + logging.debug("error setting default icon, ignoring (%s)" % e) + pass + SimpleGtkbuilderApp.__init__(self, + gladedir+"/DistUpgrade.ui", + "update-manager") + # terminal stuff + self.create_terminal() + + self.prev_step = 0 # keep a record of the latest step + # we don't use this currently + #self.window_main.set_keep_above(True) + self.icontheme = gtk.icon_theme_get_default() + # we keep a reference pngloader around so that its in memory + # -> this avoid the issue that during the dapper->edgy upgrade + # the loaders move from /usr/lib/gtk/2.4.0/loaders to 2.10.0 + self.pngloader = gtk.gdk.PixbufLoader("png") + try: + self.svgloader = gtk.gdk.PixbufLoader("svg") + self.svgloader.close() + except gobject.GError, e: + logging.debug("svg pixbuf loader failed (%s)" % e) + pass + try: + import webkit + self._webkit_view = webkit.WebView() + self.vbox_main.pack_end(self._webkit_view) + except: + logging.exception("html widget") + self._webkit_view = None + self.window_main.realize() + self.window_main.window.set_functions(gtk.gdk.FUNC_MOVE) + self._opCacheProgress = GtkOpProgress(self.progressbar_cache) + self._fetchProgress = GtkFetchProgressAdapter(self) + self._cdromProgress = GtkCdromProgressAdapter(self) + self._installProgress = GtkInstallProgressAdapter(self) + # details dialog + self.details_list = gtk.TreeStore(gobject.TYPE_STRING) + column = gtk.TreeViewColumn("") + render = gtk.CellRendererText() + column.pack_start(render, True) + column.add_attribute(render, "markup", 0) + self.treeview_details.append_column(column) + self.details_list.set_sort_column_id(0, gtk.SORT_ASCENDING) + self.treeview_details.set_model(self.details_list) + # Use italic style in the status labels + attrlist=pango.AttrList() + #attr = pango.AttrStyle(pango.STYLE_ITALIC, 0, -1) + attr = pango.AttrScale(pango.SCALE_SMALL, 0, -1) + attrlist.insert(attr) + self.label_status.set_property("attributes", attrlist) + # reasonable fault handler + sys.excepthook = self._handleException + + def _handleException(self, type, value, tb): + # we handle the exception here, hand it to apport and run the + # apport gui manually after it because we kill u-m during the upgrade + # to prevent it from poping up for reboot notifications or FF restart + # notifications or somesuch + import traceback + lines = traceback.format_exception(type, value, tb) + logging.error("not handled expection:\n%s" % "\n".join(lines)) + # we can't be sure that apport will run in the middle of a upgrade + # so we still show a error message here + apport_crash(type, value, tb) + if not run_apport(): + self.error(_("A fatal error occurred"), + _("Please report this as a bug (if you haven't already) and include the " + "files /var/log/dist-upgrade/main.log and " + "/var/log/dist-upgrade/apt.log " + "in your report. The upgrade has aborted.\n" + "Your original sources.list was saved in " + "/etc/apt/sources.list.distUpgrade."), + "\n".join(lines)) + sys.exit(1) + + def getTerminal(self): + return DistUpgradeVteTerminal(self, self._term) + def getHtmlView(self): + return HtmlView(self._webkit_view) + + def _key_press_handler(self, widget, keyev): + # user pressed ctrl-c + if len(keyev.string) == 1 and ord(keyev.string) == 3: + summary = _("Ctrl-c pressed") + msg = _("This will abort the operation and may leave the system " + "in a broken state. Are you sure you want to do that?") + res = self.askYesNoQuestion(summary, msg) + logging.warning("ctrl-c press detected, user decided to pass it " + "on: %s", res) + return not res + return False + + def create_terminal(self): + " helper to create a vte terminal " + self._term = vte.Terminal() + self._term.connect("key-press-event", self._key_press_handler) + self._term.set_font_from_string("monospace 10") + self._term.connect("contents-changed", self._term_content_changed) + self._terminal_lines = [] + self.hbox_custom.pack_start(self._term) + self._term.realize() + self.vscrollbar_terminal = gtk.VScrollbar() + self.vscrollbar_terminal.show() + self.hbox_custom.pack_start(self.vscrollbar_terminal) + self.vscrollbar_terminal.set_adjustment(self._term.get_adjustment()) + try: + self._terminal_log = open(os.path.join(self.logdir,"term.log"),"w") + except Exception: + # if something goes wrong (permission denied etc), use stdout + self._terminal_log = sys.stdout + return self._term + + def _term_content_changed(self, term): + " called when the *visible* part of the terminal changes " + # get the current visible text, + current_text = self._term.get_text(lambda a,b,c,d: True) + # see what we have currently and only print stuff that wasn't + # visible last time + new_lines = [] + for line in current_text.split("\n"): + new_lines.append(line) + if not line in self._terminal_lines: + self._terminal_log.write(line+"\n") + try: + self._terminal_log.flush() + except IOError: + logging.exception("flush()") + self._terminal_lines = new_lines + def getFetchProgress(self): + return self._fetchProgress + def getInstallProgress(self, cache): + self._installProgress._cache = cache + return self._installProgress + def getOpCacheProgress(self): + return self._opCacheProgress + def getCdromProgress(self): + return self._cdromProgress + def updateStatus(self, msg): + self.label_status.set_text("%s" % msg) + def hideStep(self, step): + image = getattr(self,"image_step%i" % step) + label = getattr(self,"label_step%i" % step) + #arrow = getattr(self,"arrow_step%i" % step) + image.hide() + label.hide() + def showStep(self, step): + image = getattr(self,"image_step%i" % step) + label = getattr(self,"label_step%i" % step) + image.show() + label.show() + def abort(self): + size = gtk.ICON_SIZE_MENU + step = self.prev_step + if step > 0: + image = getattr(self,"image_step%i" % step) + arrow = getattr(self,"arrow_step%i" % step) + image.set_from_stock(gtk.STOCK_CANCEL, size) + image.show() + arrow.hide() + def setStep(self, step): + if self.icontheme.rescan_if_needed(): + logging.debug("icon theme changed, re-reading") + # first update the "previous" step as completed + size = gtk.ICON_SIZE_MENU + attrlist=pango.AttrList() + if self.prev_step: + image = getattr(self,"image_step%i" % self.prev_step) + label = getattr(self,"label_step%i" % self.prev_step) + arrow = getattr(self,"arrow_step%i" % self.prev_step) + label.set_property("attributes",attrlist) + image.set_from_stock(gtk.STOCK_APPLY, size) + image.show() + arrow.hide() + self.prev_step = step + # show the an arrow for the current step and make the label bold + image = getattr(self,"image_step%i" % step) + label = getattr(self,"label_step%i" % step) + arrow = getattr(self,"arrow_step%i" % step) + # check if that step was not hidden with hideStep() + if not label.get_property("visible"): + return + arrow.show() + image.hide() + attr = pango.AttrWeight(pango.WEIGHT_BOLD, 0, -1) + attrlist.insert(attr) + label.set_property("attributes",attrlist) + + def information(self, summary, msg, extended_msg=None): + self.dialog_information.set_title("") + self.dialog_information.set_transient_for(self.window_main) + msg = "%s\n\n%s" % (summary,msg) + self.label_information.set_markup(msg) + if extended_msg != None: + buffer = self.textview_information.get_buffer() + buffer.set_text(extended_msg) + self.scroll_information.show() + else: + self.scroll_information.hide() + self.dialog_information.realize() + self.dialog_information.window.set_functions(gtk.gdk.FUNC_MOVE) + self.dialog_information.run() + self.dialog_information.hide() + while gtk.events_pending(): + gtk.main_iteration() + + def error(self, summary, msg, extended_msg=None): + self.dialog_error.set_title("") + self.dialog_error.set_transient_for(self.window_main) + #self.expander_terminal.set_expanded(True) + msg="%s\n\n%s" % (summary, msg) + self.label_error.set_markup(msg) + if extended_msg != None: + buffer = self.textview_error.get_buffer() + buffer.set_text(extended_msg) + self.scroll_error.show() + else: + self.scroll_error.hide() + self.dialog_error.realize() + self.dialog_error.window.set_functions(gtk.gdk.FUNC_MOVE) + self.dialog_error.run() + self.dialog_error.hide() + return False + + def confirmChanges(self, summary, changes, demotions, downloadSize, + actions=None, removal_bold=True): + # FIXME: add a whitelist here for packages that we expect to be + # removed (how to calc this automatically?) + if not DistUpgradeView.confirmChanges(self, summary, changes, + demotions, downloadSize): + return False + # append warning + self.confirmChangesMessage += "\n\n%s" % \ + _("To prevent data loss close all open " + "applications and documents.") + + if actions != None: + self.button_cancel_changes.set_use_stock(False) + self.button_cancel_changes.set_use_underline(True) + self.button_cancel_changes.set_label(actions[0]) + self.button_confirm_changes.set_label(actions[1]) + + self.label_summary.set_markup("%s" % summary) + self.label_changes.set_markup(self.confirmChangesMessage) + # fill in the details + self.details_list.clear() + for (parent_text, details_list) in ( + ( _("No longer supported by Canonical (%s)"), self.demotions), + ( _("Downgrade (%s)"), self.toDowngrade), + ( _("Remove (%s)"), self.toRemove), + ( _("No longer needed (%s)"), self.toRemoveAuto), + ( _("Install (%s)"), self.toInstall), + ( _("Upgrade (%s)"), self.toUpgrade), + ): + if details_list: + node = self.details_list.append(None, + [parent_text % len(details_list)]) + for pkg in details_list: + self.details_list.append(node, ["%s - %s" % ( + pkg.name, glib.markup_escape_text(pkg.summary))]) + # prepare dialog + self.dialog_changes.realize() + self.dialog_changes.set_transient_for(self.window_main) + self.dialog_changes.set_title("") + self.dialog_changes.window.set_functions(gtk.gdk.FUNC_MOVE| + gtk.gdk.FUNC_RESIZE) + res = self.dialog_changes.run() + self.dialog_changes.hide() + if res == gtk.RESPONSE_YES: + return True + return False + + def askYesNoQuestion(self, summary, msg, default='No'): + msg = "%s\n\n%s" % (summary,msg) + dialog = gtk.MessageDialog(parent=self.window_main, + flags=gtk.DIALOG_MODAL, + type=gtk.MESSAGE_QUESTION, + buttons=gtk.BUTTONS_YES_NO) + dialog.set_title("") + if default == 'No': + dialog.set_default_response(gtk.RESPONSE_NO) + else: + dialog.set_default_response(gtk.RESPONSE_YES) + dialog.set_markup(msg) + res = dialog.run() + dialog.destroy() + if res == gtk.RESPONSE_YES: + return True + return False + + def confirmRestart(self): + self.dialog_restart.set_transient_for(self.window_main) + self.dialog_restart.set_title("") + self.dialog_restart.realize() + self.dialog_restart.window.set_functions(gtk.gdk.FUNC_MOVE) + res = self.dialog_restart.run() + self.dialog_restart.hide() + if res == gtk.RESPONSE_YES: + return True + return False + + def processEvents(self): + while gtk.events_pending(): + gtk.main_iteration() + + def pulseProgress(self, finished=False): + self.progressbar_cache.pulse() + if finished: + self.progressbar_cache.set_fraction(1.0) + + def on_window_main_delete_event(self, widget, event): + self.dialog_cancel.set_transient_for(self.window_main) + self.dialog_cancel.set_title("") + self.dialog_cancel.realize() + self.dialog_cancel.window.set_functions(gtk.gdk.FUNC_MOVE) + res = self.dialog_cancel.run() + self.dialog_cancel.hide() + if res == gtk.RESPONSE_CANCEL: + sys.exit(1) + return True + +if __name__ == "__main__": + + view = DistUpgradeViewGtk() + fp = GtkFetchProgressAdapter(view) + ip = GtkInstallProgressAdapter(view) + + cache = apt.Cache() + for pkg in sys.argv[1:]: + if cache[pkg].is_installed: + cache[pkg].mark_delete() + else: + cache[pkg].mark_install() + cache.commit(fp,ip) + gtk.main() + sys.exit(0) + + #sys.exit(0) + ip.conffile("TODO","TODO~") + view.getTerminal().call(["dpkg","--configure","-a"]) + #view.getTerminal().call(["ls","-R","/usr"]) + view.error("short","long", + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + ) + view.confirmChanges("xx",[], 100) + diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeViewKDE.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeViewKDE.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeViewKDE.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeViewKDE.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,863 @@ +# DistUpgradeViewKDE.py +# +# Copyright (c) 2007 Canonical Ltd +# +# Author: Jonathan Riddell +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +from PyQt4.QtCore import QUrl, Qt, SIGNAL, QTimer +from PyQt4.QtGui import ( + QDesktopServices, QDialog, QPixmap, QTreeWidgetItem, QMessageBox, + QApplication, QTextEdit, QTextOption, QTextCursor, QPushButton, + QWidget, QIcon, QHBoxLayout, QLabel + ) +from PyQt4 import uic + +import sys +import logging +import time +import subprocess +import traceback +import tempfile + +import apt +import apt_pkg +import os +import shutil + +import pty + +from DistUpgradeApport import run_apport, apport_crash + +from DistUpgradeView import DistUpgradeView, FuzzyTimeToStr, InstallProgress, FetchProgress + +import select +import gettext +from DistUpgradeGettext import gettext as gett + +def _(str): + return unicode(gett(str), 'UTF-8') + +def utf8(str): + if isinstance(str, unicode): + return str + return unicode(str, 'UTF-8') + +def loadUi(file, parent): + if os.path.exists(file): + uic.loadUi(file, parent) + else: + #FIXME find file + print "error, can't find file: " + file + +class DumbTerminal(QTextEdit): + """ A very dumb terminal """ + def __init__(self, installProgress, parent_frame): + " really dumb terminal with simple editing support " + QTextEdit.__init__(self, "", parent_frame) + self.installProgress = installProgress + self.setFontFamily("Monospace") + self.setFontPointSize(8) + self.setWordWrapMode(QTextOption.NoWrap) + self.setUndoRedoEnabled(False) + self.setOverwriteMode(True) + self._block = False + #self.connect(self, SIGNAL("cursorPositionChanged()"), + # self.onCursorPositionChanged) + + def fork(self): + """pty voodoo""" + (self.child_pid, self.installProgress.master_fd) = pty.fork() + if self.child_pid == 0: + os.environ["TERM"] = "dumb" + return self.child_pid + + def update_interface(self): + (rlist, wlist, xlist) = select.select([self.installProgress.master_fd],[],[], 0) + if len(rlist) > 0: + line = os.read(self.installProgress.master_fd, 255) + self.insertWithTermCodes(utf8(line)) + QApplication.processEvents() + + def insertWithTermCodes(self, text): + """ support basic terminal codes """ + display_text = "" + for c in text: + # \b - backspace - this seems to comes as "^H" now ??! + if ord(c) == 8: + self.insertPlainText(display_text) + self.textCursor().deletePreviousChar() + display_text="" + # \r - is filtered out + elif c == chr(13): + pass + # \a - bell - ignore for now + elif c == chr(7): + pass + else: + display_text += c + self.insertPlainText(display_text) + + def keyPressEvent(self, ev): + """ send (ascii) key events to the pty """ + # no master_fd yet + if not hasattr(self.installProgress, "master_fd"): + return + # special handling for backspace + if ev.key() == Qt.Key_Backspace: + #print "sent backspace" + os.write(self.installProgress.master_fd, chr(8)) + return + # do nothing for events like "shift" + if not ev.text(): + return + # now sent the key event to the termianl as utf-8 + os.write(self.installProgress.master_fd, ev.text().toUtf8()) + + def onCursorPositionChanged(self): + """ helper that ensures that the cursor is always at the end """ + if self._block: + return + # block signals so that we do not run into a recursion + self._block = True + self.moveCursor(QTextCursor.End) + self._block = False + +class KDECdromProgressAdapter(apt.progress.CdromProgress): + """ Report the cdrom add progress """ + def __init__(self, parent): + self.status = parent.window_main.label_status + self.progressbar = parent.window_main.progressbar_cache + self.parent = parent + + def update(self, text, step): + """ update is called regularly so that the gui can be redrawn """ + if text: + self.status.setText(text) + self.progressbar.setValue(step/float(self.totalSteps)) + QApplication.processEvents() + + def askCdromName(self): + return (False, "") + + def changeCdrom(self): + return False + +class KDEOpProgress(apt.progress.base.OpProgress): + """ methods on the progress bar """ + def __init__(self, progressbar, progressbar_label): + self.progressbar = progressbar + self.progressbar_label = progressbar_label + #self.progressbar.set_pulse_step(0.01) + #self.progressbar.pulse() + + def update(self, percent): + #if percent > 99: + # self.progressbar.set_fraction(1) + #else: + # self.progressbar.pulse() + #self.progressbar.set_fraction(percent/100.0) + self.progressbar.setValue(percent) + QApplication.processEvents() + + def done(self): + self.progressbar_label.setText("") + +class KDEFetchProgressAdapter(FetchProgress): + """ methods for updating the progress bar while fetching packages """ + # FIXME: we really should have some sort of "we are at step" + # xy in the gui + # FIXME2: we need to thing about mediaCheck here too + def __init__(self, parent): + FetchProgress.__init__(self) + # if this is set to false the download will cancel + self.status = parent.window_main.label_status + self.progress = parent.window_main.progressbar_cache + self.parent = parent + + def media_change(self, medium, drive): + msg = _("Please insert '%s' into the drive '%s'") % (medium,drive) + change = QMessageBox.question(self.parent.window_main, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) + if change == QMessageBox.Ok: + return True + return False + + def start(self): + FetchProgress.start(self) + #self.progress.show() + self.progress.setValue(0) + self.status.show() + + def stop(self): + self.parent.window_main.progress_text.setText(" ") + self.status.setText(_("Fetching is complete")) + + def pulse(self, owner): + """ we don't have a mainloop in this application, we just call processEvents here and elsewhere""" + # FIXME: move the status_str and progress_str into python-apt + # (python-apt need i18n first for this) + FetchProgress.pulse(self, owner) + self.progress.setValue(self.percent) + current_item = self.current_items + 1 + if current_item > self.total_items: + current_item = self.total_items + + if self.current_cps > 0: + self.status.setText(_("Fetching file %li of %li at %sB/s") % (current_item, self.total_items, apt_pkg.size_to_str(self.current_cps))) + self.parent.window_main.progress_text.setText("" + _("About %s remaining") % unicode(FuzzyTimeToStr(self.eta), 'utf-8') + "") + else: + self.status.setText(_("Fetching file %li of %li") % (current_item, self.total_items)) + self.parent.window_main.progress_text.setText(" ") + + QApplication.processEvents() + return True + +class KDEInstallProgressAdapter(InstallProgress): + """methods for updating the progress bar while installing packages""" + # timeout with no status change when the terminal is expanded + # automatically + TIMEOUT_TERMINAL_ACTIVITY = 240 + + def __init__(self,parent): + InstallProgress.__init__(self) + self._cache = None + self.label_status = parent.window_main.label_status + self.progress = parent.window_main.progressbar_cache + self.progress_text = parent.window_main.progress_text + self.parent = parent + try: + self._terminal_log = open("/var/log/dist-upgrade/term.log","w") + except Exception, e: + # if something goes wrong (permission denied etc), use stdout + logging.error("Can not open terminal log: '%s'" % e) + self._terminal_log = sys.stdout + # some options for dpkg to make it die less easily + apt_pkg.config.set("DPkg::StopOnError","False") + + def start_update(self): + InstallProgress.start_update(self) + self.finished = False + # FIXME: add support for the timeout + # of the terminal (to display something useful then) + # -> longer term, move this code into python-apt + self.label_status.setText(_("Applying changes")) + self.progress.setValue(0) + self.progress_text.setText(" ") + # do a bit of time-keeping + self.start_time = 0.0 + self.time_ui = 0.0 + self.last_activity = 0.0 + self.parent.window_main.showTerminalButton.setEnabled(True) + + def error(self, pkg, errormsg): + InstallProgress.error(self, pkg, errormsg) + logging.error("got an error from dpkg for pkg: '%s': '%s'" % (pkg, errormsg)) + # we do not report followup errors from earlier failures + if gettext.dgettext('dpkg', "dependency problems - leaving unconfigured") in errormsg: + return False + summary = _("Could not install '%s'") % pkg + msg = _("The upgrade will continue but the '%s' package may not " + "be in a working state. Please consider submitting a " + "bug report about it.") % pkg + msg = "%s
%s" % (summary, msg) + + dialogue = QDialog(self.parent.window_main) + loadUi("dialog_error.ui", dialogue) + self.parent.translate_widget_children(dialogue) + dialogue.label_error.setText(utf8(msg)) + if errormsg != None: + dialogue.textview_error.setText(utf8(errormsg)) + dialogue.textview_error.show() + else: + dialogue.textview_error.hide() + dialogue.connect(dialogue.button_bugreport, SIGNAL("clicked()"), self.parent.reportBug) + dialogue.exec_() + + def conffile(self, current, new): + """ask question in case conffile has been changed by user""" + logging.debug("got a conffile-prompt from dpkg for file: '%s'" % current) + start = time.time() + prim = _("Replace the customized configuration file\n'%s'?") % current + sec = _("You will lose any changes you have made to this " + "configuration file if you choose to replace it with " + "a newer version.") + markup = "%s \n\n%s" % (prim, sec) + self.confDialogue = QDialog(self.parent.window_main) + loadUi("dialog_conffile.ui", self.confDialogue) + self.confDialogue.label_conffile.setText(markup) + self.confDialogue.textview_conffile.hide() + #FIXME, below to be tested + #self.confDialogue.resize(self.confDialogue.minimumSizeHint()) + self.confDialogue.connect(self.confDialogue.show_difference_button, SIGNAL("clicked()"), self.showConffile) + + # workaround silly dpkg + if not os.path.exists(current): + current = current+".dpkg-dist" + + # now get the diff + if os.path.exists("/usr/bin/diff"): + cmd = ["/usr/bin/diff", "-u", current, new] + diff = utf8(subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0]) + self.confDialogue.textview_conffile.setText(diff) + else: + self.confDialogue.textview_conffile.setText(_("The 'diff' command was not found")) + result = self.confDialogue.exec_() + self.time_ui += time.time() - start + # if replace, send this to the terminal + if result == QDialog.Accepted: + os.write(self.master_fd, "y\n") + else: + os.write(self.master_fd, "n\n") + + def showConffile(self): + if self.confDialogue.textview_conffile.isVisible(): + self.confDialogue.textview_conffile.hide() + self.confDialogue.show_difference_button.setText(_("Show Difference >>>")) + else: + self.confDialogue.textview_conffile.show() + self.confDialogue.show_difference_button.setText(_("<<< Hide Difference")) + + def fork(self): + """pty voodoo""" + (self.child_pid, self.master_fd) = pty.fork() + if self.child_pid == 0: + os.environ["TERM"] = "dumb" + if (not os.environ.has_key("DEBIAN_FRONTEND") or + os.environ["DEBIAN_FRONTEND"] == "kde"): + os.environ["DEBIAN_FRONTEND"] = "noninteractive" + os.environ["APT_LISTCHANGES_FRONTEND"] = "none" + logging.debug(" fork pid is: %s" % self.child_pid) + return self.child_pid + + def status_change(self, pkg, percent, status): + """update progress bar and label""" + # start the timer when the first package changes its status + if self.start_time == 0.0: + #print "setting start time to %s" % self.start_time + self.start_time = time.time() + self.progress.setValue(self.percent) + self.label_status.setText(unicode(status.strip(), 'UTF-8')) + # start showing when we gathered some data + if percent > 1.0: + self.last_activity = time.time() + self.activity_timeout_reported = False + delta = self.last_activity - self.start_time + # time wasted in conffile questions (or other ui activity) + delta -= self.time_ui + time_per_percent = (float(delta)/percent) + eta = (100.0 - self.percent) * time_per_percent + # only show if we have some sensible data (60sec < eta < 2days) + if eta > 61.0 and eta < (60*60*24*2): + self.progress_text.setText(_("About %s remaining") % FuzzyTimeToStr(eta)) + else: + self.progress_text.setText(" ") + + def finish_update(self): + self.label_status.setText("") + + def update_interface(self): + """ + no mainloop in this application, just call processEvents lots here + it's also important to sleep for a minimum amount of time + """ + # log the output of dpkg (on the master_fd) to the terminal log + while True: + try: + (rlist, wlist, xlist) = select.select([self.master_fd],[],[], 0) + if len(rlist) > 0: + line = os.read(self.master_fd, 255) + self._terminal_log.write(line) + self.parent.terminal_text.insertWithTermCodes(utf8(line)) + else: + break + except Exception, e: + print e + logging.debug("error reading from self.master_fd '%s'" % e) + break + + # now update the GUI + try: + InstallProgress.update_interface(self) + except ValueError, e: + logging.error("got ValueError from InstallProgress.update_interface. Line was '%s' (%s)" % (self.read, e)) + # reset self.read so that it can continue reading and does not loop + self.read = "" + # check about terminal activity + if self.last_activity > 0 and \ + (self.last_activity + self.TIMEOUT_TERMINAL_ACTIVITY) < time.time(): + if not self.activity_timeout_reported: + #FIXME bug 95465, I can't recreate this, so here's a hacky fix + try: + logging.warning("no activity on terminal for %s seconds (%s)" % (self.TIMEOUT_TERMINAL_ACTIVITY, self.label_status.text())) + except UnicodeEncodeError: + logging.warning("no activity on terminal for %s seconds" % (self.TIMEOUT_TERMINAL_ACTIVITY)) + self.activity_timeout_reported = True + self.parent.window_main.konsole_frame.show() + QApplication.processEvents() + time.sleep(0.02) + + def wait_child(self): + while True: + self.update_interface() + (pid, res) = os.waitpid(self.child_pid,os.WNOHANG) + if pid == self.child_pid: + break + # we need the full status here (not just WEXITSTATUS) + return res + +# inherit from the class created in window_main.ui +# to add the handler for closing the window +class UpgraderMainWindow(QWidget): + + def __init__(self): + QWidget.__init__(self) + #uic.loadUi("window_main.ui", self) + loadUi("window_main.ui", self) + + def setParent(self, parentRef): + self.parent = parentRef + + def closeEvent(self, event): + close = self.parent.on_window_main_delete_event() + if close: + event.accept() + else: + event.ignore() + +class DistUpgradeViewKDE(DistUpgradeView): + """KDE frontend of the distUpgrade tool""" + def __init__(self, datadir=None, logdir=None): + DistUpgradeView.__init__(self) + # silence the PyQt4 logger + logger = logging.getLogger("PyQt4") + logger.setLevel(logging.INFO) + if not datadir: + localedir=os.path.join(os.getcwd(),"mo") + else: + localedir="/usr/share/locale/update-manager" + + # FIXME: i18n must be somewhere relative do this dir + try: + gettext.bindtextdomain("update-manager", localedir) + gettext.textdomain("update-manager") + except Exception, e: + logging.warning("Error setting locales (%s)" % e) + + #about = KAboutData("adept_manager","Upgrader","0.1","Dist Upgrade Tool for Kubuntu",KAboutData.License_GPL,"(c) 2007 Canonical Ltd", + #"http://wiki.kubuntu.org/KubuntuUpdateManager", "jriddell@ubuntu.com") + #about.addAuthor("Jonathan Riddell", None,"jriddell@ubuntu.com") + #about.addAuthor("Michael Vogt", None,"michael.vogt@ubuntu.com") + #KCmdLineArgs.init(["./dist-upgrade.py"],about) + + # we test for DISPLAY here, QApplication does not throw a + # exception when run without DISPLAY but dies instead + if not "DISPLAY" in os.environ: + raise Exception, "No DISPLAY in os.environ found" + self.app = QApplication(["update-manager"]) + + if os.path.exists("/usr/share/icons/oxygen/48x48/apps/system-software-update.png"): + messageIcon = QPixmap("/usr/share/icons/oxygen/48x48/apps/system-software-update.png") + else: + messageIcon = QPixmap("/usr/share/icons/hicolor/48x48/apps/adept_manager.png") + self.app.setWindowIcon(QIcon(messageIcon)) + + self.window_main = UpgraderMainWindow() + self.window_main.setParent(self) + self.window_main.show() + + self.prev_step = 0 # keep a record of the latest step + + self._opCacheProgress = KDEOpProgress(self.window_main.progressbar_cache, self.window_main.progress_text) + self._fetchProgress = KDEFetchProgressAdapter(self) + self._cdromProgress = KDECdromProgressAdapter(self) + + self._installProgress = KDEInstallProgressAdapter(self) + + # reasonable fault handler + sys.excepthook = self._handleException + + self.window_main.showTerminalButton.setEnabled(False) + self.app.connect(self.window_main.showTerminalButton, SIGNAL("clicked()"), self.showTerminal) + + #kdesu requires us to copy the xauthority file before it removes it when Adept is killed + fd, copyXauth = tempfile.mkstemp("", "adept") + if 'XAUTHORITY' in os.environ and os.environ['XAUTHORITY'] != copyXauth: + shutil.copy(os.environ['XAUTHORITY'], copyXauth) + os.environ["XAUTHORITY"] = copyXauth + + # Note that with kdesudo this needs --nonewdcop + ## create a new DCOP-Client: + #client = DCOPClient() + ## connect the client to the local DCOP-server: + #client.attach() + + #for qcstring_app in client.registeredApplications(): + # app = str(qcstring_app) + # if app.startswith("adept"): + # adept = DCOPApp(qcstring_app, client) + # adeptInterface = adept.object("MainApplication-Interface") + # adeptInterface.quit() + + # This works just as well + subprocess.call(["killall", "adept_manager"]) + subprocess.call(["killall", "adept_updater"]) + + # init gettext + gettext.bindtextdomain("update-manager",localedir) + gettext.textdomain("update-manager") + self.translate_widget_children() + self.window_main.label_title.setText(self.window_main.label_title.text().replace("Ubuntu", "Kubuntu")) + + # setup terminal text in hidden by default spot + self.window_main.konsole_frame.hide() + self.konsole_frame_layout = QHBoxLayout(self.window_main.konsole_frame) + self.window_main.konsole_frame.setMinimumSize(600, 400) + self.terminal_text = DumbTerminal(self._installProgress, self.window_main.konsole_frame) + self.konsole_frame_layout.addWidget(self.terminal_text) + self.terminal_text.show() + + # for some reason we need to start the main loop to get everything displayed + # this app mostly works with processEvents but run main loop briefly to keep it happily displaying all widgets + QTimer.singleShot(10, self.exitMainLoop) + self.app.exec_() + + def exitMainLoop(self): + print "exitMainLoop" + self.app.exit() + + def translate_widget_children(self, parentWidget=None): + if parentWidget == None: + parentWidget = self.window_main + if isinstance(parentWidget, QDialog) or isinstance(parentWidget, QWidget): + if str(parentWidget.windowTitle()) == "Error": + parentWidget.setWindowTitle( gettext.dgettext("kdelibs", "Error")) + else: + parentWidget.setWindowTitle(_( str(parentWidget.windowTitle()) )) + + if parentWidget.children() != None: + for widget in parentWidget.children(): + self.translate_widget(widget) + self.translate_widget_children(widget) + + def translate_widget(self, widget): + if isinstance(widget, QLabel) or isinstance(widget, QPushButton): + if str(widget.text()) == "&Cancel": + widget.setText(unicode(gettext.dgettext("kdelibs", "&Cancel"), 'UTF-8')) + elif str(widget.text()) == "&Close": + widget.setText(unicode(gettext.dgettext("kdelibs", "&Close"), 'UTF-8')) + elif str(widget.text()) != "": + widget.setText( _(str(widget.text())).replace("_", "&") ) + + def _handleException(self, exctype, excvalue, exctb): + """Crash handler.""" + + if (issubclass(exctype, KeyboardInterrupt) or + issubclass(exctype, SystemExit)): + return + + # we handle the exception here, hand it to apport and run the + # apport gui manually after it because we kill u-m during the upgrade + # to prevent it from popping up for reboot notifications or FF restart + # notifications or somesuch + lines = traceback.format_exception(exctype, excvalue, exctb) + logging.error("not handled exception in KDE frontend:\n%s" % "\n".join(lines)) + # we can't be sure that apport will run in the middle of a upgrade + # so we still show a error message here + apport_crash(exctype, excvalue, exctb) + if not run_apport(): + tbtext = ''.join(traceback.format_exception(exctype, excvalue, exctb)) + dialog = QDialog(self.window_main) + loadUi("dialog_error.ui", dialog) + self.translate_widget_children(self.dialog) + #FIXME make URL work + #dialog.connect(dialog.beastie_url, SIGNAL("leftClickedURL(const QString&)"), self.openURL) + dialog.crash_detail.setText(tbtext) + dialog.exec_() + sys.exit(1) + + def openURL(self, url): + """start konqueror""" + #need to run this else kdesu can't run Konqueror + #subprocess.call(['su', 'ubuntu', 'xhost', '+localhost']) + QDesktopServices.openUrl(QUrl(url)) + + def reportBug(self): + """start konqueror""" + #need to run this else kdesu can't run Konqueror + #subprocess.call(['su', 'ubuntu', 'xhost', '+localhost']) + QDesktopServices.openUrl(QUrl("https://launchpad.net/ubuntu/+source/update-manager/+filebug")) + + def showTerminal(self): + if self.window_main.konsole_frame.isVisible(): + self.window_main.konsole_frame.hide() + self.window_main.showTerminalButton.setText(_("Show Terminal >>>")) + else: + self.window_main.konsole_frame.show() + self.window_main.showTerminalButton.setText(_("<<< Hide Terminal")) + self.window_main.resize(self.window_main.sizeHint()) + + def getFetchProgress(self): + return self._fetchProgress + + def getInstallProgress(self, cache): + self._installProgress._cache = cache + return self._installProgress + + def getOpCacheProgress(self): + return self._opCacheProgress + + def getCdromProgress(self): + return self._cdromProgress + + def update_status(self, msg): + self.window_main.label_status.setText(utf8(msg)) + + def hideStep(self, step): + image = getattr(self.window_main,"image_step%i" % step) + label = getattr(self.window_main,"label_step%i" % step) + image.hide() + label.hide() + + def abort(self): + step = self.prev_step + if step > 0: + image = getattr(self.window_main,"image_step%i" % step) + if os.path.exists("/usr/share/icons/oxygen/16x16/actions/dialog-cancel.png"): + cancelIcon = QPixmap("/usr/share/icons/oxygen/16x16/actions/dialog-cancel.png") + elif os.path.exists("/usr/lib/kde4/share/icons/oxygen/16x16/actions/dialog-cancel.png"): + cancelIcon = QPixmap("/usr/lib/kde4/share/icons/oxygen/16x16/actions/dialog-cancel.png") + else: + cancelIcon = QPixmap("/usr/share/icons/crystalsvg/16x16/actions/cancel.png") + image.setPixmap(cancelIcon) + image.show() + + def setStep(self, step): + if os.path.exists("/usr/share/icons/oxygen/16x16/actions/dialog-ok.png"): + okIcon = QPixmap("/usr/share/icons/oxygen/16x16/actions/dialog-ok.png") + elif os.path.exists("/usr/lib/kde4/share/icons/oxygen/16x16/actions/dialog-ok.png"): + okIcon = QPixmap("/usr/lib/kde4/share/icons/oxygen/16x16/actions/dialog-ok.png") + else: + okIcon = QPixmap("/usr/share/icons/crystalsvg/16x16/actions/ok.png") + + if os.path.exists("/usr/share/icons/oxygen/16x16/actions/arrow-right.png"): + arrowIcon = QPixmap("/usr/share/icons/oxygen/16x16/actions/arrow-right.png") + elif os.path.exists("/usr/lib/kde4/share/icons/oxygen/16x16/actions/arrow-right.png"): + arrowIcon = QPixmap("/usr/lib/kde4/share/icons/oxygen/16x16/actions/arrow-right.png") + else: + arrowIcon = QPixmap("/usr/share/icons/crystalsvg/16x16/actions/1rightarrow.png") + + if self.prev_step: + image = getattr(self.window_main,"image_step%i" % self.prev_step) + label = getattr(self.window_main,"label_step%i" % self.prev_step) + image.setPixmap(okIcon) + image.show() + ##arrow.hide() + self.prev_step = step + # show the an arrow for the current step and make the label bold + image = getattr(self.window_main,"image_step%i" % step) + label = getattr(self.window_main,"label_step%i" % step) + image.setPixmap(arrowIcon) + image.show() + label.setText("" + label.text() + "") + + def information(self, summary, msg, extended_msg=None): + msg = "%s
%s" % (summary,msg) + + dialogue = QDialog(self.window_main) + loadUi("dialog_error.ui", dialogue) + self.translate_widget_children(dialogue) + dialogue.label_error.setText(utf8(msg)) + if extended_msg != None: + dialogue.textview_error.setText(utf8(extended_msg)) + dialogue.textview_error.show() + else: + dialogue.textview_error.hide() + dialogue.button_bugreport.hide() + dialogue.setWindowTitle(_("Information")) + + if os.path.exists("/usr/share/icons/oxygen/48x48/status/dialog-information.png"): + messageIcon = QPixmap("/usr/share/icons/oxygen/48x48/status/dialog-information.png") + elif os.path.exists("/usr/lib/kde4/share/icons/oxygen/48x48/status/dialog-information.png"): + messageIcon = QPixmap("/usr/lib/kde4/share/icons/oxygen/48x48/status/dialog-information.png") + else: + messageIcon = QPixmap("/usr/share/icons/crystalsvg/32x32/actions/messagebox_info.png") + dialogue.image.setPixmap(messageIcon) + dialogue.exec_() + + def error(self, summary, msg, extended_msg=None): + msg="%s
%s" % (summary, msg) + + dialogue = QDialog(self.window_main) + loadUi("dialog_error.ui", dialogue) + self.translate_widget_children(dialogue) + dialogue.label_error.setText(utf8(msg)) + if extended_msg != None: + dialogue.textview_error.setText(utf8(extended_msg)) + dialogue.textview_error.show() + else: + dialogue.textview_error.hide() + dialogue.button_close.show() + self.app.connect(dialogue.button_bugreport, SIGNAL("clicked()"), self.reportBug) + + if os.path.exists("/usr/share/icons/oxygen/48x48/status/dialog-error.png"): + messageIcon = QPixmap("/usr/share/icons/oxygen/48x48/status/dialog-error.png") + elif os.path.exists("/usr/lib/kde4/share/icons/oxygen/48x48/status/dialog-error.png"): + messageIcon = QPixmap("/usr/lib/kde4/share/icons/oxygen/48x48/status/dialog-error.png") + else: + messageIcon = QPixmap("/usr/share/icons/crystalsvg/32x32/actions/messagebox_critical.png") + dialogue.image.setPixmap(messageIcon) + dialogue.exec_() + + return False + + def confirmChanges(self, summary, changes, demotions, downloadSize, + actions=None, removal_bold=True): + """show the changes dialogue""" + # FIXME: add a whitelist here for packages that we expect to be + # removed (how to calc this automatically?) + DistUpgradeView.confirmChanges(self, summary, changes, demotions, + downloadSize) + msg = unicode(self.confirmChangesMessage, 'UTF-8') + self.changesDialogue = QDialog(self.window_main) + loadUi("dialog_changes.ui", self.changesDialogue) + + self.changesDialogue.treeview_details.hide() + self.changesDialogue.connect(self.changesDialogue.show_details_button, SIGNAL("clicked()"), self.showChangesDialogueDetails) + self.translate_widget_children(self.changesDialogue) + self.changesDialogue.show_details_button.setText(_("Details") + " >>>") + self.changesDialogue.resize(self.changesDialogue.sizeHint()) + + if os.path.exists("/usr/share/icons/oxygen/48x48/status/dialog-warning.png"): + warningIcon = QPixmap("/usr/share/icons/oxygen/48x48/status/dialog-warning.png") + elif os.path.exists("/usr/lib/kde4/share/icons/oxygen/48x48/status/dialog-warning.png"): + warningIcon = QPixmap("/usr/lib/kde4/share/icons/oxygen/48x48/status/dialog-warning.png") + else: + warningIcon = QPixmap("/usr/share/icons/crystalsvg/32x32/actions/messagebox_warning.png") + + self.changesDialogue.question_pixmap.setPixmap(warningIcon) + + if actions != None: + cancel = actions[0].replace("_", "") + self.changesDialogue.button_cancel_changes.setText(cancel) + confirm = actions[1].replace("_", "") + self.changesDialogue.button_confirm_changes.setText(confirm) + + summaryText = unicode("%s" % summary, 'UTF-8') + self.changesDialogue.label_summary.setText(summaryText) + self.changesDialogue.label_changes.setText(msg) + # fill in the details + self.changesDialogue.treeview_details.clear() + self.changesDialogue.treeview_details.setHeaderLabels(["Packages"]) + self.changesDialogue.treeview_details.header().hide() + for demoted in self.demotions: + self.changesDialogue.treeview_details.insertTopLevelItem(0, QTreeWidgetItem(self.changesDialogue.treeview_details, [_("No longer supported %s") % demoted.name]) ) + for rm in self.toRemove: + self.changesDialogue.treeview_details.insertTopLevelItem(0, QTreeWidgetItem(self.changesDialogue.treeview_details, [_("Remove %s") % rm.name]) ) + for rm in self.toRemoveAuto: + self.changesDialogue.treeview_details.insertTopLevelItem(0, QTreeWidgetItem(self.changesDialogue.treeview_details, [_("Remove (was auto installed) %s") % rm.name]) ) + for inst in self.toInstall: + self.changesDialogue.treeview_details.insertTopLevelItem(0, QTreeWidgetItem(self.changesDialogue.treeview_details, [_("Install %s") % inst.name]) ) + for up in self.toUpgrade: + self.changesDialogue.treeview_details.insertTopLevelItem(0, QTreeWidgetItem(self.changesDialogue.treeview_details, [_("Upgrade %s") % up.name]) ) + + #FIXME resize label, stop it being shrinkable + res = self.changesDialogue.exec_() + if res == QDialog.Accepted: + return True + return False + + def showChangesDialogueDetails(self): + if self.changesDialogue.treeview_details.isVisible(): + self.changesDialogue.treeview_details.hide() + self.changesDialogue.show_details_button.setText(_("Details") + " >>>") + else: + self.changesDialogue.treeview_details.show() + self.changesDialogue.show_details_button.setText("<<< " + _("Details")) + self.changesDialogue.resize(self.changesDialogue.sizeHint()) + + def askYesNoQuestion(self, summary, msg, default='No'): + answer = QMessageBox.question(self.window_main, unicode(summary, 'UTF-8'), unicode("") + unicode(msg, 'UTF-8'), QMessageBox.Yes|QMessageBox.No, QMessageBox.No) + if answer == QMessageBox.Yes: + return True + return False + + def confirmRestart(self): + messageBox = QMessageBox(QMessageBox.Question, _("Restart required"), _("Restart the system to complete the upgrade"), QMessageBox.NoButton, self.window_main) + yesButton = messageBox.addButton(QMessageBox.Yes) + noButton = messageBox.addButton(QMessageBox.No) + yesButton.setText(_("_Restart Now").replace("_", "&")) + noButton.setText(gettext.dgettext("kdelibs", "&Close")) + answer = messageBox.exec_() + if answer == QMessageBox.Yes: + return True + return False + + def processEvents(self): + QApplication.processEvents() + + def pulseProgress(self, finished=False): + # FIXME: currently we do nothing here because this is + # run in a different python thread and QT explodes if the UI is + # touched from a non QThread + pass + + def on_window_main_delete_event(self): + #FIXME make this user friendly + text = _("""Cancel the running upgrade? + +The system could be in an unusable state if you cancel the upgrade. You are strongly advised to resume the upgrade.""") + text = text.replace("\n", "
") + cancel = QMessageBox.warning(self.window_main, _("Cancel Upgrade?"), text, QMessageBox.Yes, QMessageBox.No) + if cancel == QMessageBox.Yes: + return True + return False + +if __name__ == "__main__": + + view = DistUpgradeViewKDE() + view.askYesNoQuestion("input box test","bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar ") + + if sys.argv[1] == "--test-term": + pid = view.terminal_text.fork() + if pid == 0: + subprocess.call(["bash"]) + sys.exit() + while True: + view.terminal_text.update_interface() + QApplication.processEvents() + time.sleep(0.01) + + if sys.argv[1] == "--show-in-terminal": + for c in open(sys.argv[2]).read(): + view.terminal_text.insertWithTermCodes( c ) + #print c, ord(c) + QApplication.processEvents() + time.sleep(0.05) + while True: + QApplication.processEvents() + + cache = apt.Cache() + for pkg in sys.argv[1:]: + if cache[pkg].is_installed and not cache[pkg].isUpgradable: + cache[pkg].mark_delete(purge=True) + else: + cache[pkg].mark_install() + cache.commit(view._fetchProgress,view._installProgress) + + # keep the window open + while True: + QApplication.processEvents() diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeViewNonInteractive.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeViewNonInteractive.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeViewNonInteractive.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeViewNonInteractive.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,320 @@ +# DistUpgradeView.py +# +# Copyright (c) 2004,2005 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import apt +import apt_pkg +import logging +import time +import sys +import os +import pty +import select +import subprocess +import copy +import apt.progress + +from ConfigParser import NoSectionError, NoOptionError +from subprocess import PIPE, Popen + +from DistUpgradeView import DistUpgradeView, InstallProgress, FetchProgress +from DistUpgradeConfigParser import DistUpgradeConfig + +class NonInteractiveFetchProgress(FetchProgress): + def update_status(self, uri, descr, shortDescr, status): + FetchProgress.update_status(self, uri, descr, shortDescr, status) + #logging.debug("Fetch: updateStatus %s %s" % (uri, status)) + if status == apt_pkg.STAT_DONE: + print "fetched %s (%.2f/100) at %sb/s" % ( + uri, self.percent, apt_pkg.size_to_str(int(self.current_cps))) + if sys.stdout.isatty(): + sys.stdout.flush() + + +class NonInteractiveInstallProgress(InstallProgress): + """ + Non-interactive version of the install progress class + + This ensures that conffile prompts are handled and that + hanging scripts are killed after a (long) timeout via ctrl-c + """ + + def __init__(self, logdir): + InstallProgress.__init__(self) + logging.debug("setting up environ for non-interactive use") + if not os.environ.has_key("DEBIAN_FRONTEND"): + os.environ["DEBIAN_FRONTEND"] = "noninteractive" + os.environ["APT_LISTCHANGES_FRONTEND"] = "none" + os.environ["RELEASE_UPRADER_NO_APPORT"] = "1" + self.config = DistUpgradeConfig(".") + self.logdir = logdir + self.install_run_number = 0 + try: + if self.config.getWithDefault("NonInteractive","ForceOverwrite", False): + apt_pkg.config.set("DPkg::Options::","--force-overwrite") + except (NoSectionError, NoOptionError): + pass + # more debug + #apt_pkg.Config.Set("Debug::pkgOrderList","true") + #apt_pkg.Config.Set("Debug::pkgDPkgPM","true") + # default to 2400 sec timeout + self.timeout = 2400 + try: + self.timeout = self.config.getint("NonInteractive","TerminalTimeout") + except Exception: + pass + + def error(self, pkg, errormsg): + logging.error("got a error from dpkg for pkg: '%s': '%s'" % (pkg, errormsg)) + # check if re-run of maintainer script is requested + if not self.config.getWithDefault( + "NonInteractive","DebugBrokenScripts", False): + return + # re-run maintainer script with sh -x/perl debug to get a better + # idea what went wrong + # + # FIXME: this is just a approximation for now, we also need + # to pass: + # - a version after remove (if upgrade to new version) + # + # not everything is a shell or perl script + # + # if the new preinst fails, its not yet in /var/lib/dpkg/info + # so this is inaccurate as well + environ = copy.copy(os.environ) + environ["PYCENTRAL"] = "debug" + cmd = [] + + # find what maintainer script failed + if "post-installation" in errormsg: + prefix = "/var/lib/dpkg/info/" + name = "postinst" + argument = "configure" + maintainer_script = "%s/%s.%s" % (prefix, pkg, name) + elif "pre-installation" in errormsg: + prefix = "/var/lib/dpkg/tmp.ci/" + #prefix = "/var/lib/dpkg/info/" + name = "preinst" + argument = "install" + maintainer_script = "%s/%s" % (prefix, name) + elif "pre-removal" in errormsg: + prefix = "/var/lib/dpkg/info/" + name = "prerm" + argument = "remove" + maintainer_script = "%s/%s.%s" % (prefix, pkg, name) + elif "post-removal" in errormsg: + prefix = "/var/lib/dpkg/info/" + name = "postrm" + argument = "remove" + maintainer_script = "%s/%s.%s" % (prefix, pkg, name) + else: + print "UNKNOWN (trigger?) dpkg/script failure for %s (%s) " % (pkg, errormsg) + return + + # find out about the interpreter + if not os.path.exists(maintainer_script): + logging.error("can not find failed maintainer script '%s' " % maintainer_script) + return + interp = open(maintainer_script).readline()[2:].strip().split()[0] + if ("bash" in interp) or ("/bin/sh" in interp): + debug_opts = ["-ex"] + elif ("perl" in interp): + debug_opts = ["-d"] + environ["PERLDB_OPTS"] = "AutoTrace NonStop" + else: + logging.warning("unknown interpreter: '%s'" % interp) + + # check if debconf is used and fiddle a bit more if it is + if ". /usr/share/debconf/confmodule" in open(maintainer_script).read(): + environ["DEBCONF_DEBUG"] = "developer" + environ["DEBIAN_HAS_FRONTEND"] = "1" + interp = "/usr/share/debconf/frontend" + debug_opts = ["sh","-ex"] + + # build command + cmd.append(interp) + cmd.extend(debug_opts) + cmd.append(maintainer_script) + cmd.append(argument) + + # check if we need to pass a version + if name == "postinst": + version = Popen("dpkg-query -s %s|grep ^Config-Version" % pkg,shell=True, stdout=PIPE).communicate()[0] + if version: + cmd.append(version.split(":",1)[1].strip()) + elif name == "preinst": + pkg = os.path.basename(pkg) + pkg = pkg.split("_")[0] + version = Popen("dpkg-query -s %s|grep ^Version" % pkg,shell=True, stdout=PIPE).communicate()[0] + if version: + cmd.append(version.split(":",1)[1].strip()) + + logging.debug("re-running '%s' (%s)" % (cmd, environ)) + ret = subprocess.call(cmd, env=environ) + logging.debug("%s script returned: %s" % (name,ret)) + + def conffile(self, current, new): + logging.warning("got a conffile-prompt from dpkg for file: '%s'" % current) + # looks like we have a race here *sometimes* + time.sleep(5) + try: + # don't overwrite + os.write(self.master_fd,"n\n") + except Exception, e: + logging.error("error '%s' when trying to write to the conffile"%e) + + def start_update(self): + InstallProgress.start_update(self) + self.last_activity = time.time() + progress_log = self.config.getWithDefault("NonInteractive","DpkgProgressLog", False) + if progress_log: + fullpath = os.path.join(self.logdir, "dpkg-progress.%s.log" % self.install_run_number) + logging.debug("writing dpkg progress log to '%s'" % fullpath) + self.dpkg_progress_log = open(fullpath, "w") + else: + self.dpkg_progress_log = open(os.devnull, "w") + self.dpkg_progress_log.write("%s: Start\n" % time.time()) + def finish_update(self): + InstallProgress.finish_update(self) + self.dpkg_progress_log.write("%s: Finished\n" % time.time()) + self.dpkg_progress_log.close() + self.install_run_number += 1 + def status_change(self, pkg, percent, status_str): + self.dpkg_progress_log.write("%s:%s:%s:%s\n" % (time.time(), + percent, + pkg, + status_str)) + def update_interface(self): + InstallProgress.update_interface(self) + if self.statusfd == None: + return + if (self.last_activity + self.timeout) < time.time(): + logging.warning("no activity %s seconds (%s) - sending ctrl-c" % ( + self.timeout, self.status)) + # ctrl-c + os.write(self.master_fd,chr(3)) + # read master fd and write to stdout so that terminal output + # actualy works + res = select.select([self.master_fd],[],[],0.1) + while len(res[0]) > 0: + self.last_activity = time.time() + try: + s = os.read(self.master_fd, 1) + sys.stdout.write("%s" % s) + except OSError: + # happens after we are finished because the fd is closed + return + res = select.select([self.master_fd],[],[],0.1) + sys.stdout.flush() + + + def fork(self): + logging.debug("doing a pty.fork()") + # some maintainer scripts fail without + os.environ["TERM"] = "dumb" + # unset PAGER so that we can do "diff" in the dpkg prompt + os.environ["PAGER"] = "true" + (self.pid, self.master_fd) = pty.fork() + if self.pid != 0: + logging.debug("pid is: %s" % self.pid) + return self.pid + +class DistUpgradeViewNonInteractive(DistUpgradeView): + " non-interactive version of the upgrade view " + def __init__(self, datadir=None, logdir=None): + DistUpgradeView.__init__(self) + self.config = DistUpgradeConfig(".") + self._fetchProgress = NonInteractiveFetchProgress() + self._installProgress = NonInteractiveInstallProgress(logdir) + self._opProgress = apt.progress.base.OpProgress() + sys.__excepthook__ = self.excepthook + def excepthook(self, type, value, traceback): + " on uncaught exceptions -> print error and reboot " + logging.exception("got exception '%s': %s " % (type, value)) + #sys.excepthook(type, value, traceback) + self.confirmRestart() + def getOpCacheProgress(self): + " return a OpProgress() subclass for the given graphic" + return self._opProgress + def getFetchProgress(self): + " return a fetch progress object " + return self._fetchProgress + def getInstallProgress(self, cache=None): + " return a install progress object " + return self._installProgress + def updateStatus(self, msg): + """ update the current status of the distUpgrade based + on the current view + """ + pass + def setStep(self, step): + """ we have 5 steps current for a upgrade: + 1. Analyzing the system + 2. Updating repository information + 3. Performing the upgrade + 4. Post upgrade stuff + 5. Complete + """ + pass + def confirmChanges(self, summary, changes, demotions, downloadSize, + actions=None, removal_bold=True): + DistUpgradeView.confirmChanges(self, summary, changes, demotions, + downloadSize, actions) + logging.debug("toinstall: '%s'" % [p.name for p in self.toInstall]) + logging.debug("toupgrade: '%s'" % [p.name for p in self.toUpgrade]) + logging.debug("toremove: '%s'" % [p.name for p in self.toRemove]) + return True + def askYesNoQuestion(self, summary, msg, default='No'): + " ask a Yes/No question and return True on 'Yes' " + # if this gets enabled upgrades over ssh with the non-interactive + # frontend will no longer work + #if default.lower() == "no": + # return False + return True + def confirmRestart(self): + " generic ask about the restart, can be overridden " + logging.debug("confirmRestart() called") + # rebooting here makes sense if we run e.g. in qemu + return self.config.getWithDefault("NonInteractive","RealReboot", False) + def error(self, summary, msg, extended_msg=None): + " display a error " + logging.error("%s %s (%s)" % (summary, msg, extended_msg)) + def abort(self): + logging.error("view.abort called") + + +if __name__ == "__main__": + + view = DistUpgradeViewNonInteractive() + fp = NonInteractiveFetchProgress() + ip = NonInteractiveInstallProgress() + + #ip.error("linux-image-2.6.17-10-generic","post-installation script failed") + ip.error("xserver-xorg","pre-installation script failed") + + cache = apt.Cache() + for pkg in sys.argv[1:]: + #if cache[pkg].is_installed: + # cache[pkg].markDelete() + #else: + cache[pkg].mark_install() + cache.commit(fp,ip) + time.sleep(2) + sys.exit(0) diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeView.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeView.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeView.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeView.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,432 @@ +# DistUpgradeView.py +# +# Copyright (c) 2004,2005 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +from DistUpgradeGettext import gettext as _ +from DistUpgradeGettext import ngettext +import apt +import errno +import os +import apt_pkg +import logging +import signal +import select + +from DistUpgradeAufs import doAufsChroot, doAufsChrootRsync +from DistUpgradeApport import apport_pkgfailure + + +def FuzzyTimeToStr(sec): + " return the time a bit fuzzy (no seconds if time > 60 secs " + #print "FuzzyTimeToStr: ", sec + sec = int(sec) + + days = sec/(60*60*24) + hours = sec/(60*60) % 24 + minutes = (sec/60) % 60 + seconds = sec % 60 + # 0 seonds remaining looks wrong and its "fuzzy" anyway + if seconds == 0: + seconds = 1 + + # string map to make the re-ordering possible + map = { "str_days" : "", + "str_hours" : "", + "str_minutes" : "", + "str_seconds" : "" + } + + # get the fragments, this is not ideal i18n wise, but its + # difficult to do it differently + if days > 0: + map["str_days"] = ngettext("%li day","%li days", days) % days + if hours > 0: + map["str_hours"] = ngettext("%li hour","%li hours", hours) % hours + if minutes > 0: + map["str_minutes"] = ngettext("%li minute","%li minutes", minutes) % minutes + map["str_seconds"] = ngettext("%li second","%li seconds", seconds) % seconds + + # now assemble the string + if days > 0: + # Don't print str_hours if it's an empty string, see LP: #288912 + if map["str_hours"] == '': + return map["str_days"] + # TRANSLATORS: you can alter the ordering of the remaining time + # information here if you shuffle %(str_days)s %(str_hours)s %(str_minutes)s + # around. Make sure to keep all '$(str_*)s' in the translated string + # and do NOT change anything appart from the ordering. + # + # %(str_hours)s will be either "1 hour" or "2 hours" depending on the + # plural form + # + # Note: most western languages will not need to change this + return _("%(str_days)s %(str_hours)s") % map + # display no minutes for time > 3h, see LP: #144455 + elif hours > 3: + return map["str_hours"] + # when we are near the end, become more precise again + elif hours > 0: + # Don't print str_minutes if it's an empty string, see LP: #288912 + if map["str_minutes"] == '': + return map["str_hours"] + # TRANSLATORS: you can alter the ordering of the remaining time + # information here if you shuffle %(str_hours)s %(str_minutes)s + # around. Make sure to keep all '$(str_*)s' in the translated string + # and do NOT change anything appart from the ordering. + # + # %(str_hours)s will be either "1 hour" or "2 hours" depending on the + # plural form + # + # Note: most western languages will not need to change this + return _("%(str_hours)s %(str_minutes)s") % map + elif minutes > 0: + return map["str_minutes"] + return map["str_seconds"] + + +class FetchProgress(apt.progress.base.AcquireProgress): + + def __init__(self): + super(FetchProgress, self).__init__() + self.est_speed = 0.0 + def start(self): + super(FetchProgress, self).start() + self.est_speed = 0.0 + self.eta = 0.0 + self.percent = 0.0 + self.release_file_download_error = False + def update_status(self, uri, descr, shortDescr, status): + super(FetchProgress, self).update_status(uri, descr, shortDescr, status) + # FIXME: workaround issue in libapt/python-apt that does not + # raise a exception if *all* files fails to download + if status == apt_pkg.STAT_FAILED: + logging.warn("update_status: dlFailed on '%s' " % uri) + if uri.endswith("Release.gpg") or uri.endswith("Release"): + # only care about failures from network, not gpg, bzip, those + # are different issues + for net in ["http","ftp","mirror"]: + if uri.startswith(net): + self.release_file_download_error = True + break + # required, otherwise the lucid version of python-apt gets really + # unhappy, its expecting this function for apt.progress.base.AcquireProgress + def pulse_items(self, arg): + return True + def pulse(self, owner=None): + super(FetchProgress, self).pulse(owner) + self.percent = (((self.current_bytes + self.current_items) * 100.0) / + float(self.total_bytes + self.total_items)) + if self.current_cps > self.est_speed: + self.est_speed = (self.est_speed+self.current_cps)/2.0 + if self.current_cps > 0: + self.eta = ((self.total_bytes - self.current_bytes) / + float(self.current_cps)) + return True + def isDownloadSpeedEstimated(self): + return (self.est_speed != 0) + def estimatedDownloadTime(self, requiredDownload): + """ get the estimated download time """ + if self.est_speed == 0: + timeModem = requiredDownload/(56*1024/8) # 56 kbit + timeDSL = requiredDownload/(1024*1024/8) # 1Mbit = 1024 kbit + s= _("This download will take about %s with a 1Mbit DSL connection " + "and about %s with a 56k modem.") % (FuzzyTimeToStr(timeDSL), FuzzyTimeToStr(timeModem)) + return s + # if we have a estimated speed, use it + s = _("This download will take about %s with your connection. ") % FuzzyTimeToStr(requiredDownload/self.est_speed) + return s + + + +class InstallProgress(apt.progress.base.InstallProgress): + """ Base class for InstallProgress that supports some fancy + stuff like apport integration + """ + def __init__(self): + apt.progress.base.InstallProgress.__init__(self) + self.master_fd = None + + def wait_child(self): + """Wait for child progress to exit. + + The return values is the full status returned from os.waitpid() + (not only the return code). + """ + while True: + try: + select.select([self.statusfd], [], [], self.select_timeout) + except select.error, (errno_, errstr): + if errno_ != errno.EINTR: + raise + self.update_interface() + try: + (pid, res) = os.waitpid(self.child_pid, os.WNOHANG) + if pid == self.child_pid: + break + except OSError, (errno_, errstr): + if errno_ != errno.EINTR: + raise + if errno_ == errno.ECHILD: + break + return res + + def run(self, pm): + pid = self.fork() + if pid == 0: + # check if we need to setup/enable the aufs chroot stuff + if "RELEASE_UPGRADE_USE_AUFS_CHROOT" in os.environ: + if not doAufsChroot(os.environ["RELEASE_UPGRADE_AUFS_RWDIR"], + os.environ["RELEASE_UPGRADE_USE_AUFS_CHROOT"]): + print "ERROR: failed to setup aufs chroot overlay" + os._exit(1) + # child, ignore sigpipe, there are broken scripts out there + # like etckeeper (LP: #283642) + signal.signal(signal.SIGPIPE,signal.SIG_IGN) + try: + res = pm.do_install(self.writefd) + except Exception, e: + print "Exception during pm.DoInstall(): ", e + logging.exception("Exception during pm.DoInstall()") + open("/var/run/update-manager-apt-exception","w").write(str(e)) + os._exit(pm.ResultFailed) + os._exit(res) + self.child_pid = pid + res = os.WEXITSTATUS(self.wait_child()) + # check if we want to sync the changes back, *only* do that + # if res is positive + if (res == 0 and + "RELEASE_UPGRADE_RSYNC_AUFS_CHROOT" in os.environ): + logging.info("doing rsync commit of the update") + if not doAufsChrootRsync(os.environ["RELEASE_UPGRADE_USE_AUFS_CHROOT"]): + logging.error("FATAL ERROR: doAufsChrootRsync() returned FALSE") + return pm.ResultFailed + return res + + def error(self, pkg, errormsg): + " install error from a package " + apt.progress.base.InstallProgress.error(self, pkg, errormsg) + logging.error("got an error from dpkg for pkg: '%s': '%s'" % (pkg, errormsg)) + if "/" in pkg: + pkg = os.path.basename(pkg) + if "_" in pkg: + pkg = pkg.split("_")[0] + # now run apport + apport_pkgfailure(pkg, errormsg) + +class DumbTerminal(object): + def call(self, cmd, hidden=False): + " expects a command in the subprocess style (as a list) " + import subprocess + subprocess.call(cmd) + +class DummyHtmlView(object): + def open(self, url): + pass + def show(self): + pass + def hide(self): + pass + +(STEP_PREPARE, + STEP_MODIFY_SOURCES, + STEP_FETCH, + STEP_INSTALL, + STEP_CLEANUP, + STEP_REBOOT, + STEP_N) = range(1,8) + +( _("Preparing to upgrade"), + _("Getting new software channels"), + _("Getting new packages"), + _("Installing the upgrades"), + _("Cleaning up"), +) + +class DistUpgradeView(object): + " abstraction for the upgrade view " + def __init__(self): + self.needs_screen = False + pass + def getOpCacheProgress(self): + " return a OpProgress() subclass for the given graphic" + return apt.progress.base.OpProgress() + def getFetchProgress(self): + " return a fetch progress object " + return FetchProgress() + def getInstallProgress(self, cache=None): + " return a install progress object " + return InstallProgress() + def getTerminal(self): + return DumbTerminal() + def getHtmlView(self): + return DummyHtmlView() + def updateStatus(self, msg): + """ update the current status of the distUpgrade based + on the current view + """ + pass + def abort(self): + """ provide a visual feedback that the upgrade was aborted """ + pass + def setStep(self, step): + """ we have 6 steps current for a upgrade: + 1. Analyzing the system + 2. Updating repository information + 3. fetch packages + 3. Performing the upgrade + 4. Post upgrade stuff + 5. Complete + """ + pass + def hideStep(self, step): + " hide a certain step from the GUI " + pass + def showStep(self, step): + " show a certain step from the GUI " + pass + def confirmChanges(self, summary, changes, demotions, downloadSize, + actions=None, removal_bold=True): + """ display the list of changed packages (apt.Package) and + return if the user confirms them + """ + self.confirmChangesMessage = "" + self.demotions = demotions + self.toInstall = [] + self.toUpgrade = [] + self.toRemove = [] + self.toRemoveAuto = [] + self.toDowngrade = [] + for pkg in changes: + if pkg.marked_install: + self.toInstall.append(pkg) + elif pkg.marked_upgrade: + self.toUpgrade.append(pkg) + elif pkg.marked_delete: + if pkg._pcache._depcache.is_auto_installed(pkg._pkg): + self.toRemoveAuto.append(pkg) + else: + self.toRemove.append(pkg) + elif pkg.marked_downgrade: + self.toDowngrade.append(pkg) + # sort it + self.toInstall.sort() + self.toUpgrade.sort() + self.toRemove.sort() + self.toRemoveAuto.sort() + self.toDowngrade.sort() + # no re-installs + assert(len(self.toInstall)+len(self.toUpgrade)+len(self.toRemove)+len(self.toRemoveAuto)+len(self.toDowngrade) == len(changes)) + # now build the message (the same for all frontends) + msg = "\n" + pkgs_remove = len(self.toRemove) + len(self.toRemoveAuto) + pkgs_inst = len(self.toInstall) + pkgs_upgrade = len(self.toUpgrade) + # FIXME: show detailed packages + if len(self.demotions) > 0: + msg += ngettext( + "%(amount)d installed package is no longer supported by Canonical. " + "You can still get support from the community.", + "%(amount)d installed packages are no longer supported by " + "Canonical. You can still get support from the community.", + len(self.demotions)) % { 'amount' : len(self.demotions) } + msg += "\n\n" + if pkgs_remove > 0: + # FIXME: make those two separate lines to make it clear + # that the "%" applies to the result of ngettext + msg += ngettext("%d package is going to be removed.", + "%d packages are going to be removed.", + pkgs_remove) % pkgs_remove + msg += " " + if pkgs_inst > 0: + msg += ngettext("%d new package is going to be " + "installed.", + "%d new packages are going to be " + "installed.",pkgs_inst) % pkgs_inst + msg += " " + if pkgs_upgrade > 0: + msg += ngettext("%d package is going to be upgraded.", + "%d packages are going to be upgraded.", + pkgs_upgrade) % pkgs_upgrade + msg +=" " + if downloadSize > 0: + msg += _("\n\nYou have to download a total of %s. ") %\ + apt_pkg.SizeToStr(downloadSize) + msg += self.getFetchProgress().estimatedDownloadTime(downloadSize) + if ((pkgs_upgrade + pkgs_inst) > 0) and ((pkgs_upgrade + pkgs_inst + pkgs_remove) > 100): + if self.getFetchProgress().isDownloadSpeedEstimated(): + msg += "\n\n%s" % _( "Installing the upgrade " + "can take several hours. Once the download " + "has finished, the process cannot be canceled.") + else: + msg += "\n\n%s" % _( "Fetching and installing the upgrade " + "can take several hours. Once the download " + "has finished, the process cannot be canceled.") + else: + if pkgs_remove > 100: + msg += "\n\n%s" % _( "Removing the packages " + "can take several hours. ") + # Show an error if no actions are planned + if (pkgs_upgrade + pkgs_inst + pkgs_remove) < 1: + # FIXME: this should go into DistUpgradeController + summary = _("The software on this computer is up to date.") + msg = _("There are no upgrades available for your system. " + "The upgrade will now be canceled.") + self.error(summary, msg) + return False + # set the message + self.confirmChangesMessage = msg + return True + + def askYesNoQuestion(self, summary, msg, default='No'): + " ask a Yes/No question and return True on 'Yes' " + pass + def confirmRestart(self): + " generic ask about the restart, can be overridden " + summary = _("Reboot required") + msg = _("The upgrade is finished and " + "a reboot is required. " + "Do you want to do this " + "now?") + return self.askYesNoQuestion(summary, msg) + def error(self, summary, msg, extended_msg=None): + " display a error " + pass + def information(self, summary, msg, extended_msg=None): + " display a information msg" + pass + def processEvents(self): + """ process gui events (to keep the gui alive during a long + computation """ + pass + def pulseProgress(self, finished=False): + """ do a progress pulse (e.g. bounce a bar back and forth, show + a spinner) + """ + pass + def showDemotions(self, summary, msg, demotions): + """ + show demoted packages to the user, default implementation + is to just show a information dialog + """ + self.information(summary, msg, "\n".join(demotions)) + +if __name__ == "__main__": + fp = FetchProgress() + fp.pulse() diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeViewText.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeViewText.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/DistUpgradeViewText.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/DistUpgradeViewText.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,276 @@ +# DistUpgradeViewText.py +# +# Copyright (c) 2004-2006 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import sys +import logging +import subprocess + +import apt +import os + +from DistUpgradeView import DistUpgradeView, InstallProgress, FetchProgress +import apt.progress + +import gettext +from DistUpgradeGettext import gettext as _ +from utils import twrap + +class TextFetchProgress(FetchProgress, apt.progress.text.AcquireProgress): + def __init__(self): + apt.progress.text.AcquireProgress.__init__(self) + FetchProgress.__init__(self) + def pulse(self, owner): + apt.progress.text.AcquireProgress.pulse(self, owner) + FetchProgress.pulse(self, owner) + return True + +class TextCdromProgressAdapter(apt.progress.base.CdromProgress): + """ Report the cdrom add progress """ + def update(self, text, step): + """ update is called regularly so that the gui can be redrawn """ + if text: + print "%s (%f)" % (text, step/float(self.totalSteps)*100) + def askCdromName(self): + return (False, "") + def changeCdrom(self): + return False + + +class DistUpgradeViewText(DistUpgradeView): + " text frontend of the distUpgrade tool " + def __init__(self, datadir=None, logdir=None): + # indicate that we benefit from using gnu screen + self.needs_screen = True + # its important to have a debconf frontend for + # packages like "quagga" + if not os.environ.has_key("DEBIAN_FRONTEND"): + os.environ["DEBIAN_FRONTEND"] = "dialog" + if not datadir: + localedir=os.path.join(os.getcwd(),"mo") + else: + localedir="/usr/share/locale/update-manager" + + try: + gettext.bindtextdomain("update-manager", localedir) + gettext.textdomain("update-manager") + except Exception, e: + logging.warning("Error setting locales (%s)" % e) + + self.last_step = 0 # keep a record of the latest step + self._opCacheProgress = apt.progress.text.OpProgress() + self._fetchProgress = TextFetchProgress() + self._cdromProgress = TextCdromProgressAdapter() + self._installProgress = InstallProgress() + sys.excepthook = self._handleException + #self._process_events_tick = 0 + + def _handleException(self, type, value, tb): + import traceback + print + lines = traceback.format_exception(type, value, tb) + logging.error("not handled exception:\n%s" % "\n".join(lines)) + self.error(_("A fatal error occurred"), + _("Please report this as a bug and include the " + "files /var/log/dist-upgrade/main.log and " + "/var/log/dist-upgrade/apt.log " + "in your report. The upgrade has aborted.\n" + "Your original sources.list was saved in " + "/etc/apt/sources.list.distUpgrade."), + "\n".join(lines)) + sys.exit(1) + + def getFetchProgress(self): + return self._fetchProgress + def getInstallProgress(self, cache): + self._installProgress._cache = cache + return self._installProgress + def getOpCacheProgress(self): + return self._opCacheProgress + def getCdromProgress(self): + return self._cdromProgress + def updateStatus(self, msg): + print + print msg + sys.stdout.flush() + def abort(self): + print + print _("Aborting") + def setStep(self, step): + self.last_step = step + def showDemotions(self, summary, msg, demotions): + self.information(summary, msg, + _("Demoted:\n")+twrap(", ".join(demotions))) + def information(self, summary, msg, extended_msg=None): + print + print twrap(summary) + print twrap(msg) + if extended_msg: + print twrap(extended_msg) + print _("To continue please press [ENTER]") + sys.stdin.readline() + def error(self, summary, msg, extended_msg=None): + print + print twrap(summary) + print twrap(msg) + if extended_msg: + print twrap(extended_msg) + return False + def showInPager(self, output): + " helper to show output in a pager" + for pager in ["/usr/bin/sensible-pager", "/bin/more"]: + if os.path.exists(pager): + p = subprocess.Popen([pager,"-"],stdin=subprocess.PIPE) + p.stdin.write(output) + p.stdin.close() + p.wait() + return + # if we don't have a pager, just print + print output + + def confirmChanges(self, summary, changes, demotions, downloadSize, + actions=None, removal_bold=True): + DistUpgradeView.confirmChanges(self, summary, changes, demotions, + downloadSize, actions) + print + print twrap(summary) + print twrap(self.confirmChangesMessage) + print " %s %s" % (_("Continue [yN] "), _("Details [d]")), + while True: + res = sys.stdin.readline() + # TRANSLATORS: the "y" is "yes" + if res.strip().lower().startswith(_("y")): + return True + # TRANSLATORS: the "n" is "no" + elif res.strip().lower().startswith(_("n")): + return False + # TRANSLATORS: the "d" is "details" + elif res.strip().lower().startswith(_("d")): + output = "" + if len(self.demotions) > 0: + output += "\n" + output += twrap( + _("No longer supported: %s\n") % " ".join([p.name for p in self.demotions]), + subsequent_indent=' ') + if len(self.toRemove) > 0: + output += "\n" + output += twrap( + _("Remove: %s\n") % " ".join([p.name for p in self.toRemove]), + subsequent_indent=' ') + if len(self.toRemoveAuto) > 0: + output += twrap( + _("Remove (was auto installed) %s") % " ".join([p.name for p in self.toRemoveAuto]), + subsequent_indent=' ') + output += "\n" + if len(self.toInstall) > 0: + output += "\n" + output += twrap( + _("Install: %s\n") % " ".join([p.name for p in self.toInstall]), + subsequent_indent=' ') + if len(self.toUpgrade) > 0: + output += "\n" + output += twrap( + _("Upgrade: %s\n") % " ".join([p.name for p in self.toUpgrade]), + subsequent_indent=' ') + self.showInPager(output) + print "%s %s" % (_("Continue [yN] "), _("Details [d]")), + + def askYesNoQuestion(self, summary, msg, default='No'): + print + print twrap(summary) + print twrap(msg) + if default == 'No': + print _("Continue [yN] "), + res = sys.stdin.readline() + # TRANSLATORS: first letter of a positive (yes) answer + if res.strip().lower().startswith(_("y")): + return True + return False + else: + print _("Continue [Yn] "), + res = sys.stdin.readline() + # TRANSLATORS: first letter of a negative (no) answer + if res.strip().lower().startswith(_("n")): + return False + return True + +# FIXME: when we need this most the resolver is writing debug logs +# and we redirect stdout/stderr +# def processEvents(self): +# #time.sleep(0.2) +# anim = [".","o","O","o"] +# anim = ["\\","|","/","-","\\","|","/","-"] +# self._process_events_tick += 1 +# if self._process_events_tick >= len(anim): +# self._process_events_tick = 0 +# sys.stdout.write("[%s]" % anim[self._process_events_tick]) +# sys.stdout.flush() + + def confirmRestart(self): + return self.askYesNoQuestion(_("Restart required"), + _("To finish the upgrade, a restart is " + "required.\n" + "If you select 'y' the system " + "will be restarted."), default='No') + + +if __name__ == "__main__": + view = DistUpgradeViewText() + + #while True: + # view.processEvents() + + print twrap("89 packages are going to be upgraded.\nYou have to download a total of 82.7M.\nThis download will take about 10 minutes with a 1Mbit DSL connection and about 3 hours 12 minutes with a 56k modem.", subsequent_indent=" ") + #sys.exit(1) + + view = DistUpgradeViewText() + print view.askYesNoQuestion("hello", "Icecream?", "No") + print view.askYesNoQuestion("hello", "Icecream?", "Yes") + + + #view.confirmChangesMessage = "89 packages are going to be upgraded.\n You have to download a total of 82.7M.\n This download will take about 10 minutes with a 1Mbit DSL connection and about 3 hours 12 minutes with a 56k modem." + #view.confirmChanges("xx",[], 100) + sys.exit(0) + + view.confirmRestart() + + cache = apt.Cache() + fp = view.getFetchProgress() + ip = view.getInstallProgress(cache) + + + for pkg in sys.argv[1:]: + cache[pkg].mark_install() + cache.commit(fp,ip) + + sys.exit(0) + view.getTerminal().call(["dpkg","--configure","-a"]) + #view.getTerminal().call(["ls","-R","/usr"]) + view.error("short","long", + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + ) + view.confirmChanges("xx",[], 100) + print view.askYesNoQuestion("hello", "Icecream?") diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/EOLReleaseAnnouncement update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/EOLReleaseAnnouncement --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/EOLReleaseAnnouncement 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/EOLReleaseAnnouncement 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,62 @@ += Ubuntu 12.04 'Precise Pangolin' is no longer supported = + +You are about to upgrade to a version of Ubuntu that is no longer +supported. + +This release of Ubuntu is '''no longer supported''' by Canonical. The +support timeframe is between 18 month and 5 years after the initial +release. You will not receive security updates or critical +bugfixes. See http://www.ubuntu.com/releaseendoflife for details. + +It is still possible to upgrade this version and eventually you will +be able to upgrade to a supported release of Ubuntu. + +Alternatively you may want to consider to reinstall the machine to the +latest version, for more information on this, visit: +http://www.ubuntu.com/desktop/get-ubuntu + +For pre-installed system you may want to contact the manufacturer +for instructions. + +== Feedback and Helping == + +If you would like to help shape Ubuntu, take a look at the list of +ways you can participate at + + http://www.ubuntu.com/community/participate/ + +Your comments, bug reports, patches and suggestions will help ensure +that our next release is the best release of Ubuntu ever. If you feel +that you have found a bug please read: + + http://help.ubuntu.com/community/ReportingBugs + +Then report bugs using apport in Ubuntu. For example: + + ubuntu-bug linux + +will open a bug report in Launchpad regarding the linux package. + +If you have a question, or if you think you may have found a bug but +aren't sure, first try asking on the #ubuntu or #ubuntu-bugs IRC +channels on Freenode, on the Ubuntu Users mailing list, or on the +Ubuntu forums: + + http://help.ubuntu.com/community/InternetRelayChat + http://lists.ubuntu.com/mailman/listinfo/ubuntu-users + http://www.ubuntuforums.org/ + + +== More Information == + +You can find out more about Ubuntu on our website, IRC channel and wiki. +If you're new to Ubuntu, please visit: + + http://www.ubuntu.com/ + + +To sign up for future Ubuntu announcements, please subscribe to Ubuntu's +very low volume announcement list at: + + http://lists.ubuntu.com/mailman/listinfo/ubuntu-announce + diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/etc-default-apport update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/etc-default-apport --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/etc-default-apport 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/etc-default-apport 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,7 @@ +# set this to 0 to disable apport, or to 1 to enable it +# you can temporarily override this with +# sudo force_start=1 /etc/init.d/apport start +enabled=1 + +# set maximum core dump file size (default: 209715200 bytes == 200 MB) +maxsize=209715200 diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/get_kernel_list.sh update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/get_kernel_list.sh --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/get_kernel_list.sh 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/get_kernel_list.sh 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,29 @@ +#!/bin/sh + +# check for required base-installer dir (this will be get automatically +# from the build-tarball script) +if [ ! -d ./base-installer ]; then + echo "required directory "base-installer" missing" + echo "get it with:" + echo "bzr co --lightweight lp:~ubuntu-core-dev/base-installer/ubuntu base-installer" + exit 1 +fi + +# setup vars +ARCH=$(dpkg --print-architecture) +CPUINFO=/proc/cpuinfo +MACHINE=$(uname -m) +KERNEL_MAJOR=2.6 + +# source arch +. base-installer/kernel/$ARCH.sh + +# get flavour +FLAVOUR=$(arch_get_kernel_flavour) + +# get kernel for flavour +KERNELS=$(arch_get_kernel $FLAVOUR) + +for kernel in $KERNELS; do + echo $kernel +done diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/imported/invoke-rc.d update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/imported/invoke-rc.d --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/imported/invoke-rc.d 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/imported/invoke-rc.d 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,455 @@ +#!/bin/sh +# +# invoke-rc.d.sysvinit - Executes initscript actions +# +# SysVinit /etc/rc?.d version for Debian's sysvinit package +# +# Copyright (C) 2000,2001 Henrique de Moraes Holschuh +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the Free +# Software Foundation; either version 2 of the License, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +# Constants +RUNLEVEL=/sbin/runlevel +POLICYHELPER=/usr/sbin/policy-rc.d +INITDPREFIX=/etc/init.d/ +RCDPREFIX=/etc/rc + +# Options +BEQUIET= +MODE= +ACTION= +FALLBACK= +NOFALLBACK= +FORCE= +RETRY= +RETURNFAILURE= +RC= + +# Shell options +set +e + +dohelp () { + # + # outputs help and usage + # +cat < + +Usage: + invoke-rc.d [options] [extra parameters] + + basename - Initscript ID, as per update-rc.d(8) + action - Initscript action. Known actions are: + start, [force-]stop, restart, + [force-]reload, status + WARNING: not all initscripts implement all of the above actions. + + extra parameters are passed as is to the initscript, following + the action (first initscript parameter). + +Options: + --quiet + Quiet mode, no error messages are generated. + --force + Try to run the initscript regardless of policy and subsystem + non-fatal errors. + --try-anyway + Try to run init script even if a non-fatal error is found. + --disclose-deny + Return status code 101 instead of status code 0 if + initscript action is denied by local policy rules or + runlevel constrains. + --query + Returns one of status codes 100-106, does not run + the initscript. Implies --disclose-deny and --no-fallback. + --no-fallback + Ignores any fallback action requests by the policy layer. + Warning: this is usually a very *bad* idea for any actions + other than "start". + --help + Outputs help message to stdout + +EOF +} + +printerror () { + # + # prints an error message + # $* - error message + # +if test x${BEQUIET} = x ; then + echo `basename $0`: "$*" >&2 +fi +} + +formataction () { + # + # formats a list in $* into $printaction + # for human-friendly printing to stderr + # and sets $naction to action or actions + # +printaction=`echo $* | sed 's/ /, /g'` +if test $# -eq 1 ; then + naction=action +else + naction=actions +fi +} + +querypolicy () { + # + # queries policy database + # returns: $RC = 104 - ok, run + # $RC = 101 - ok, do not run + # other - exit with status $RC, maybe run if $RETRY + # initial status of $RC is taken into account. + # + +policyaction="${ACTION}" +if test x${RC} = "x101" ; then + if test "${ACTION}" = "start" || test "${ACTION}" = "restart" ; then + policyaction="(${ACTION})" + fi +fi + +if test "x${POLICYHELPER}" != x && test -x "${POLICYHELPER}" ; then + FALLBACK=`${POLICYHELPER} ${BEQUIET} ${INITSCRIPTID} "${policyaction}" ${RL}` + RC=$? + formataction ${ACTION} + case ${RC} in + 0) RC=104 + ;; + 1) RC=105 + ;; + 101) if test x${FORCE} != x ; then + printerror Overriding policy-rc.d denied execution of ${printaction}. + RC=104 + fi + ;; + esac + if test x${MODE} != xquery ; then + case ${RC} in + 105) printerror policy-rc.d query returned \"behaviour undefined\", + printerror assuming \"${printaction}\" is allowed. + RC=104 + ;; + 106) formataction ${FALLBACK} + if test x${FORCE} = x ; then + if test x${NOFALLBACK} = x ; then + ACTION="${FALLBACK}" + printerror executing ${naction} \"${printaction}\" instead due to policy-rc.d request. + RC=104 + else + printerror ignoring policy-rc.d fallback request: ${printaction}. + RC=101 + fi + else + printerror ignoring policy-rc.d fallback request: ${printaction}. + RC=104 + fi + ;; + esac + fi + case ${RC} in + 100|101|102|103|104|105|106) ;; + *) printerror WARNING: policy-rc.d returned unexpected error status ${RC}, 102 used instead. + RC=102 + ;; + esac +else + if test x${RC} = x ; then + RC=104 + fi +fi +return +} + +verifyparameter () { + # + # Verifies if $1 is not null, and $# = 1 + # +if test $# -eq 0 ; then + printerror syntax error: invalid empty parameter + exit 103 +elif test $# -ne 1 ; then + printerror syntax error: embedded blanks are not allowed in \"$*\" + exit 103 +fi +return +} + +## +## main +## + +## Verifies command line arguments + +if test $# -eq 0 ; then + printerror syntax error: missing required parameter, --help assumed + dohelp + exit 103 +fi + +state=I +while test $# -gt 0 && test ${state} != III ; do + case "$1" in + --help) dohelp + exit 0 + ;; + --quiet) BEQUIET=--quiet + ;; + --force) FORCE=yes + RETRY=yes + ;; + --try-anyway) + RETRY=yes + ;; + --disclose-deny) + RETURNFAILURE=yes + ;; + --query) MODE=query + RETURNFAILURE=yes + ;; + --no-fallback) + NOFALLBACK=yes + ;; + --*) printerror syntax error: unknown option \"$1\" + exit 103 + ;; + *) case ${state} in + I) verifyparameter $1 + INITSCRIPTID=$1 + ;; + II) verifyparameter $1 + ACTION=$1 + ;; + esac + state=${state}I + ;; + esac + shift +done + +if test ${state} != III ; then + printerror syntax error: missing required parameter + exit 103 +fi + +#NOTE: It may not be obvious, but "$@" from this point on must expand +#to the extra initscript parameters, except inside functions. + +## sanity checks and just-in-case warnings. +case ${ACTION} in + start|stop|force-stop|restart|reload|force-reload|status) + ;; + *) + if test "x${POLICYHELPER}" != x && test -x "${POLICYHELPER}" ; then + printerror action ${ACTION} is unknown, but proceeding anyway. + fi + ;; +esac + +## Verifies if the given initscript ID is known +## For sysvinit, this error is critical +if test ! -f "${INITDPREFIX}${INITSCRIPTID}" ; then + printerror unknown initscript, ${INITDPREFIX}${INITSCRIPTID} not found. + exit 100 +fi + +## Queries sysvinit for the current runlevel +RL=`${RUNLEVEL} | sed 's/.*\ //'` +if test ! $? ; then + printerror "could not determine current runlevel" + if test x${RETRY} = x ; then + exit 102 + fi + RL= +fi + +## Handles shutdown sequences VERY safely +## i.e.: forget about policy, and do all we can to run the script. +## BTW, why the heck are we being run in a shutdown runlevel?! +if test x${RL} = x0 || test x${RL} = x6 ; then + FORCE=yes + RETRY=yes + POLICYHELPER= + BEQUIET= + printerror ---------------------------------------------------- + printerror WARNING: invoke-rc.d called during shutdown sequence + printerror enabling safe mode: initscript policy layer disabled + printerror ---------------------------------------------------- +fi + +## Verifies the existance of proper S??initscriptID and K??initscriptID +## *links* in the proper /etc/rc?.d/ directory +verifyrclink () { + # + # verifies if parameters are non-dangling symlinks + # all parameters are verified + # + doexit= + while test $# -gt 0 ; do + if test ! -L "$1" ; then + printerror not a symlink: $1 + doexit=102 + fi + if test ! -f "$1" ; then + printerror dangling symlink: $1 + doexit=102 + fi + shift + done + if test x${doexit} != x && test x${RETRY} = x; then + if [ -n "$RELEASE_UPGRADE_IN_PROGRESS" ]; then + printerror "release upgrade in progress, error is not fatal" + exit 0 + fi + exit ${doexit} + fi + return 0 +} + +# we do handle multiple links per runlevel +# but we don't handle embedded blanks in link names :-( +if test x${RL} != x ; then + SLINK=`ls -d -Q ${RCDPREFIX}${RL}.d/S[0-9][0-9]${INITSCRIPTID} 2>/dev/null | xargs` + KLINK=`ls -d -Q ${RCDPREFIX}${RL}.d/K[0-9][0-9]${INITSCRIPTID} 2>/dev/null | xargs` + SSLINK=`ls -d -Q ${RCDPREFIX}S.d/S[0-9][0-9]${INITSCRIPTID} 2>/dev/null | xargs` + + verifyrclink ${SLINK} ${KLINK} ${SSLINK} +fi + +testexec () { + # + # returns true if any of the parameters is + # executable (after following links) + # + while test $# -gt 0 ; do + if test -x "$1" ; then + return 0 + fi + shift + done + return 1 +} + +RC= + +### +### LOCAL INITSCRIPT POLICY: Enforce need of a start entry +### in either runlevel S or current runlevel to allow start +### or restart. +### +case ${ACTION} in + start|restart) + if testexec ${SLINK} ; then + RC=104 + elif testexec ${KLINK} ; then + RC=101 + elif testexec ${SSLINK} ; then + RC=104 + fi + ;; +esac + +# test if /etc/init.d/initscript is actually executable +if testexec "${INITDPREFIX}${INITSCRIPTID}" ; then + if test x${RC} = x && test x${MODE} = xquery ; then + RC=105 + fi + + # call policy layer + querypolicy + case ${RC} in + 101|104) + ;; + *) if test x${MODE} != xquery ; then + printerror policy-rc.d returned error status ${RC} + if test x${RETRY} = x ; then + exit ${RC} + else + RC=102 + fi + fi + ;; + esac +else + ### + ### LOCAL INITSCRIPT POLICY: non-executable initscript; deny exec. + ### (this is common sense, actually :^P ) + ### + RC=101 +fi + +## Handles --query +if test x${MODE} = xquery ; then + exit ${RC} +fi + + +setechoactions () { + if test $# -gt 1 ; then + echoaction=true + else + echoaction= + fi +} +getnextaction () { + saction=$1 + shift + ACTION="$@" +} + +## Executes initscript +## note that $ACTION is a space-separated list of actions +## to be attempted in order until one suceeds. +if test x${FORCE} != x || test ${RC} -eq 104 ; then + if testexec "${INITDPREFIX}${INITSCRIPTID}" ; then + RC=102 + setechoactions ${ACTION} + while test ! -z "${ACTION}" ; do + getnextaction ${ACTION} + if test ! -z ${echoaction} ; then + printerror executing initscript action \"${saction}\"... + fi + + "${INITDPREFIX}${INITSCRIPTID}" "${saction}" "$@" && exit 0 + RC=$? + + if test ! -z "${ACTION}" ; then + printerror action \"${saction}\" failed, trying next action... + fi + done + printerror initscript ${INITSCRIPTID}, action \"${saction}\" failed. + if [ -n "$RELEASE_UPGRADE_IN_PROGRESS" ]; then + printerror "release upgrade in progress, error is not fatal" + exit 0 + fi + exit ${RC} + fi + exit 102 +fi + +## Handles --disclose-deny +if test ${RC} -eq 101 && test x${RETURNFAILURE} = x ; then + RC=0 +else + formataction ${ACTION} + printerror initscript ${naction} \"${printaction}\" not executed. +fi + +exit ${RC} diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/imported/invoke-rc.d.diff update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/imported/invoke-rc.d.diff --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/imported/invoke-rc.d.diff 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/imported/invoke-rc.d.diff 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,24 @@ +--- /usr/sbin/invoke-rc.d 2007-08-10 18:15:28.000000000 +0200 ++++ invoke-rc.d 2007-09-07 18:43:48.000000000 +0200 +@@ -314,6 +314,10 @@ + shift + done + if test x${doexit} != x && test x${RETRY} = x; then ++ if [ -n "$RELEASE_UPGRADE_IN_PROGRESS" ]; then ++ printerror "release upgrade in progress, error is not fatal" ++ exit 0 ++ fi + exit ${doexit} + fi + return 0 +@@ -431,6 +435,10 @@ + fi + done + printerror initscript ${INITSCRIPTID}, action \"${saction}\" failed. ++ if [ -n "$RELEASE_UPGRADE_IN_PROGRESS" ]; then ++ printerror "release upgrade in progress, error is not fatal" ++ exit 0 ++ fi + exit ${RC} + fi + exit 102 diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/MetaRelease.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/MetaRelease.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/MetaRelease.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/MetaRelease.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,332 @@ +# MetaRelease.py +# +# Copyright (c) 2004,2005 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import apt_pkg +import ConfigParser +import httplib +import logging +import rfc822 +import os +import socket +import sys +import time +import thread +import urllib2 + +from utils import get_lang, get_dist, get_ubuntu_flavor + +class Dist(object): + def __init__(self, name, version, date, supported): + self.name = name + self.version = version + self.date = date + self.supported = supported + self.releaseNotesURI = None + self.releaseNotesHtmlUri = None + self.upgradeTool = None + self.upgradeToolSig = None + # the server may report that the upgrade is broken currently + self.upgrade_broken = None + +class MetaReleaseCore(object): + """ + A MetaReleaseCore object astracts the list of released + distributions. + """ + + DEBUG = "DEBUG_UPDATE_MANAGER" in os.environ + + # some constants + CONF = "/etc/update-manager/release-upgrades" + CONF_METARELEASE = "/etc/update-manager/meta-release" + + def __init__(self, + useDevelopmentRelease=False, + useProposed=False, + forceLTS=False, + forceDownload=False): + self._debug("MetaRelease.__init__() useDevel=%s useProposed=%s" % (useDevelopmentRelease, useProposed)) + # force download instead of sending if-modified-since + self.forceDownload = forceDownload + # information about the available dists + self.downloading = True + self.new_dist = None + self.current_dist_name = get_dist() + self.no_longer_supported = None + + # default (if the conf file is missing) + self.METARELEASE_URI = "http://changelogs.ubuntu.com/meta-release" + self.METARELEASE_URI_LTS = "http://changelogs.ubuntu.com/meta-release-lts" + self.METARELEASE_URI_UNSTABLE_POSTFIX = "-development" + self.METARELEASE_URI_PROPOSED_POSTFIX = "-development" + + # check the meta-release config first + parser = ConfigParser.ConfigParser() + if os.path.exists(self.CONF_METARELEASE): + try: + parser.read(self.CONF_METARELEASE) + except ConfigParser.Error, e: + sys.stderr.write("ERROR: failed to read '%s':\n%s" % ( + self.CONF_METARELEASE, e)) + return + # make changing the metarelease file and the location + # for the files easy + if parser.has_section("METARELEASE"): + sec = "METARELEASE" + for k in ["URI", + "URI_LTS", + "URI_UNSTABLE_POSTFIX", + "URI_PROPOSED_POSTFIX"]: + if parser.has_option(sec, k): + self._debug("%s: %s " % (self.CONF_METARELEASE, + parser.get(sec,k))) + setattr(self, "%s_%s" % (sec, k), parser.get(sec, k)) + + # check the config file first to figure if we want lts upgrades only + parser = ConfigParser.ConfigParser() + if os.path.exists(self.CONF): + try: + parser.read(self.CONF) + except ConfigParser.Error, e: + sys.stderr.write("ERROR: failed to read '%s':\n%s" % ( + self.CONF, e)) + return + # now check which specific url to use + if parser.has_option("DEFAULT","Prompt"): + type = parser.get("DEFAULT","Prompt").lower() + if (type == "never" or type == "no"): + # nothing to do for this object + # FIXME: what about no longer supported? + self.downloading = False + return + elif type == "lts": + self.METARELEASE_URI = self.METARELEASE_URI_LTS + # needed for the _tryUpgradeSelf() code in DistUpgradeController + if forceLTS: + self.METARELEASE_URI = self.METARELEASE_URI_LTS + # devel and proposed "just" change the postfix + if useDevelopmentRelease: + self.METARELEASE_URI += self.METARELEASE_URI_UNSTABLE_POSTFIX + elif useProposed: + self.METARELEASE_URI += self.METARELEASE_URI_PROPOSED_POSTFIX + + self._debug("metarelease-uri: %s" % self.METARELEASE_URI) + self.metarelease_information = None + if not self._buildMetaReleaseFile(): + self._debug("_buildMetaReleaseFile failed") + return + # we start the download thread here and we have a timeout + thread.start_new_thread(self.download, ()) + #t=thread.start_new_thread(self.check, ()) + + def _buildMetaReleaseFile(self): + # build the metarelease_file name + self.METARELEASE_FILE = os.path.join("/var/lib/update-manager/", + os.path.basename(self.METARELEASE_URI)) + # check if we can write to the global location, if not, + # write to homedir + try: + open(self.METARELEASE_FILE,"a") + except IOError, e: + cache_dir = os.getenv( + "XDG_CACHE_HOME", os.path.expanduser("~/.cache")) + path = os.path.join(cache_dir, 'update-manager-core') + if not os.path.exists(path): + try: + os.mkdir(path) + except OSError, e: + sys.stderr.write("mkdir() failed: '%s'" % e) + return False + self.METARELEASE_FILE = os.path.join(path,os.path.basename(self.METARELEASE_URI)) + # if it is empty, remove it to avoid I-M-S hits on empty file + try: + if os.path.getsize(self.METARELEASE_FILE) == 0: + os.unlink(self.METARELEASE_FILE) + except Exception, e: + pass + return True + + def dist_no_longer_supported(self, dist): + """ virtual function that is called when the distro is no longer + supported + """ + self.no_longer_supported = dist + def new_dist_available(self, dist): + """ virtual function that is called when a new distro release + is available + """ + self.new_dist = dist + + def parse(self): + self._debug("MetaRelease.parse()") + current_dist_name = self.current_dist_name + self._debug("current dist name: '%s'" % current_dist_name) + current_dist = None + dists = [] + + # parse the metarelease_information file + index_tag = apt_pkg.TagFile(self.metarelease_information) + step_result = index_tag.step() + while step_result: + if "Dist" in index_tag.section: + name = index_tag.section["Dist"] + self._debug("found distro name: '%s'" % name) + rawdate = index_tag.section["Date"] + date = time.mktime(rfc822.parsedate(rawdate)) + supported = int(index_tag.section["Supported"]) + version = index_tag.section["Version"] + # add the information to a new date object + dist = Dist(name, version, date,supported) + if "ReleaseNotes" in index_tag.section: + dist.releaseNotesURI = index_tag.section["ReleaseNotes"] + lang = get_lang() + if lang: + dist.releaseNotesURI += "?lang=%s" % lang + if "ReleaseNotesHtml" in index_tag.section: + dist.releaseNotesHtmlUri = index_tag.section["ReleaseNotesHtml"] + query = self._get_release_notes_uri_query_string(dist) + if query: + dist.releaseNotesHtmlUri += query + if "UpgradeTool" in index_tag.section: + dist.upgradeTool = index_tag.section["UpgradeTool"] + if "UpgradeToolSignature" in index_tag.section: + dist.upgradeToolSig = index_tag.section["UpgradeToolSignature"] + if "UpgradeBroken" in index_tag.section: + dist.upgrade_broken = index_tag.section["UpgradeBroken"] + dists.append(dist) + if name == current_dist_name: + current_dist = dist + step_result = index_tag.step() + + # first check if the current runing distro is in the meta-release + # information. if not, we assume that we run on something not + # supported and silently return + if current_dist is None: + self._debug("current dist not found in meta-release file\n") + return False + + # then see what we can upgrade to + upgradable_to = "" + for dist in dists: + if dist.date > current_dist.date: + upgradable_to = dist + self._debug("new dist: %s" % upgradable_to) + break + + # only warn if unsupported and a new dist is available (because + # the development version is also unsupported) + if upgradable_to != "" and not current_dist.supported: + self.dist_no_longer_supported(current_dist) + if upgradable_to != "": + self.new_dist_available(upgradable_to) + + # parsing done and sucessfully + return True + + # the network thread that tries to fetch the meta-index file + # can't touch the gui, runs as a thread + def download(self): + self._debug("MetaRelease.download()") + lastmodified = 0 + req = urllib2.Request(self.METARELEASE_URI) + # make sure that we always get the latest file (#107716) + req.add_header("Cache-Control", "No-Cache") + req.add_header("Pragma", "no-cache") + if os.access(self.METARELEASE_FILE, os.W_OK): + try: + lastmodified = os.stat(self.METARELEASE_FILE).st_mtime + except OSError, e: + pass + if lastmodified > 0 and not self.forceDownload: + req.add_header("If-Modified-Since", time.asctime(time.gmtime(lastmodified))) + try: + # open + uri=urllib2.urlopen(req, timeout=20) + # sometime there is a root owned meta-relase file + # there, try to remove it so that we get it + # with proper permissions + if (os.path.exists(self.METARELEASE_FILE) and + not os.access(self.METARELEASE_FILE,os.W_OK)): + try: + os.unlink(self.METARELEASE_FILE) + except OSError,e: + print "Can't unlink '%s' (%s)" % (self.METARELEASE_FILE,e) + # we may get exception here on e.g. disk full + try: + f=open(self.METARELEASE_FILE,"w+") + for line in uri.readlines(): + f.write(line) + f.flush() + f.seek(0,0) + self.metarelease_information=f + except IOError, e: + pass + uri.close() + # http error + except urllib2.HTTPError, e: + # mvo: only reuse local info on "not-modified" + if e.code == 304 and os.path.exists(self.METARELEASE_FILE): + self._debug("reading file '%s'" % self.METARELEASE_FILE) + self.metarelease_information=open(self.METARELEASE_FILE,"r") + else: + self._debug("result of meta-release download: '%s'" % e) + # generic network error + except (urllib2.URLError, httplib.BadStatusLine, socket.timeout), e: + self._debug("result of meta-release download: '%s'" % e) + # now check the information we have + if self.metarelease_information != None: + self._debug("have self.metarelease_information") + try: + self.parse() + except: + logging.exception("parse failed for '%s'" % self.METARELEASE_FILE) + # no use keeping a broken file around + os.remove(self.METARELEASE_FILE) + # we don't want to keep a meta-release file around when it + # has a "Broken" flag, this ensures we are not bitten by + # I-M-S/cache issues + if self.new_dist and self.new_dist.upgrade_broken: + os.remove(self.METARELEASE_FILE) + else: + self._debug("NO self.metarelease_information") + self.downloading = False + + def _get_release_notes_uri_query_string(self, dist): + q = "?" + # get the lang + lang = get_lang() + if lang: + q += "lang=%s&" % lang + # get the os + os = get_ubuntu_flavor() + q += "os=%s&" % os + # get the version to upgrade to + q += "ver=%s" % dist.version + return q + + def _debug(self, msg): + if self.DEBUG: + sys.stderr.write(msg+"\n") + + +if __name__ == "__main__": + meta = MetaReleaseCore(False, False) + diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/mirrors.cfg update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/mirrors.cfg --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/mirrors.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/mirrors.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,830 @@ +#ubuntu +http://archive.ubuntu.com/ubuntu/ +http://security.ubuntu.com/ubuntu/ +ftp://archive.ubuntu.com/ubuntu/ +ftp://security.ubuntu.com/ubuntu/ +mirror://launchpad.net/ubuntu/+countrymirrors-archive +mirror://mirrors.ubuntu.com/mirrors.txt +http://ports.ubuntu.com/ +ftp://ports.ubuntu.com/ +http://ports.ubuntu.com/ubuntu-ports/ +ftp://ports.ubuntu.com/ubuntu-ports/ +http://old-releases.ubuntu.com/ +ftp://old-releases.ubuntu.com/ +http://extras.ubuntu.com/ubuntu +ftp://extras.ubuntu.com/ubuntu + +#commercial (both urls are valid) +http://archive.canonical.com +http://archive.canonical.com/ubuntu/ + +#commercial-ppas +https://private-ppa.launchpad.net/commercial-ppa-uploaders + + +##===Australia=== +http://ftp.iinet.net.au/pub/ubuntu/ +http://mirror.optus.net/ubuntu/ +http://mirror.isp.net.au/ftp/pub/ubuntu/ +http://www.planetmirror.com/pub/ubuntu/ +http://ftp.filearena.net/pub/ubuntu/ +http://mirror.pacific.net.au/linux/ubuntu/ +ftp://mirror.isp.net.au/pub/ubuntu/ +ftp://ftp.planetmirror.com/pub/ubuntu/ +ftp://ftp.filearena.net/pub/ubuntu/ +ftp://mirror.internode.on.net/pub/ubuntu/ubuntu +ftp://ftp.iinet.net.au/pub/ubuntu/ +ftp://mirror.pacific.net.au/linux/ubuntu/ +rsync://ftp.iinet.net.au/ubuntu/ +rsync://mirror.isp.net.au/ubuntu/ +rsync://rsync.filearena.net/ubuntu/ + +##===Austria=== +http://ubuntu.inode.at/ubuntu/ +http://ubuntu.uni-klu.ac.at/ubuntu/ +http://gd.tuwien.ac.at/opsys/linux/ubuntu/archive/ +ftp://ubuntu.inode.at/ubuntu/ +ftp://ftp.uni-klu.ac.at/linux/ubuntu/ +ftp://gd.tuwien.ac.at/opsys/linux/ubuntu/archive/ +rsync://ubuntu.inode.at/ubuntu/ubuntu/ +rsync://gd.tuwien.ac.at/ubuntu/archive/ + +#===Belgium=== +http://ftp.belnet.be/pub/mirror/ubuntu.com/ +http://ftp.belnet.be/packages/ubuntu/ubuntu/ +http://ubuntu.mirrors.skynet.be/pub/ubuntu.com/ +http://mirror.freax.be/ubuntu/archive.ubuntu.com/ +ftp://ftp.belnet.be/pub/mirror/ubuntu.com/ +ftp://ftp.belnet.be/packages/ubuntu/ubuntu/ +ftp://ubuntu.mirrors.skynet.be/pub/ubuntu.com/ + +#===Brazil=== +http://espelhos.edugraf.ufsc.br/ubuntu/ +http://ubuntu.interlegis.gov.br/archive/ +http://ubuntu.c3sl.ufpr.br/ubuntu/ + +#===Canada=== +ftp://ftp.cs.mun.ca/pub/mirror/ubuntu/ +rsync://rsync.cs.mun.ca/ubuntu/ +http://mirror.cpsc.ucalgary.ca/mirror/ubuntu.com/ +ftp://mirror.cpsc.ucalgary.ca/mirror/ubuntu.com/ +http://mirror.arcticnetwork.ca/pub/ubuntu/packages/ +ftp://mirror.arcticnetwork.ca/pub/ubuntu/packages/ +rsync://rsync.arcticnetwork.ca/ubuntu-packages + +#===China=== +http://archive.ubuntu.org.cn/ubuntu/ +http://debian.cn99.com/ubuntu/ +http://mirror.lupaworld.com/ubuntu/ + +#===CostaRica=== +http://ftp.ucr.ac.cr/ubuntu/ +ftp://ftp.ucr.ac.cr/pub/ubuntu/ + +#===CzechRepublic=== +http://archive.ubuntu.cz/ubuntu/ +ftp://archive.ubuntu.cz/ubuntu/ +http://ubuntu.supp.name/ubuntu/ + +#===Denmark=== +http://mirrors.dk.telia.net/ubuntu/ +http://mirrors.dotsrc.org/ubuntu/ +http://klid.dk/homeftp/ubuntu/ +ftp://mirrors.dk.telia.net/ubuntu/ +ftp://mirrors.dotsrc.org/ubuntu/ +ftp://klid.dk/ubuntu/ + +#===Estonia=== +http://ftp.estpak.ee/pub/ubuntu/ +ftp://ftp.estpak.ee/pub/ubuntu/ + +#===Finland=== +http://www.nic.funet.fi/pub/mirrors/archive.ubuntu.com/ +ftp://ftp.funet.fi/pub/mirrors/archive.ubuntu.com/ + +#===France=== +http://mir1.ovh.net/ubuntu/ubuntu/ +http://fr.archive.ubuntu.com/ubuntu/ +http://ftp.u-picardie.fr/pub/ubuntu/ubuntu/ +http://ftp.oleane.net/pub/ubuntu/ +ftp://mir1.ovh.net/ubuntu/ubuntu/ +ftp://fr.archive.ubuntu.com/ubuntu/ +ftp://ftp.u-picardie.fr/pub/ubuntu/ubuntu/ +ftp://ftp.proxad.net/mirrors/ftp.ubuntu.com/ubuntu/ +ftp://ftp.oleane.net/pub/ubuntu/ +rsync://mir1.ovh.net/ubuntu/ubuntu/ + +#===Germany=== +http://debian.charite.de/ubuntu/ +http://ftp.inf.tu-dresden.de/os/linux/dists/ubuntu/ +http://www.artfiles.org/ubuntu.com +http://ftp.rz.tu-bs.de/pub/mirror/ubuntu-packages/ +http://ftp.join.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/ +http://www.ftp.uni-erlangen.de/pub/mirrors/ubuntu/ +http://debian.tu-bs.de/ubuntu/ +ftp://debian.charite.de/ubuntu/ +ftp://ftp.fu-berlin.de/linux/ubuntu/ +ftp://ftp.rz.tu-bs.de/pub/mirror/ubuntu-packages/ +ftp://ftp.join.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/ +ftp://ftp.uni-erlangen.de/pub/mirrors/ubuntu/ +ftp://debian.tu-bs.de/ubuntu/ +rsync://ftp.inf.tu-dresden.de/ubuntu/ +rsync://ftp.rz.tu-bs.de/pub/mirror/ubuntu-packages/ +rsync://ftp.join.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/ +rsync://debian.tu-bs.de/ubuntu/ + +#===Greece=== +http://ftp.ntua.gr/pub/linux/ubuntu/ +ftp://ftp.ntua.gr/pub/linux/ubuntu/ + +#===Hungary=== +http://ftp.kfki.hu/linux/ubuntu/ +ftp://ftp.kfki.hu/pub/linux/ubuntu/ +ftp://ftp.fsn.hu/pub/linux/distributions/ubuntu/ + +#===Indonesia=== +http://komo.vlsm.org/ubuntu/ +http://kambing.vlsm.org/ubuntu/ +rsync://komo.vlsm.org/ubuntu/ +rsync://kambing.vlsm.org/ubuntu/ + +#===Iceland=== +http://ubuntu.odg.cc/ +http://ubuntu.lhi.is/ + +#===Ireland=== +http://ftp.esat.net/mirrors/archive.ubuntu.com/ +http://ftp.heanet.ie/pub/ubuntu/ +ftp://ftp.esat.net/mirrors/archive.ubuntu.com/ +ftp://ftp.heanet.ie/pub/ubuntu/ +rsync://ftp.esat.net/mirrors/archive.ubuntu.com/ +rsync://ftp.heanet.ie/pub/ubuntu/ + +#===Italy=== +http://ftp.linux.it/ubuntu/ +http://na.mirror.garr.it/mirrors/ubuntu-archive/ +ftp://ftp.linux.it/ubuntu/ +ftp://na.mirror.garr.it/mirrors/ubuntu-archive/ +rsync://na.mirror.garr.it/ubuntu-archive/ + +#===Japan=== +http://ubuntu.mithril-linux.org/archives/ + +#===Korea=== +http://mirror.letsopen.com/os/ubuntu/ +ftp://mirror.letsopen.com/os/ubuntu/ +http://ftp.kaist.ac.kr/pub/ubuntu/ +ftp://ftp.kaist.ac.kr/pub/ubuntu/ +rsync://ftp.kaist.ac.kr/ubuntu/ + +#===Latvia=== +http://ubuntu-arch.linux.edu.lv/ubuntu/ + +#===Lithuania=== +http://ftp.litnet.lt/pub/ubuntu/ +ftp://ftp.litnet.lt/pub/ubuntu/ + +#===Namibia=== +ftp://ftp.polytechnic.edu.na/pub/ubuntulinux/ + +#===Netherlands=== +http://ftp.bit.nl/ubuntu/ +http://ubuntu.synssans.nl +ftp://ftp.bit.nl/ubuntu/ +rsync://ftp.bit.nl/ubuntu/ + +#===NewZealand=== +ftp://ftp.citylink.co.nz/ubuntu/ + +#===Nicaragua=== +http://www.computacion.uni.edu.ni/iso/ubuntu/ + +#===Norway=== +http://mirror.trivini.no/ubuntu +ftp://mirror.trivini.no/ubuntu +ftp://ftp.uninett.no/linux/ubuntu/ +rsync://ftp.uninett.no/ubuntu/ + +#===Poland=== +http://ubuntulinux.mainseek.com/ubuntu/ +http://ubuntu.task.gda.pl/ubuntu/ +ftp://ubuntu.task.gda.pl/ubuntu/ +rsync://ubuntu.task.gda.pl/ubuntu/ + +#===Portugal=== +ftp://ftp.rnl.ist.utl.pt/ubuntu/ +http://darkstar.ist.utl.pt/ubuntu/archive/ +http://ubuntu.dcc.fc.up.pt/ + +#===Romania=== +http://ftp.iasi.roedu.net/mirrors/ubuntulinux.org/ubuntu/ +ftp://ftp.iasi.roedu.net/mirrors/ubuntulinux.org/ubuntu/ +rsync://ftp.iasi.roedu.net/ubuntu/ +http://ftp.lug.ro/ubuntu/ +ftp://ftp.lug.ro/ubuntu/ + +#===Russia=== +http://debian.nsu.ru/ubuntu/ +ftp://debian.nsu.ru/ubuntu/ +ftp://ftp.chg.ru/pub/Linux/ubuntu/archive +http://ftp.chg.ru/pub/Linux/ubuntu/archive + +#===SouthAfrica=== +ftp://ftp.is.co.za/ubuntu/ +ftp://ftp.leg.uct.ac.za/pub/linux/ubuntu/ +ftp://ftp.sun.ac.za/ftp/ubuntu/ + +#===Spain=== +ftp://ftp.um.es/mirror/ubuntu/ +ftp://ftp.ubuntu-es.org/ubuntu/ + +#===Sweden=== +http://ftp.acc.umu.se/mirror/ubuntu/ +ftp://ftp.se.linux.org/pub/Linux/distributions/ubuntu/ + +#===Switzerland=== +http://mirror.switch.ch/ftp/mirror/ubuntu/ +ftp://mirror.switch.ch/mirror/ubuntu/ + +#===Taiwan=== +http://apt.ubuntu.org.tw/ubuntu/ +ftp://apt.ubuntu.org.tw/ubuntu/ +http://apt.nc.hcc.edu.tw/pub/ubuntu/ +http://ubuntu.csie.ntu.edu.tw/ubuntu/ +ftp://apt.nc.hcc.edu.tw/pub/ubuntu/ +ftp://os.nchc.org.tw/ubuntu/ +ftp://ftp.ee.ncku.edu.tw/pub/ubuntu/ +rsync://ftp.ee.ncku.edu.tw/ubuntu/ +http://ftp.cse.yzu.edu.tw/ftp/Linux/Ubuntu/ubuntu/ +ftp://ftp.cse.yzu.edu.tw/Linux/Ubuntu/ubuntu/ + +#===Turkey=== +http://godel.cs.bilgi.edu.tr/mirror/ubuntu/ +ftp://godel.cs.bilgi.edu.tr/ubuntu/ + +#===UnitedKingdom=== +http://www.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/ +ftp://ftp.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/ +http://www.mirror.ac.uk/mirror/archive.ubuntu.com/ubuntu/ +ftp://ftp.mirror.ac.uk/mirror/archive.ubuntu.com/ubuntu/ +rsync://rsync.mirrorservice.org/archive.ubuntu.com/ubuntu/ +http://ubuntu.blueyonder.co.uk/archive/ +ftp://ftp.blueyonder.co.uk/sites/ubuntu/archive/ + +#===UnitedStates=== +http://mirror.cs.umn.edu/ubuntu/ +http://lug.mtu.edu/ubuntu/ +http://mirror.clarkson.edu/pub/distributions/ubuntu/ +http://ubuntu.mirrors.tds.net/ubuntu/ +http://www.opensourcemirrors.org/ubuntu/ +http://ftp.ale.org/pub/mirrors/ubuntu/ +http://ubuntu.secs.oakland.edu/ +http://mirror.mcs.anl.gov/pub/ubuntu/ +http://mirrors.cat.pdx.edu/ubuntu/ +http://ubuntu.cs.utah.edu/ubuntu/ +http://ftp.ussg.iu.edu/linux/ubuntu/ +http://mirrors.xmission.com/ubuntu/ +http://ftp.osuosl.org/pub/ubuntu/ +http://mirrors.cs.wmich.edu/ubuntu/ +ftp://ftp.osuosl.org/pub/ubuntu/ +ftp://mirrors.xmission.com/ubuntu/ +ftp://ftp.ussg.iu.edu/linux/ubuntu/ +ftp://mirror.clarkson.edu/pub/distributions/ubuntu/ +ftp://ubuntu.mirrors.tds.net/ubuntu/ +ftp://mirror.mcs.anl.gov/pub/ubuntu/ +ftp://mirrors.cat.pdx.edu/ubuntu/ +ftp://ubuntu.cs.utah.edu/pub/ubuntu/ubuntu/ +rsync://ubuntu.cs.utah.edu/ubuntu/ +rsync://mirrors.cat.pdx.edu/ubuntu/ +rsync://mirror.mcs.anl.gov/ubuntu/ +rsync://ubuntu.mirrors.tds.net/ubuntu/ +rsync://mirror.cs.umn.edu/ubuntu/ + +http://free.nchc.org.tw/ubuntu +http://br.archive.ubuntu.com/ubuntu/ +http://es.archive.ubuntu.com/ubuntu/ +ftp://ftp.free.fr/mirrors/ftp.ubuntu.com/ubuntu/ +http://ie.archive.ubuntu.com/ubuntu/ +http://mirror.anl.gov/pub/ubuntu/ +http://se.archive.ubuntu.com/ubuntu/ +http://ubuntu.intergenia.de/ubuntu/ +http://ubuntu.linux-bg.org/ubuntu/ +http://ubuntu.ynet.sk/ubuntu/ +http://nl.archive.ubuntu.com/ubuntu/ +http://cz.archive.ubuntu.com/ubuntu/ +http://de.archive.ubuntu.com/ubuntu/ +http://dk.archive.ubuntu.com/ubuntu/ +http://ftp.estpak.ee/ubuntu/ +http://ftp.crihan.fr/ubuntu/ +http://ftp.cse.yzu.edu.tw/pub/Linux/Ubuntu/ubuntu/ +http://ftp.dei.uc.pt/pub/linux/ubuntu/archive/ +http://ftp.duth.gr/pub/ubuntu/ +http://ftp.halifax.rwth-aachen.de/ubuntu/ +http://ftp.iinet.net.au/pub/ubuntu +ftp://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu +http://ftp.stw-bonn.de/ubuntu/ +http://ftp.tiscali.nl/ubuntu/ +ftp://ftp.tudelft.nl/pub/Linux/archive.ubuntu.com/ +http://ftp.twaren.net/Linux/Ubuntu/ubuntu/ +http://ftp.uni-kl.de/pub/linux/ubuntu/ +http://ftp.uninett.no/ubuntu/ +http://ftp.usf.edu/pub/ubuntu/ +http://kr.archive.ubuntu.com/ubuntu/ +http://gr.archive.ubuntu.com/ubuntu/ +http://gulus.USherbrooke.ca/ubuntu/ +http://mirror.nttu.edu.tw/ubuntu/ +http://mirrors.easynews.com/linux/ubuntu/ +http://mirrors.kernel.org/ubuntu/ +http://ftp.oleane.net/ubuntu/ +http://yu.archive.ubuntu.com/ubuntu/ +http://sft.if.usp.br/ubuntu/ +http://ubuntu-archive.datahop.it/ubuntu/ +http://hr.archive.ubuntu.com/ubuntu/ +http://ubuntu.mirrors.tds.net/pub/ubuntu/ +http://ubuntu.fastbull.org/ubuntu/ +http://ubuntu.indika.net.id/ubuntu/ +http://ubuntu.tiscali.nl/ +http://www.gtlib.gatech.edu/pub/ubuntu/ +http://archive.ubuntu.com.ba/ubuntu/ +http://archive.ubuntu.uasw.edu/ +http://ubuntu.ipacct.com/ubuntu/ +http://bw.archive.ubuntu.com/ubuntu/ +http://ubuntu.cn99.com/ubuntu/ +http://ubuntuarchive.is.co.za/ubuntu/ +http://ftp.dateleco.es/ubuntu/ +http://ftp.ds.karen.hj.se/pub/os/linux/ubuntu/ +http://ftp.fsn.hu/pub/linux/distributions/ubuntu +http://ftp.hosteurope.de/mirror/archive.ubuntu.com/ +http://ftp.u-picardie.fr/mirror/ubuntu/ubuntu/ +http://ftp.gil.di.uminho.pt/ubuntu/ +http://klid.dk/ftp/ubuntu/ +http://mirror.cc.columbia.edu/pub/linux/ubuntu/archive/ +http://mirror.imbrandon.com/ubuntu/ +http://mosel.estg.ipleiria.pt/mirror/distros/ubuntu/archive/ +http://neacm.fe.up.pt/ubuntu/ +http://packages.midian.hu//pub/linux/distributions/ubuntu +http://tw.archive.ubuntu.com/ubuntu/ +http://ftp.ticklers.org/archive.ubuntu.org/ubuntu/ +http://ubuntu.mirror.ac.za/ubuntu-archive/ +http://ubuntu.mithril-linux.org/archives +http://ubuntu.virginmedia.com/archive/ +http://ubuntu.univ-nantes.fr/ubuntu/ +http://ftp.vectranet.pl/ubuntu/ +http://ftp.iitm.ac.in/ubuntu +http://mirror.lcsee.wvu.edu/ubuntu/ +http://ubuntu.cs.uaf.edu/ubuntu/ +http://cl.archive.ubuntu.com/ubuntu/ +http://cudlug.cudenver.edu/ubuntu/ +http://debian.linux.org.tw/ubuntu/ +http://ftp.belnet.be/linux/ubuntu/ubuntu/ +http://ftp.chg.ru/pub/Linux/ubuntu/archive/ +http://ftp.citylink.co.nz/ubuntu/ +http://ftp.ecc.u-tokyo.ac.jp/ubuntu/ +http://ftp.gui.uva.es/sites/ubuntu.com/ubuntu/ +http://ftp.linux.edu.lv/ubuntu/ +http://ftp.lug.ro/ubuntu/ +ftp://ftp.man.szczecin.pl/pub/Linux/ubuntu/ +http://ftp.port80.se/ubuntu/ +http://ftp-stud.fht-esslingen.de/Mirrors/ubuntu/ +http://ftp.tu-chemnitz.de/pub/linux/ubuntu/ +http://ftp.unina.it/pub/linux/distributions/ubuntu/ +ftp://ftpserv.tudelft.nl/pub/Linux/archive.ubuntu.com/ +http://mirror.etf.bg.ac.yu/distributions/ubuntu/ubuntu-archive/ +http://mirror.lupaworld.com/ubuntu/archive/ +http://mirror.uni-c.dk/ubuntu/ +http://mirror2.etf.bg.ac.yu/distributions/ubuntu/ubuntu-archive/ +http://mirrors.nic.funet.fi/ubuntu/ +http://snert.mi.hs-heilbronn.de/pub/ubuntu/ubuntu/ +http://ubuntu.eriders.ge/ubuntu/ +http://ubuntu.lhi.is/ubuntu/ +http://ubuntu.mirror.rafal.ca/ubuntu/ +http://ubuntu.mirrors.skynet.be/pub/ubuntu.com/ubuntu/ +http://ubuntu.sh.cvut.cz/ +http://ubuntu.snet.uz/ubuntu/ +http://ftp.leg.uct.ac.za/pub/linux/ubuntu/ +http://archive.mnosi.org/ubuntu/ +http://free.nchc.org.tw/ubuntu/ +http://carroll.cac.psu.edu/pub/linux/distributions/ubuntu/ +http://ftp.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/ +http://ftp.fsn.hu/pub/linux/distributions/ubuntu/ +http://packages.midian.hu//pub/linux/distributions/ubuntu/ +http://ftp.iitm.ac.in/ubuntu/ +http://ftp.tuke.sk/ubuntu/ +http://ubuntu.mirror.frontiernet.net/ubuntu/ +http://san.csc.calpoly.edu/ubuntu/ubuntu/ +http://ftp.freepark.org/pub/linux/distributions/ubuntu/ +ftp://ftp.linux.org.tr/pub/ubuntu/ +http://mirror.ox.ac.uk/sites/archive.ubuntu.com/ubuntu/ +http://mirror.rootguide.org/ubuntu/ +http://ubuntu.csie.nctu.edu.tw/ubuntu/ +http://mirror.gamais.itb.ac.id/ubuntu/ +http://th.archive.ubuntu.com/ubuntu/ +http://ubuntu.uz/ubuntu/ +http://ubuntu.org.ua/ubuntu/ +http://ftp-stud.hs-esslingen.de/ubuntu/ +http://ftp.belnet.be/pub/mirror/ubuntu.com/ubuntu/ +http://ftp.daum.net/ubuntu/ +http://ftp.netspace.net.au/pub/ubuntu/ +http://ftp.pwr.wroc.pl/ubuntu/ +http://ftp.science.nus.edu.sg/ubuntu/ +http://godel.cs.bilgi.edu.tr/ubuntu/ +http://mirror.hgkz.ch/ubuntu/ +http://mirrors.ccs.neu.edu/archive.ubuntu.com/ +http://tezcatl.fciencias.unam.mx/ubuntu/ +http://mirror.grapevine.com.au/ubuntu/archive/ +http://mirror.utdlug.org/linux/distributions/ubuntu/packages/ +http://mt.archive.ubuntu.com/ubuntu/ +http://ftp.yz.yamagata-u.ac.jp/pub/linux/ubuntu/archives/ +ftp://ftp.mipt.ru/mirror/ubuntu/ +http://nl2.archive.ubuntu.com/ubuntu/ +http://ftp.cw.net/ubuntu/ +http://ftp.udc.es/ubuntu/ +http://sunsite.informatik.rwth-aachen.de/ftp/pub/Linux/ubuntu/ubuntu/ +http://ubuntu.otenet.gr/ +http://wwwftp.ciril.fr/pub/linux/ubuntu/archives/ +http://ftp.freepark.org/ubuntu/ +http://mir1.ovh.net/ubuntu/ +http://ftp.astral.ro/mirrors/ubuntu.com/archive/ +http://ubuntu.compuporter.net/archive/ +http://mirrors.shlug.org/ubuntu/ +http://ubuntu.mls.nc/ubuntu/ +http://ftp.jaist.ac.jp/pub/Linux/ubuntu/ +http://nz2.archive.ubuntu.com/ubuntu/ +http://ubuntu.grn.cat/ubuntu/ +http://ubuntu.positive-internet.com/ubuntu/ +http://ubuntu-archive.polytechnic.edu.na/ +http://ubuntu.media.mit.edu/ubuntu/ +http://ftp.ncnu.edu.tw/Linux/ubuntu/ubuntu/ +http://ftp.iut-bm.univ-fcomte.fr/ubuntu/ +http://esda.wu-wien.ac.at/pub/ubuntu-archive/ +http://mirror.aarnet.edu.au/pub/ubuntu/archive/ +http://ftp.hostrino.com/pub/ubuntu/archive/ +http://mirror.internode.on.net/pub/ubuntu/ubuntu/ +http://mirror.yandex.ru/ubuntu/ +http://mirror.zhdk.ch/ubuntu/ +http://gulus.usherbrooke.ca/ubuntu/ +http://mirrors.rit.edu/ubuntu/ +http://ftp.tecnoera.com/ubuntu/ +http://ftp5.gwdg.de/pub/linux/debian/ubuntu/ +http://mirror.csclub.uwaterloo.ca/ubuntu/ +http://dl2.foss-id.web.id/ubuntu/ +http://debian.nctu.edu.tw/ubuntu/ +http://rs.archive.ubuntu.com/ubuntu/ +http://ubuntu.apt-get.eu/ubuntu/ +http://ftp.energotel.sk/pub/linux/ubuntu/ +http://ubuntu.intuxication.net/ubuntu/ +http://www.las.ic.unicamp.br/pub/ubuntu/ +http://mirror.3fl.net.au/ubuntu/ +http://ftp.belnet.be/mirror/ubuntu.com/ubuntu/ +ftp://mirrors.dotsrc.org/ubuntu-cd/ +http://mirror.clarkson.edu/pub/ubuntu/ +http://public.planetmirror.com/pub/ubuntu/archive/ +http://ubuntu.interlegis.gov.br/ubuntu/ +http://archive.ubuntu.mnosi.org/ubuntu/ +http://ubuntu-archive.polytechnic.edu.na/ubuntu/ +http://nz.archive.ubuntu.com/ubuntu/ +http://ftp.corbina.net/pub/Linux/ubuntu/ +http://nl3.archive.ubuntu.com/ubuntu/ +http://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/ +ftp://ftp.corbina.net/pub/Linux/ubuntu/ +http://ftp.wcss.pl/ubuntu/ +ftp://swtsrv.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/ +http://ubuntutym.u-toyama.ac.jp/ubuntu/ +http://ftp.dat.etsit.upm.es/ubuntu/ +http://mirrors.acm.jhu.edu/ubuntu/ +http://ubuntu-archive.patan.com.ar/ +http://mirror.fslutd.org/linux/distributions/ubuntu/packages/ +http://swtsrv.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/ +http://ubuntu.mirror.cambrium.nl/ubuntu/ +http://ftp.vxu.se/ubuntu/ +ftp://news.chu.edu.tw/Linux/Ubntu/packages/ +http://mirrors.jgi-psf.org/ubuntu/ +http://ftp.df.lth.se/ubuntu/ +http://mirror1.lockdownhosting.com/ubuntu/ +http://ubuntu-ashisuto.ubuntulinux.jp/ubuntu/ +http://ubuntu-mirror.cs.colorado.edu/ubuntu/ +http://ubuntu.gnu.gen.tr/ubuntu/ +http://ubuntu.mirrors.isu.net.sa/ubuntu/ +http://ubuntu.osuosl.org/ubuntu/ +http://ubuntu.qatar.cmu.edu/ubuntu/ +http://ubuntu.retrosnub.co.uk/ +http://archive.ubuntu-rocks.org/ubuntu/ +http://ftp.utexas.edu/ubuntu/ +http://piotrkosoft.net/pub/mirrors/ubuntu/ +http://ubuntu.univ-reims.fr/ubuntu/ +ftp://ftp.chu.edu.tw/Linux/Ubntu/packages/ +http://archive.linux.duke.edu/ubuntu/ +http://mirrors.us.kernel.org/ubuntu/ +http://mirrors3.kernel.org/ubuntu/ +http://mirrors4.kernel.org/ubuntu/ +http://softlibre.unizar.es/ubuntu/archive/ +http://gpl.savoirfairelinux.net/pub/mirrors/ubuntu/ +http://ubuntu.utalca.cl/ +http://giano.com.dist.unige.it/ubuntu/ +http://sk.archive.ubuntu.com/ubuntu/ +http://mirrors.nl.eu.kernel.org/ubuntu/ +http://mirrors.se.eu.kernel.org/ubuntu/ +http://ftp.sunet.se/pub/Linux/distributions/ubuntu/ubuntu/ +http://ftp.antik.sk/ubuntu/ +ftp://ftp.chu.edu.tw/Linux/Ubuntu/packages/ +http://ftp.klid.dk/ftp/ubuntu/ +http://ike.egr.msu.edu/pub/ubuntu/archive/ +http://mirror.mirohost.net/ubuntu/ +http://ubuntu.nano-box.net/ubuntu/ +http://mirror.powermongo.org/ubuntu/ +http://ftp-mirror.stu.edu.tw/ubuntu/ +http://mirrors.nfsi.pt/ubuntu/ +http://ftp.astral.ro/mirrors/ubuntu.com/ubuntu/ +http://ftp.caliu.cat/pub/distribucions/ubuntu/archive/ +http://gaosu.rave.org/ubuntu/ +http://mirror.cpsc.ucalgary.ca/mirror/ubuntu.com/packages/ +http://astromirror.uchicago.edu/ubuntu/ +http://mirrors.xservers.ro/ubuntu/ +http://mirror.its.uidaho.edu/pub/ubuntu/ +http://samaritan.ucmerced.edu/ubuntu/ +http://ftp.free.org/mirrors/archive.ubuntu.com/ubuntu/ +http://fileserver.uniroma1.it/ubuntu/ +http://ftp.cvut.cz/ubuntu/ +http://ftp.riken.jp/Linux/ubuntu/ +http://ftp.telfort.nl/ubuntu/ +http://ubuntu.indika.net.id/ +http://ubuntu.secsup.org/ +http://ubuntu.wallawalla.edu/ubuntu/ +http://mirror.isoc.org.il/pub/ubuntu/ +http://ubuntu.dormforce.net/ubuntu/ +http://89.148.222.236/ubuntu/ +http://ubuntu-archive.mirrors.proxad.net/ubuntu/ +http://mirror.rol.ru/ubuntu/ +http://ftp.caliu.info/pub/distribucions/ubuntu/ubuntu/ +http://mirror.ousli.org/ubuntu/ +http://ubuntu.patan.com.ar/ubuntu/ +http://archive.ubuntu.mirror.dkm.cz/ubuntu/ +http://ftp.mtu.ru/pub/ubuntu/archive/ +http://ubuntu.stu.edu.tw/ubuntu/ +http://archive.mmu.edu.my/ubuntu/ +http://ftp.metu.edu.tr/ubuntu/ +http://mirror.wff-gaming.de/ubuntu/ +http://repository.linux.pf/ubuntu/ +http://ubuntu.mmu.edu.my/ubuntu/ +http://mirror.umoss.org/ubuntu/ +http://mirror.oscc.org.my/ubuntu/ +http://mirror.globo.com/ubuntu/archive/ +http://sunsite.rediris.es/mirror/ubuntu-archive/ +http://linux.org.by/ubuntu/ +http://mirror.nus.edu.sg/ubuntu/ +http://www.ftp.ne.jp/Linux/packages/ubuntu/archive/ +http://mirror.math.ucdavis.edu/ubuntu/ +http://archive.mitra.net.np/ubuntu/ +http://pf.archive.ubuntu.com/ubuntu/ +http://mirror-fpt-telecom.fpt.net/ubuntu/ +http://ftp.linux.org.tr/ubuntu/ +http://mirrors.cytanet.com.cy/linux/ubuntu-archive/ +http://mirrors.cytanet.com.cy/linux/ubuntu/archive/ +ftp://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu/ +http://mirror.cps.cmich.edu/ubuntu/ +http://mirrors.hitsol.net/ubuntu/ +http://ubuntu.hitsol.net/ubuntu/ +http://ubuntu.mirror.iweb.ca/ +http://ubuntu.mirror.su.se/ubuntu/ +http://ubuntu.oss.eznetsols.org/ubuntu/ +http://mirrors.portafixe.com/ubuntu/archive/ +http://ubuntu.lagis.at/ubuntu/ +http://mirror.gnucv.cl/ubuntu/ +http://russell.cs.bilgi.edu.tr/ubuntu/ +ftp://ftp.chu.edu.tw/Linux/Ubuntu/archives/ +http://mirrors.ccs.neu.edu/ubuntu/ +http://ubuntu-mirror.sit.kmutt.ac.th/archive/ +http://ubuntu.ictvalleumbra.it/ubuntu/ +http://mirror.arlug.ro/pub/ubuntu/ubuntu/ +http://ubuntuarchive.eweka.nl/ubuntu/ +http://ftp.cs.pu.edu.tw/Linux/Ubuntu/ubuntu/ +http://ftp.ds.karen.hj.se/ubuntu/ +http://kebo.vlsm.org/ubuntu/ +http://mirror1.ku.ac.th/ubuntu/ +http://peloto.pantuflo.es/ubuntu/ +http://ucho.ignum.cz/ubuntu/ +http://archive.monubuntu.fr/ +http://mirror.korea.ac.kr/ubuntu/ +http://ubuntu2.cica.es/ubuntu/ +http://ftp.sh.cvut.cz/MIRRORS/ubuntu/ +http://archive.ubuntu.mirror.dkm.cz/ +http://ftp.tudelft.nl/archive.ubuntu.com/ +http://mirror.netspace.net.au/pub/ubuntu/archive/ +http://mirror.uoregon.edu/ubuntu/archives/ +http://ubuntu.mirror.garr.it/mirrors/ubuntu-archive/ +http://ubuntu-archive.sit.kmutt.ac.th/ +http://mirror.files.bigpond.com/ +http://ubuntu-archives.mirror.nexicom.net/ +http://ftp.acc.umu.se/ubuntu/ +http://ftp.snt.utwente.nl/pub/os/linux/ubuntu/ +http://mirror.i3d.net/pub/ubuntu/ +http://mirror.internetone.it/ubuntu-archive/ +http://mirror.pnl.gov/ubuntu/ +http://ubuntu.idrepo.or.id/ubuntu/ +http://ubuntu.laps.ufpa.br/ubuntu/ +http://ubuntu.mirror.tudos.de/ubuntu/ +http://mirror.nl.leaseweb.net/ubuntu/ +http://mirror.us.leaseweb.net/ubuntu/ +http://bouyguestelecom.ubuntu.lafibre.info/ubuntu/ +http://ftp.byfly.by/ubuntu/ +http://ftp.sunet.se/pub/os/Linux/distributions/ubuntu/ubuntu/ +http://mirror.datacenter.by/ubuntu/ +http://mirror.de.leaseweb.net/ubuntu/ +http://mirror.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/ +http://mirror.lstn.net/ubuntu/ +http://mirror.lzu.edu.cn/ubuntu/ +http://mirror.netcologne.de/ubuntu/ +http://mirror.serverloft.eu/ubuntu/ubuntu/ +http://mirrors.adnettelecom.ro/ubuntu/ +http://mirror.ovh.net/ubuntu/ +http://ubuntu.cica.es/ubuntu/ +http://ubuntu.mirror.pop-sc.rnp.br/ubuntu/ +http://ubuntu.ufba.br/ubuntu/ +http://76.73.4.58/ubuntu/ +http://artfiles.org/ubuntu.com/ +http://cesium.di.uminho.pt/pub/ubuntu-archive/ +http://debian.informatik.uni-erlangen.de/ubuntu/ +http://download.nus.edu.sg/mirror/ubuntu/ +http://ftp.availo.se/ubuntu/ +http://archive.mirror.blix.eu/ubuntu/ +ftp://ftp.csie.chu.edu.tw/Ubuntu/archive/ +http://archive.ubuntumirror.dei.uc.pt/ubuntu/ +http://ftp.egr.msu.edu/pub/ubuntu/archive/ +http://ftp.icm.edu.pl/pub/Linux/ubuntu/ +http://ftp.info.uvt.ro/ubuntu/ +http://ftp.lysator.liu.se/ubuntu/ +http://ftp.nsysu.edu.tw/Ubuntu/ubuntu/ +http://ftp.portlane.com/ubuntu/ +http://ftp.rnl.ist.utl.pt/pub/ubuntu/archive/ +http://ftp.roedu.net/mirrors/ubuntulinux.org/ubuntu/ +http://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu/ +http://ubuntu.saix.net/ubuntu-archive/ +http://ftp.tcc.edu.tw/Linux/ubuntu/ +http://ftp.telfort.nl/pub/mirror/ubuntu/ +http://ftp.tku.edu.tw/ubuntu/ +http://ftp.tsukuba.wide.ad.jp/Linux/ubuntu/ +http://ftp.tu-chemnitz.de/pub/linux/ubuntu-ports/ +http://ftp.tu-ilmenau.de/mirror/ubuntu/ +http://ftp.uni-erlangen.de/mirrors/ubuntu/ +http://kambing.ui.ac.id/ubuntu/ +http://mirror.as29550.net/archive.ubuntu.com/ +http://mirror.bauhuette.fh-aachen.de/ubuntu/ +http://mirror.bytemark.co.uk/ubuntu/ +http://mirror.clibre.uqam.ca/ubuntu/ +http://mirror.corbina.net/ubuntu/ +http://mirror.cse.iitk.ac.in/ubuntu/ +http://mirror.dattobackup.com/ubuntu/ +http://mirror.ihug.co.nz/ubuntu/ +http://mirror.its.sfu.ca/mirror/ubuntu/ +http://mirror.kavalinux.com/ubuntu/ +http://mirror.kku.ac.th/ubuntu/ +http://mirror.krystal.co.uk/ubuntu/ +http://mirror.metrocast.net/ubuntu/ +http://mirror.netlinux.cl/ubuntu/ +http://mirror.netspace.net.au/pub/ubuntu/ +http://mirror.neu.edu.cn/ubuntu/ +http://mirror.peer1.net/ubuntu/ +http://mirror.soften.ktu.lt/ubuntu/ +http://mirror.sov.uk.goscomb.net/ubuntu/ +http://mirror.steadfast.net/ubuntu/ +http://mirror.symnds.com/ubuntu/ +http://mirror.team-cymru.org/ubuntu/ +http://mirror.telepoint.bg/ubuntu/ +http://mirror.timeweb.ru/ubuntu/ +http://mirror.umd.edu/ubuntu/ +http://mirror.unesp.br/ubuntu/ +http://mirror.unix-solutions.be/ubuntu/ +http://mirror.uoregon.edu/ubuntu/ +http://mirror01.th.ifl.net/ubuntu/ +http://mirror2.corbina.ru/ubuntu/ +http://mirrors.163.com/ubuntu/ +http://mirrors.accretive-networks.net/ubuntu/ +http://mirrors.coopvgg.com.ar/ubuntu/ +http://mirrors.coreix.net/ubuntu/ +http://mirrors.ecvps.com/ubuntu/ +http://mirrors.fe.up.pt/ubuntu/ +http://mirrors.gigenet.com/ubuntuarchive/ +http://mirrors.ircam.fr/pub/ubuntu/archive/ +http://mirrors.melbourne.co.uk/ubuntu/ +http://mirrors.mit.edu/ubuntu/ +http://mirrors.psu.ac.th/pub/ubuntu/ +http://mirrors.sohu.com/ubuntu/ +http://mirrors.syringanetworks.net/ubuntu-archive/ +http://mirrors.tecnoera.com/ubuntu/ +http://mirrors.telianet.dk/ubuntu/ +http://mirrors.uaip.org/ubuntu/ +http://mirrors.ustc.edu.cn/ubuntu/ +http://osmirror.rug.nl/ubuntu/ +http://no.archive.ubuntu.com/ubuntu/ +http://rpm.scl.rs/linux/ubuntu/archive/ +http://shadow.ind.ntou.edu.tw/ubuntu/ +http://speglar.simnet.is/ubuntu/ +http://vesta.informatik.rwth-aachen.de/ftp/pub/Linux/ubuntu/ubuntu/ +http://suse.uni-leipzig.de/pub/releases.ubuntu.com/ubuntu/ +http://tux.rainside.sk/ubuntu/ +http://ubuntu-archive.locaweb.com.br/ubuntu/ +http://ubuntu-mirror.telesys.org.ua/ubuntu/ +http://ubuntu.arcticnetwork.ca/ +http://ubuntu.cs.nctu.edu.tw/ubuntu/ +http://ubuntu.cybercomhosting.com/ubuntu/ +http://ubuntu.datahop.net/ubuntu/ +http://ubuntu.etf.bg.ac.rs/ubuntu/ +http://ubuntu.koyanet.lv/ubuntu/ +http://ubuntu.load.lv/ubuntu/ +http://ubuntu.mirror.atratoip.net/ubuntu/ +http://ubuntu.mirror.root.lu/ubuntu/ +http://ubuntu.mirror.tn/ +http://ubuntu.mirror.vu.lt/ubuntu/ +http://ubuntu.mirrors.crysys.hu/ +http://ubuntu.mirrors.pair.com/archive/ +http://ubuntu.mirrors.uk2.net/ubuntu/ +http://ubuntu.pesat.net.id/archive/ +http://ubuntu.trumpetti.atm.tut.fi/ubuntu/ +http://ubuntu.tsl.gr/ +http://ubuntu.uach.mx/ +http://ubuntu.uc3m.es/ubuntu/ +http://ubuntu.uib.no/archive/ +http://ubuntu.unitedcolo.de/ubuntu/ +http://ubuntu.wikimedia.org/ubuntu/ +http://ucmirror.canterbury.ac.nz/ubuntu/ +http://www-ftp.lip6.fr/pub/linux/distributions/Ubuntu/archive/ +http://www.club.cc.cmu.edu/pub/ubuntu/ +http://ubuntuarchive.xfree.com.ar/ubuntu/ +http://ubuntu-archive.adsolux.com/ubuntu/ +http://archive.ubuntu.nautile.nc/ubuntu/ +http://biruni.upm.my/mirror/ubuntu/ +http://cosmos.cites.illinois.edu/pub/ubuntu/ +http://deis-mirrors.isec.pt/ubuntu/ +http://mirror.fcaglp.unlp.edu.ar/ubuntu/ +http://ftp.arnes.si/pub/mirrors/ubuntu/ +ftp://ftp.iitb.ac.in/distributions/ubuntu/archives/ +http://ftp.litnet.lt/ubuntu/ +ftp://ftp.rezopole.net/ubuntu/ +http://ftp.sjtu.edu.cn/ubuntu/ +http://ftp.sun.ac.za/ftp/ubuntu/ +http://linux.nsu.ru/ubuntu/ +http://linux.ntuoss.org/ubuntu/ +http://linux.psu.ru/ubuntu/ +http://mirror.beget.ru/ubuntu/ +http://mirror-cybernet.lums.edu.pk/pub/ubuntu/ +http://mirror.alfredstate.edu/ubuntu/ +http://mirror.as24220.net/pub/ubuntu/archive/ +http://mirror.bjtu.edu.cn/ubuntu/ +http://mirror.clarkson.edu/ubuntu/ +http://mirror.hmc.edu/ubuntu/ +http://mirror.hosef.org/ubuntu/ +http://mirror.its.dal.ca/ubuntu/ +http://mirror.learn.ac.lk/ubuntu/ +http://mirror.linux.org.au/ubuntu/ +http://mirror.neolabs.kz/ubuntu/ +http://mirror.picosecond.org/ubuntu/ +http://mirror.rayquang.net/ubuntu/ +ftp://mirror.space.kz/ubuntu/ +http://mirror.squ.edu.om/ubuntuarchive/ +http://mirrors.bloomu.edu/ubuntu/ +http://mirrors.ispros.com.bd/ubuntu/ +http://mirrors.serverhost.ro/ubuntu/archive/ +http://mirrors.ucr.ac.cr/ubuntu/ +http://singo.ub.ac.id/ubuntu/ +http://ubuntu.alex-vichev.info/ +http://ubuntu.eecs.wsu.edu/ +http://ubuntu.mirror.netelligent.ca/ubuntu/ +http://ubuntu.mirrors.skynet.be/ubuntu/ +http://ubuntu.qualitynet.net/ubuntu/ +http://ubuntu.retrosnub.co.uk/ubuntu/ +http://ubuntu.sastudio.jp/ubuntu/ +http://ubuntu.securedservers.com/ +http://ubuntu.skarta.net/ubuntu/ +http://ubuntu.srt.cn/ubuntu/ +http://ubuntu.sth.sze.hu/ubuntu/ +http://ubuntu.unal.edu.co/ubuntu/ +http://ubuntuarchive.hnsdc.com/ubuntu/ +http://us.archive.ubuntu.com/ubuntu/ +http://www.lug.bu.edu/mirror/ubuntu/ +http://www.mirror.upm.edu.my/ubuntu/ +http://bos.fkip.uns.ac.id/ubuntu/ +http://distrib-coffee.ipsl.jussieu.fr/ubuntu/ +http://distrib-coffee.ipsl.jussieu.fr/pub/linux/ubuntu/ +http://ftp.ccc.uba.ar/pub/linux/ubuntu/ +http://glug.nith.ac.in/ubuntu/archives/ +http://kartolo.sby.datautama.net.id/ubuntu/ +http://mirror.greennet.gl/ubuntu/ +http://mirror.lihnidos.org/ubuntu/ubuntu/ +http://mirror.pregi.net/ubuntu/ +http://mirrors.einstein.yu.edu/ubuntu/archive/ +http://ubuntu.cic.userena.cl/ubuntu/ +http://buaya.klas.or.id/ubuntu/ +http://ftp.leg.uct.ac.za/ubuntu/ +http://mirror.calvin.edu/ubuntu/ +http://mirror.vcu.edu/pub/gnu+linux/ubuntu/ +http://mirror.waia.asn.au/ubuntu/ +ftp://mirror1.cs.washington.edu/ubuntu/ +http://ubuntu.grena.ge/ubuntu/ +http://ubuntu.tuxuri.com/ubuntu/ +http://ubuntu.unc.edu.ar/ubuntu/ +http://mirror.linux.org.mt/ubuntu/ +http://linux.vlz.su/ubuntu/ +http://de2.archive.ubuntu.com/ubuntu/ +http://ge.archive.ubuntu.com/ubuntu/ +http://np.archive.ubuntu.com/ubuntu/ +http://ubuntu.ctu.edu.vn/archive/ diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/patches/README update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/patches/README --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/patches/README 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/patches/README 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,17 @@ +This dir can be used to drop *ed* script as patches (we can not use +patch as its not part of the default install) to fixup stuff that is +problematic during the upgrade (like doc-base and +/usr/sbin/install-docs). + +The files have the format _path_to_binary.orig_md5sum.result_md5sum + +The upgrader will check for binaries with the matching md5sum and +apply the patches if the md5sum is correct (first --dry-run to +ensure it applies cleanly). + +Caveats: +- it does *not* do binary patching +- the md5sum calculation in python is not efficient, so do + *not* patch huge files +- the ed implementation is in python and reads the full file + into memory so only use it for smallish files diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/patches/_usr_bin_pycompile.b17cebfbf18d152702278b15710d5095.97c07a02e5951cf68cb3f86534f6f917 update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/patches/_usr_bin_pycompile.b17cebfbf18d152702278b15710d5095.97c07a02e5951cf68cb3f86534f6f917 --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/patches/_usr_bin_pycompile.b17cebfbf18d152702278b15710d5095.97c07a02e5951cf68cb3f86534f6f917 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/patches/_usr_bin_pycompile.b17cebfbf18d152702278b15710d5095.97c07a02e5951cf68cb3f86534f6f917 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,80 @@ +278a + if process.returncode not in (None, 0): + rv = process.returncode + sys.exit(rv) +. +276a + rv = 0 +. +271c + compile(files, versions, + options.force, options.optimize, e_patterns) +. +265c + compile(files, versions, + options.force, options.optimize, e_patterns) +. +258c + compile(files, compile_versions, options.force, + options.optimize, e_patterns) +. +238c + if options.vrange and options.vrange[0] == options.vrange[1] and\ + options.vrange != (None, None) and\ + exists("/usr/bin/python%d.%d" % options.vrange[0]): + # specific version requested, use it even if it's not in SUPPORTED + versions = set(options.vrange[:1]) + else: + versions = get_requested_versions(options.vrange, available=True) +. +207a + parser.add_option('-f', '--force', action='store_true', dest='force', + default=False, help='force rebuild even if timestamps are up-to-date') + parser.add_option('-O', action='store_true', dest='optimize', + default=False, help="byte-compile to .pyo files") +. +194c + try: + pipe = STDINS[version] + except KeyError: + # `pycompile /usr/lib/` invoked, add missing worker + pipe = py_compile(version, optimize, WORKERS) + pipe.next() + STDINS[version] = pipe +. +191,192c + cfn = fn + 'c' if (__debug__ or not optimize) else 'o' + if exists(cfn) and not force: + ftime = os.stat(fn).st_mtime + try: + ctime = os.stat(cfn).st_mtime + except os.error: + ctime = 0 + if (ctime > ftime): + continue +. +185c + coroutine = py_compile(version, optimize, WORKERS) +. +180c +def compile(files, versions, force, optimize, e_patterns=None): +. +170c + cmd = "python%s%s -m py_compile -" \ + % (version, '' if (__debug__ or not optimize) else ' -O') +. +167c +def py_compile(version, optimize, workers): +. +31c +from subprocess import PIPE, STDOUT, Popen +. +27a +import os +. +5a +# Copyright © 2010 Canonical Ltd +. +2c +# -*- coding: utf-8 -*- +. diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/plugins/deb_plugin.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/plugins/deb_plugin.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/plugins/deb_plugin.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/plugins/deb_plugin.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,41 @@ +# deb_plugin.py - common package for post_cleanup for apt/.deb packages +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import computerjanitor +import apt + + +class DebPlugin(computerjanitor.Plugin): + + """Plugin for post_cleanup processing with apt. + + This plugin does not find any cruft of its own. Instead it + centralizes the post_cleanup handling for all packages that remove + .deb packages. + + """ + + def get_cruft(self): + return [] + + def post_cleanup(self): + try: + self.app.apt_cache.commit(apt.progress.text.AcquireProgress(), + apt.progress.base.InstallProgress()) + except Exception: # pragma: no cover + raise + finally: + self.app.refresh_apt_cache() diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/plugins/deb_plugin_tests.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/plugins/deb_plugin_tests.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/plugins/deb_plugin_tests.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/plugins/deb_plugin_tests.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,52 @@ +# deb_plugin_tests.py - unittests for deb_plugin.py +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import unittest + +import deb_plugin + + +class MockApplication(object): + + def __init__(self): + self.commit_called = False + self.refresh_called = False + self.apt_cache = self + + def commit(self, foo, bar): + self.commit_called = True + + def refresh_apt_cache(self): + self.refresh_called = True + + +class DebPluginTests(unittest.TestCase): + + def setUp(self): + self.plugin = deb_plugin.DebPlugin() + self.app = MockApplication() + self.plugin.set_application(self.app) + + def testReturnsEmptyListOfCruft(self): + self.assertEqual(self.plugin.get_cruft(), []) + + def testPostCleanupCallsCommit(self): + self.plugin.post_cleanup() + self.assert_(self.app.commit_called) + + def testPostCleanupCallsRefresh(self): + self.plugin.post_cleanup() + self.assert_(self.app.refresh_called) diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/plugins/dpkg_status_plugin.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/plugins/dpkg_status_plugin.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/plugins/dpkg_status_plugin.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/plugins/dpkg_status_plugin.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,66 @@ +# dpkg_status.py - compact the dpkg status file +# Copyright (C) 2009 Canonical, Ltd. +# +# Author: Michael Vogt +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +from apt_pkg import TagFile +import subprocess +import logging + +import computerjanitor +_ = computerjanitor.setup_gettext() + + +class DpkgStatusCruft(computerjanitor.Cruft): + + def __init__(self, n_items): + self.n_items = n_items + + def get_prefix(self): + return "dpkg-status" + + def get_prefix_description(self): # pragma: no cover + return _("%i obsolete entries in the status file") % self.n_items + + def get_shortname(self): + return _("Obsolete entries in dpkg status") + + def get_description(self): # pragma: no cover + return _("Obsolete dpkg status entries") + + def cleanup(self): # pragma: no cover + logging.debug("calling dpkg --forget-old-unavail") + res = subprocess.call(["dpkg","--forget-old-unavail"]) + logging.debug("dpkg --forget-old-unavail returned %s" % res) + +class DpkgStatusPlugin(computerjanitor.Plugin): + + def __init__(self, fname="/var/lib/dpkg/status"): + self.status = fname + self.condition = ["PostCleanup"] + + def get_cruft(self): + n_cruft = 0 + tagf = TagFile(open(self.status)) + while tagf.step(): + statusline = tagf.section.get("Status") + (want, flag, status) = statusline.split() + if want == "purge" and flag == "ok" and status == "not-installed": + n_cruft += 1 + logging.debug("DpkgStatusPlugin found %s cruft items" % n_cruft) + if n_cruft: + return [DpkgStatusCruft(n_cruft)] + return [] # pragma: no cover diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/plugins/dpkg_status_plugin_tests.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/plugins/dpkg_status_plugin_tests.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/plugins/dpkg_status_plugin_tests.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/plugins/dpkg_status_plugin_tests.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,39 @@ +# dpkg_status.py - compact the dpkg status file +# Copyright (C) 2009 Canonical, Ltd. +# +# Author: Michael Vogt +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import os +import tempfile +import unittest + +import dpkg_status_plugin + + +class AutoRemovalPluginTests(unittest.TestCase): + + def setUp(self): + fd, self.fname = tempfile.mkstemp() + os.write(fd, "Status: purge ok not-installed\n") + os.close(fd) + self.plugin = dpkg_status_plugin.DpkgStatusPlugin(self.fname) + + def tearDown(self): + os.remove(self.fname) + + def testDpkgStatus(self): + names = [cruft.get_name() for cruft in self.plugin.get_cruft()] + self.assertEqual(sorted(names), sorted([u"dpkg-status:Obsolete entries in dpkg status"])) diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/plugins/kdelibs4to5_plugin.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/plugins/kdelibs4to5_plugin.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/plugins/kdelibs4to5_plugin.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/plugins/kdelibs4to5_plugin.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,41 @@ +# kdelibs4to5_plugin.py - install kdelibs5-dev if kdeblibs4-dev is installed +# Copyright (C) 2009 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import computerjanitor +_ = computerjanitor.setup_gettext() + + +class Kdelibs4devToKdelibs5devPlugin(computerjanitor.Plugin): + + """Plugin to install kdelibs5-dev if kdelibs4-dev is installed. + + See also LP: #279621. + + """ + + def __init__(self): + self.condition = ["from_hardyPostDistUpgradeCache"] + + def get_cruft(self): + fromp = "kdelibs4-dev" + top = "kdelibs5-dev" + cache = self.app.apt_cache + if (fromp in cache and cache[fromp].is_installed and + top in cache and not cache[top].is_installed): + yield computerjanitor.MissingPackageCruft(cache[top], + _("When upgrading, if kdelibs4-dev is installed, " + "kdelibs5-dev needs to be installed. See " + "bugs.launchpad.net, bug #279621 for details.")) diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/plugins/langpack_manual_plugin.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/plugins/langpack_manual_plugin.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/plugins/langpack_manual_plugin.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/plugins/langpack_manual_plugin.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,65 @@ +# langpack_manual_plugin.py - mark langpacks to be manually installed +# Copyright (C) 2009 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import computerjanitor +_ = computerjanitor.setup_gettext() + +import logging + +class ManualInstallCruft(computerjanitor.Cruft): + + def __init__(self, pkg): + self.pkg = pkg + + def get_prefix(self): + return "mark-manually-installed" + + def get_shortname(self): + return self.pkg.name + + def get_description(self): + return (_("%s needs to be marked as manually installed.") % + self.pkg.name) + + def cleanup(self): + self.pkg.markKeep() + self.pkg.markInstall() + + +class MarkLangpacksManuallyInstalledPlugin(computerjanitor.Plugin): + + """Plugin to mark language packs as manually installed. + + This works around quirks in the hardy->intrepid upgrade. + + """ + + def __init__(self): + self.condition = ["from_hardyPostDistUpgradeCache"] + + def get_cruft(self): + # language-support-* changed its dependencies from "recommends" + # to "suggests" for language-pack-* - this means that apt will + # think they are now auto-removalable if they got installed + # as a dep of language-support-* - we fix this here + cache = self.app.apt_cache + for pkg in cache: + if (pkg.name.startswith("language-pack-") and + not pkg.name.endswith("-base") and + cache._depcache.IsAutoInstalled(pkg._pkg) and + pkg.is_installed): + logging.debug("setting '%s' to manual installed" % pkg.name) + yield ManualInstallCruft(pkg) diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/plugins/remove_lilo_plugin.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/plugins/remove_lilo_plugin.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/plugins/remove_lilo_plugin.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/plugins/remove_lilo_plugin.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,43 @@ +# remove_lilo_plugin.py - remove lilo if grub is also installed +# Copyright (C) 2009 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import os + +import logging +import computerjanitor +_ = computerjanitor.setup_gettext() + + +class RemoveLiloPlugin(computerjanitor.Plugin): + + """Plugin to remove lilo if grub is also installed.""" + + description = _("Remove lilo since grub is also installed." + "(See bug #314004 for details.)") + + def __init__(self): + self.condition = ["jauntyPostDistUpgradeCache"] + + def get_cruft(self): + if "lilo" in self.app.apt_cache and "grub" in self.app.apt_cache: + lilo = self.app.apt_cache["lilo"] + grub = self.app.apt_cache["grub"] + if lilo.is_installed and grub.is_installed: + if not os.path.exists("/etc/lilo.conf"): + yield computerjanitor.PackageCruft(lilo, self.description) + else: + logging.warning("lilo and grub installed, but " + "lilo.conf exists") diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/prerequists-sources.dapper.list update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/prerequists-sources.dapper.list --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/prerequists-sources.dapper.list 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/prerequists-sources.dapper.list 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,4 @@ +# sources.list fragment for pre-requists (mirror from sources.list + fallback) +# this is safe to remove after the upgrade +${mirror} +deb http://archive.ubuntu.com/ubuntu dapper-backports main/debian-installer diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/prerequists-sources.dapper-ports.list update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/prerequists-sources.dapper-ports.list --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/prerequists-sources.dapper-ports.list 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/prerequists-sources.dapper-ports.list 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,4 @@ +# sources.list fragment for pre-requists of arches living on ports.ubuntu.com +# no mirror because there are no mirrors here +# this is safe to remove after the upgrade +deb http://ports.ubuntu.com/ubuntu-ports dapper-backports main/debian-installer diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/prerequists-sources.list update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/prerequists-sources.list --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/prerequists-sources.list 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/prerequists-sources.list 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,6 @@ +# sources.list fragment for pre-requists (mirror from sources.list + fallback) +# this is safe to remove after the upgrade +${mirror} +# when this changes from -proposed to -updates, ensure to update +# DistUpgradeController.py:1393 as well +deb http://archive.ubuntu.com/ubuntu/ lucid-updates main diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/README update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/README --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/README 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/README 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,90 @@ +General +------- + +The dist-upgrader is designed to make upgrades for ubuntu (or similar +distributions) easy and painless. It supports both network mode and +cdrom upgrades. The cdromupgrade will ask if it should use the network +or not. There is a wrapper script "cdromupgrade" (that assumes the +file of the upgrade life in +CDROM_ROOT/dists/stable/dist-upgrader/binary-all/) that can be put +onto the CD and it will support upgrades directly from the CD. + + +Environment +----------- +The following environment variable will be *honored*: + +RELEASE_UPGRADE_NO_FORCE_OVERWRITE: +- if that is set, no --force-overwrite is used + +RELEASE_UPRADER_NO_APPORT: +- if that is set, apport is not run in case of package install falures + +RELEASE_UPRADER_ALLOW_THIRD_PARTY: +- if that is set, third party repositories will not be commented out + but instead tried to be upgraded + + + +The following environment variable will be *set* by the upgrader: +RELEASE_UPGRADE_IN_PROGRESS: +- set to "1" if a release-upgrade is running (and not a normal + package/security upgrade) +RELEASE_UPGRADE_MODE: +- either "desktop" or "server" + + +Configuration +------------- + +The DistUpgrade.cfg format is based on the python ConfigParser. + +It supports the following sections: + +[View] - controls the output +Depends: + Packages that must be installed to the version specified (just like + a regular depends line in a pkg). +[$view-used] +Depends: just like the global "view" depend but only evaluated when the + specific view is in use + +[Distro] - global distribution specfic options +BaseMetaPkgs: + the basic meta-pkgs that must be installed (ubuntu-base usually) +MetaPkgs: + packages that define a "desktop" (e.g. ubuntu-desktop) +PostUpgrade{Install,Remove,Purge}: + action right after the upgrade was calculated in the cache (marking + happens *before* the cache.commit()) +ForcedObsoletes: + Obsolete packages that the user is asked about after the upgrade (marking + happens *after* the cache.commit()) +RemoveEssentialOk: + Those packages are ok to remove even though they are essential +KeepInstalledPkgs: + If the package was installed before, it should still be installed + after the upgrade +KeepInstalledSection: + Packages from this section that were installed should always be + installed afterwards as well (useful for eg translations) + +[$meta-pkg] +KeyDependencies: + Dependencies that are considered "key" dependencies of the meta-pkg to + detect if it was installed but later removed by the user +PostUpgrade{Install,Remove,Purge}: + s.above +ForcedObsoletes: + s.above + +[Files] - file specific stuff + +[Sources] - how to rewrite the sources.list + +[Network] - network specific options + +[PreRequists] - use specific packages for dist-upgrade +Packages= List of what packages to look for +SourcesList=a sources.list fragment that will be placed into + /etc/apt/sources.list.d and that contains the backported pkgs \ No newline at end of file diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/ReleaseAnnouncement update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/ReleaseAnnouncement --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/ReleaseAnnouncement 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/ReleaseAnnouncement 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,56 @@ += Welcome to Ubuntu 12.04 LTS 'Precise Pangolin' = + +The Ubuntu team is proud to announce Ubuntu 12.04 LTS 'Precise Pangolin'. + +To see what's new in this release, visit: + http://www.ubuntu.com/desktop/features + +Ubuntu is a Linux distribution for your desktop or server, with a fast +and easy install, regular releases, a tight selection of excellent +applications installed by default, and almost any other software you +can imagine available through the network. + +We hope you enjoy Ubuntu. + +== Feedback and Helping == + +If you would like to help shape Ubuntu, take a look at the list of +ways you can participate at + + http://www.ubuntu.com/community/participate/ + +Your comments, bug reports, patches and suggestions will help ensure +that our next release is the best release of Ubuntu ever. If you feel +that you have found a bug please read: + + http://help.ubuntu.com/community/ReportingBugs + +Then report bugs using apport in Ubuntu. For example: + + ubuntu-bug linux + +will open a bug report in Launchpad regarding the linux package. + +If you have a question, or if you think you may have found a bug but +aren't sure, first try asking on the #ubuntu or #ubuntu-bugs IRC +channels on Freenode, on the Ubuntu Users mailing list, or on the +Ubuntu forums: + + http://help.ubuntu.com/community/InternetRelayChat + http://lists.ubuntu.com/mailman/listinfo/ubuntu-users + http://www.ubuntuforums.org/ + + +== More Information == + +You can find out more about Ubuntu on our website, IRC channel and wiki. +If you're new to Ubuntu, please visit: + + http://www.ubuntu.com/ + + +To sign up for future Ubuntu announcements, please subscribe to Ubuntu's +very low volume announcement list at: + + http://lists.ubuntu.com/mailman/listinfo/ubuntu-announce + diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/removal_blacklist.cfg update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/removal_blacklist.cfg --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/removal_blacklist.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/removal_blacklist.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,19 @@ +# blacklist of packages that should never be removed +ubuntu-standard +ubuntu-minimal +ubuntu-desktop +kubuntu-desktop +xubuntu-desktop +lubuntu-desktop +# update-manager itself should not remove itself +update-manager +update-manager-core +# posgresql (LP: #871893) +^postgresql-.*[0-9]\.[0-9].* +# the upgrade runs in it +^screen$ +# unity +unity$ +unity-2d$ +# gnome-session (LP: #946539) +gnome-session$ diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/screenrc update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/screenrc --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/screenrc 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/screenrc 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,3 @@ +logfile /var/log/dist-upgrade/screenlog.%n +logtstamp on +zombie xr \ No newline at end of file diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/SimpleGtk3builderApp.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/SimpleGtk3builderApp.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/SimpleGtk3builderApp.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/SimpleGtk3builderApp.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,61 @@ +""" + SimpleGladeApp.py + Module that provides an object oriented abstraction to pygtk and libglade. + Copyright (C) 2004 Sandino Flores Moreno +""" + +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import logging + +from gi.repository import Gtk + +# based on SimpleGladeApp +class SimpleGtkbuilderApp: + + def __init__(self, path, domain): + self.builder = Gtk.Builder() + self.builder.set_translation_domain(domain) + self.builder.add_from_file(path) + self.builder.connect_signals(self) + for o in self.builder.get_objects(): + if issubclass(type(o), Gtk.Buildable): + name = Gtk.Buildable.get_name(o) + setattr(self, name, o) + else: + logging.debug("WARNING: can not get name for '%s'" % o) + + def run(self): + """ + Starts the main loop of processing events checking for Control-C. + + The default implementation checks wheter a Control-C is pressed, + then calls on_keyboard_interrupt(). + + Use this method for starting programs. + """ + try: + Gtk.main() + except KeyboardInterrupt: + self.on_keyboard_interrupt() + + def on_keyboard_interrupt(self): + """ + This method is called by the default implementation of run() + after a program is finished by pressing Control-C. + """ + pass + diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/SimpleGtkbuilderApp.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/SimpleGtkbuilderApp.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/SimpleGtkbuilderApp.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/SimpleGtkbuilderApp.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,61 @@ +""" + SimpleGladeApp.py + Module that provides an object oriented abstraction to pygtk and libglade. + Copyright (C) 2004 Sandino Flores Moreno +""" + +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import logging + +import gtk + +# based on SimpleGladeApp +class SimpleGtkbuilderApp: + + def __init__(self, path, domain): + self.builder = gtk.Builder() + self.builder.set_translation_domain(domain) + self.builder.add_from_file(path) + self.builder.connect_signals(self) + for o in self.builder.get_objects(): + if issubclass(type(o), gtk.Buildable): + name = gtk.Buildable.get_name(o) + setattr(self, name, o) + else: + logging.debug("WARNING: can not get name for '%s'" % o) + + def run(self): + """ + Starts the main loop of processing events checking for Control-C. + + The default implementation checks wheter a Control-C is pressed, + then calls on_keyboard_interrupt(). + + Use this method for starting programs. + """ + try: + gtk.main() + except KeyboardInterrupt: + self.on_keyboard_interrupt() + + def on_keyboard_interrupt(self): + """ + This method is called by the default implementation of run() + after a program is finished by pressing Control-C. + """ + pass + diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/sourceslist.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/sourceslist.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/sourceslist.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/sourceslist.py 2015-11-26 16:33:29.000000000 +0000 @@ -0,0 +1,499 @@ +# sourceslist.py - Provide an abstraction of the sources.list +# +# Copyright (c) 2004-2009 Canonical Ltd. +# Copyright (c) 2004 Michiel Sikkes +# Copyright (c) 2006-2007 Sebastian Heinlein +# +# Authors: Michiel Sikkes +# Michael Vogt +# Sebastian Heinlein +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +from __future__ import absolute_import, print_function + +import glob +import logging +import os.path +import re +import shutil +import time + +import apt_pkg +from .distinfo import DistInfo +#from apt_pkg import gettext as _ + + +# some global helpers + +__all__ = ['is_mirror', 'SourceEntry', 'NullMatcher', 'SourcesList', + 'SourceEntryMatcher'] + + +def is_mirror(master_uri, compare_uri): + """ check if the given add_url is idential or a mirror of orig_uri e.g.: + master_uri = archive.ubuntu.com + compare_uri = de.archive.ubuntu.com + -> True + """ + # remove traling spaces and "/" + compare_uri = compare_uri.rstrip("/ ") + master_uri = master_uri.rstrip("/ ") + # uri is identical + if compare_uri == master_uri: + #print "Identical" + return True + # add uri is a master site and orig_uri has the from "XX.mastersite" + # (e.g. de.archive.ubuntu.com) + try: + compare_srv = compare_uri.split("//")[1] + master_srv = master_uri.split("//")[1] + #print "%s == %s " % (add_srv, orig_srv) + except IndexError: # ok, somethings wrong here + #print "IndexError" + return False + # remove the leading "." (if any) and see if that helps + if "." in compare_srv and \ + compare_srv[compare_srv.index(".") + 1:] == master_srv: + #print "Mirror" + return True + return False + + +def uniq(s): + """ simple and efficient way to return uniq collection + + This is not intended for use with a SourceList. It is provided + for internal use only. It does not have a leading underscore to + not break any old code that uses it; but it should not be used + in new code (and is not listed in __all__).""" + return list(set(s)) + + +class SourceEntry(object): + """ single sources.list entry """ + + def __init__(self, line, file=None): + self.invalid = False # is the source entry valid + self.disabled = False # is it disabled ('#' in front) + self.type = "" # what type (deb, deb-src) + self.architectures = [] # architectures + self.trusted = None # Trusted + self.uri = "" # base-uri + self.dist = "" # distribution (dapper, edgy, etc) + self.comps = [] # list of available componetns (may empty) + self.comment = "" # (optional) comment + self.line = line # the original sources.list line + if file is None: + file = apt_pkg.config.find_dir( + "Dir::Etc") + apt_pkg.config.find("Dir::Etc::sourcelist") + self.file = file # the file that the entry is located in + self.parse(line) + self.template = None # type DistInfo.Suite + self.children = [] + + def __eq__(self, other): + """ equal operator for two sources.list entries """ + return (self.disabled == other.disabled and + self.type == other.type and + self.uri == other.uri and + self.dist == other.dist and + self.comps == other.comps) + + def mysplit(self, line): + """ a split() implementation that understands the sources.list + format better and takes [] into account (for e.g. cdroms) """ + line = line.strip() + pieces = [] + tmp = "" + # we are inside a [..] block + p_found = False + space_found = False + for i in range(len(line)): + if line[i] == "[": + if space_found: + space_found = False + p_found = True + pieces.append(tmp) + tmp = line[i] + else: + p_found = True + tmp += line[i] + elif line[i] == "]": + p_found = False + tmp += line[i] + elif space_found and not line[i].isspace(): + # we skip one or more space + space_found = False + pieces.append(tmp) + tmp = line[i] + elif line[i].isspace() and not p_found: + # found a whitespace + space_found = True + else: + tmp += line[i] + # append last piece + if len(tmp) > 0: + pieces.append(tmp) + return pieces + + def parse(self, line): + """ parse a given sources.list (textual) line and break it up + into the field we have """ + line = self.line.strip() + #print line + # check if the source is enabled/disabled + if line == "" or line == "#": # empty line + self.invalid = True + return + if line[0] == "#": + self.disabled = True + pieces = line[1:].strip().split() + # if it looks not like a disabled deb line return + if not pieces[0] in ("rpm", "rpm-src", "deb", "deb-src"): + self.invalid = True + return + else: + line = line[1:] + # check for another "#" in the line (this is treated as a comment) + i = line.find("#") + if i > 0: + self.comment = line[i + 1:] + line = line[:i] + # source is ok, split it and see what we have + pieces = self.mysplit(line) + # Sanity check + if len(pieces) < 3: + self.invalid = True + return + # Type, deb or deb-src + self.type = pieces[0].strip() + # Sanity check + if self.type not in ("deb", "deb-src", "rpm", "rpm-src"): + self.invalid = True + return + + if pieces[1].strip()[0] == "[": + options = pieces.pop(1).strip("[]").split() + for option in options: + try: + key, value = option.split("=", 1) + except Exception: + self.invalid = True + else: + if key == "arch": + self.architectures = value.split(",") + elif key == "trusted": + self.trusted = apt_pkg.string_to_bool(value) + else: + self.invalid = True + + # URI + self.uri = pieces[1].strip() + if len(self.uri) < 1: + self.invalid = True + # distro and components (optional) + # Directory or distro + self.dist = pieces[2].strip() + if len(pieces) > 3: + # List of components + self.comps = pieces[3:] + else: + self.comps = [] + + def set_enabled(self, new_value): + """ set a line to enabled or disabled """ + self.disabled = not new_value + # enable, remove all "#" from the start of the line + if new_value: + self.line = self.line.lstrip().lstrip('#') + else: + # disabled, add a "#" + if self.line.strip()[0] != "#": + self.line = "#" + self.line + + def __str__(self): + """ debug helper """ + return self.str().strip() + + def str(self): + """ return the current line as string """ + if self.invalid: + return self.line + line = "" + if self.disabled: + line = "# " + + line += self.type + + if self.architectures and self.trusted is not None: + line += " [arch=%s trusted=%s]" % ( + ",".join(self.architectures), "yes" if self.trusted else "no") + elif self.trusted is not None: + line += " [trusted=%s]" % ("yes" if self.trusted else "no") + elif self.architectures: + line += " [arch=%s]" % ",".join(self.architectures) + line += " %s %s" % (self.uri, self.dist) + if len(self.comps) > 0: + line += " " + " ".join(self.comps) + if self.comment != "": + line += " #" + self.comment + line += "\n" + return line + + +class NullMatcher(object): + """ a Matcher that does nothing """ + + def match(self, s): + return True + + +class SourcesList(object): + """ represents the full sources.list + sources.list.d file """ + + def __init__(self, + withMatcher=True, + matcherPath="/usr/share/python-apt/templates/"): + self.list = [] # the actual SourceEntries Type + if withMatcher: + self.matcher = SourceEntryMatcher(matcherPath) + else: + self.matcher = NullMatcher() + self.refresh() + + def refresh(self): + """ update the list of known entries """ + self.list = [] + # read sources.list + file = apt_pkg.config.find_file("Dir::Etc::sourcelist") + self.load(file) + # read sources.list.d + partsdir = apt_pkg.config.find_dir("Dir::Etc::sourceparts") + for file in glob.glob("%s/*.list" % partsdir): + self.load(file) + # check if the source item fits a predefined template + for source in self.list: + if not source.invalid: + self.matcher.match(source) + + def __iter__(self): + """ simple iterator to go over self.list, returns SourceEntry + types """ + for entry in self.list: + yield entry + + def __find(self, *predicates, **attrs): + for source in self.list: + if (all(getattr(source, key) == attrs[key] for key in attrs) and + all(predicate(source) for predicate in predicates)): + yield source + + def add(self, type, uri, dist, orig_comps, comment="", pos=-1, file=None, + architectures=[]): + """ + Add a new source to the sources.list. + The method will search for existing matching repos and will try to + reuse them as far as possible + """ + + architectures = set(architectures) + # create a working copy of the component list so that + # we can modify it later + comps = orig_comps[:] + sources = self.__find(lambda s: set(s.architectures) == architectures, + disabled=False, invalid=False, type=type, + uri=uri, dist=dist) + # check if we have this source already in the sources.list + for source in sources: + for new_comp in comps: + if new_comp in source.comps: + # we have this component already, delete it + # from the new_comps list + del comps[comps.index(new_comp)] + if len(comps) == 0: + return source + + sources = self.__find(lambda s: set(s.architectures) == architectures, + invalid=False, type=type, uri=uri, dist=dist) + for source in sources: + # if there is a repo with the same (type, uri, dist) just add the + # components + if source.disabled and set(source.comps) == set(comps): + source.disabled = False + return source + elif not source.disabled: + source.comps = uniq(source.comps + comps) + return source + # there isn't any matching source, so create a new line and parse it + line = type + if architectures: + line += " [arch=%s]" % ",".join(architectures) + line += " %s %s" % (uri, dist) + for c in comps: + line = line + " " + c + if comment != "": + line = "%s #%s\n" % (line, comment) + line = line + "\n" + new_entry = SourceEntry(line) + if file is not None: + new_entry.file = file + self.matcher.match(new_entry) + self.list.insert(pos, new_entry) + return new_entry + + def remove(self, source_entry): + """ remove the specified entry from the sources.list """ + self.list.remove(source_entry) + + def restore_backup(self, backup_ext): + " restore sources.list files based on the backup extension " + file = apt_pkg.config.find_file("Dir::Etc::sourcelist") + if os.path.exists(file + backup_ext) and os.path.exists(file): + shutil.copy(file + backup_ext, file) + # now sources.list.d + partsdir = apt_pkg.config.find_dir("Dir::Etc::sourceparts") + for file in glob.glob("%s/*.list" % partsdir): + if os.path.exists(file + backup_ext): + shutil.copy(file + backup_ext, file) + + def backup(self, backup_ext=None): + """ make a backup of the current source files, if no backup extension + is given, the current date/time is used (and returned) """ + already_backuped = set() + if backup_ext is None: + backup_ext = time.strftime("%y%m%d.%H%M") + for source in self.list: + if (source.file not in already_backuped and + os.path.exists(source.file)): + shutil.copy(source.file, "%s%s" % (source.file, backup_ext)) + return backup_ext + + def load(self, file): + """ (re)load the current sources """ + try: + with open(file, "r") as f: + for line in f: + source = SourceEntry(line, file) + self.list.append(source) + except: + logging.warning("could not open file '%s'\n" % file) + + def save(self): + """ save the current sources """ + files = {} + # write an empty default config file if there aren't any sources + if len(self.list) == 0: + path = apt_pkg.config.find_file("Dir::Etc::sourcelist") + header = ( + "## See sources.list(5) for more information, especialy\n" + "# Remember that you can only use http, ftp or file URIs\n" + "# CDROMs are managed through the apt-cdrom tool.\n") + + with open(path, "w") as f: + f.write(header) + return + + try: + for source in self.list: + if source.file not in files: + files[source.file] = open(source.file, "w") + files[source.file].write(source.str()) + finally: + for f in files: + files[f].close() + + def check_for_relations(self, sources_list): + """get all parent and child channels in the sources list""" + parents = [] + used_child_templates = {} + for source in sources_list: + # try to avoid checking uninterressting sources + if source.template is None: + continue + # set up a dict with all used child templates and corresponding + # source entries + if source.template.child: + key = source.template + if key not in used_child_templates: + used_child_templates[key] = [] + temp = used_child_templates[key] + temp.append(source) + else: + # store each source with children aka. a parent :) + if len(source.template.children) > 0: + parents.append(source) + #print self.used_child_templates + #print self.parents + return (parents, used_child_templates) + + +class SourceEntryMatcher(object): + """ matcher class to make a source entry look nice + lots of predefined matchers to make it i18n/gettext friendly + """ + + def __init__(self, matcherPath): + self.templates = [] + # Get the human readable channel and comp names from the channel .infos + spec_files = glob.glob("%s/*.info" % matcherPath) + for f in spec_files: + f = os.path.basename(f) + i = f.find(".info") + f = f[0:i] + dist = DistInfo(f, base_dir=matcherPath) + for template in dist.templates: + if template.match_uri is not None: + self.templates.append(template) + return + + def match(self, source): + """Add a matching template to the source""" + found = False + for template in self.templates: + if (re.search(template.match_uri, source.uri) and + re.match(template.match_name, source.dist) and + # deb is a valid fallback for deb-src (if that is not + # definied, see #760035 + (source.type == template.type or template.type == "deb")): + found = True + source.template = template + break + elif (template.is_mirror(source.uri) and + re.match(template.match_name, source.dist)): + found = True + source.template = template + break + return found + + +# some simple tests +if __name__ == "__main__": + apt_pkg.init_config() + sources = SourcesList() + + for entry in sources: + logging.info("entry %s" % entry.str()) + #print entry.uri + + mirror = is_mirror("http://archive.ubuntu.com/ubuntu/", + "http://de.archive.ubuntu.com/ubuntu/") + logging.info("is_mirror(): %s" % mirror) + + logging.info(is_mirror("http://archive.ubuntu.com/ubuntu", + "http://de.archive.ubuntu.com/ubuntu/")) + logging.info(is_mirror("http://archive.ubuntu.com/ubuntu/", + "http://de.archive.ubuntu.com/ubuntu")) diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/TODO update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/TODO --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/TODO 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/TODO 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,65 @@ +Config/Profiles: +---------------- +* add include directive (or something like this) + +CDROM: +----- + * release notes display in CDROM mode + * if run from CDROM and we have network -> do a self update + * support dapper-commercial in sources.list rewriting + * after "no-network" dist-upgrade it is most likely that the system + is only half-upgraded and update-manager will not be able to do + the full upgrade. update-manager needs to be changed to support + full dist-upgrades (possible by just calling the dist-upgrader + in a special mode) + +Misc: +----- + +* [fabbio]: we probably don't want to remove stuff that moved from main + to universe (if the user has only main enabled this is considered + obsolete). It would also be nice inform about packages that went from + main->universe. We could ship a list of demotions. +* set bigger timeout than 120s? + +breezy->dapper +-------------- +- gnome-icon-theme changes a lot, icons move from hicolor to gnome. + this might have caused a specatular crash during a upgrade + + +hoary->breezy +------------- +- stop gnome-volume-manager before the hoary->breezy upgrade + (it will crash otherwise) +- send a "\n" on the libc6 question on hoary->breezy + +general +------- +- whitelist removal (pattern? e.g. c102 -> c2a etc) and not + display it? + +Robustness: +----------- +- automatically comment out entires in the sources.list that fail to + fetch. + Trouble: apt doesn't provide a method to map from a line in th + sources.list to the indexFile and python-apt dosn't proivde a way to + get all the metaIndexes in sources.list, nor a way to get the + pkgIndexFiles from the metaIndexes (metaIndex is not available in + python-apt at all) + What we could do is to write DistUpgradeCache.update(), check the + DescURI for each failed item and guess from it what sources.list + line failed (e.g. uri.endswith("Sources{.bz2|.gz") -> deb-src, get + base-uri, find 'dists' in uri etc) + +- don't stop if a single pkg fails to upgrade: + - the problem here is apt, in apt-pkg/deb/dpkgpm.cc it will stop if + dpkg returns a non-zero exit code. The problem with this is of course + that this may happen in the middle of the upgrade, leaving half the + packages unpacked but not configured or loads of packages unconfigured. + One possible solution is to not stop in apt but try to continue as long + as possible. The problem here is that e.g. if libnoitfy0 explodes and + evolution, update-notifer depend on it, continuing means to evo and u-n + can't be upgraded and dpkg explodes on them too. This is not more worse + than what we have right now I guess. diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/Ubuntu.info update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/Ubuntu.info --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/Ubuntu.info 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/Ubuntu.info 2016-01-19 11:55:41.000000000 +0000 @@ -0,0 +1,2189 @@ +ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog + +Suite: devel +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu development series +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: devel +ParentSuite: devel +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Ubuntu development series + +Suite: devel +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: devel +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +Description: Independent +Component: main +CompDescription: Provided by third-party software developers +CompDescriptionLong: Software offered by third party developers. + +Suite: devel-security +ParentSuite: devel +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: devel-security +ParentSuite: devel +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +Description: Important security updates + +Suite: devel-updates +ParentSuite: devel +RepositoryType: deb +Description: Recommended updates + +Suite: devel-updates +ParentSuite: devel +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Recommended updates + +Suite: devel-proposed +ParentSuite: devel +RepositoryType: deb +Description: Pre-released updates + +Suite: devel-proposed +ParentSuite: devel +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Pre-released updates + +Suite: devel-backports +ParentSuite: devel +RepositoryType: deb +Description: Unsupported updates + +Suite: devel-backports +ParentSuite: devel +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Unsupported updates + + +Suite: xenial +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 16.04 LTS 'Xenial Xerus' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: xenial +ParentSuite: xenial +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 16.04 LTS 'Xenial Xerus' + +Suite: xenial +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*16.04 LTS +MatchURI: cdrom:\[Ubuntu.*16.04 LTS +Description: Cdrom with Ubuntu 16.04 LTS 'Xenial Xerus' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: xenial +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: xenial-security +ParentSuite: xenial +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: xenial-security +ParentSuite: xenial +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +Description: Important security updates + +Suite: xenial-updates +ParentSuite: xenial +RepositoryType: deb +Description: Recommended updates + +Suite: xenial-updates +ParentSuite: xenial +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Recommended updates + +Suite: xenial-proposed +ParentSuite: xenial +RepositoryType: deb +Description: Pre-released updates + +Suite: xenial-proposed +ParentSuite: xenial +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Pre-released updates + +Suite: xenial-backports +ParentSuite: xenial +RepositoryType: deb +Description: Unsupported updates + +Suite: xenial-backports +ParentSuite: xenial +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Unsupported updates + +Suite: wily +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 15.10 'Wily Werewolf' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: wily +ParentSuite: wily +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 15.10 'Wily Werewolf' + +Suite: wily +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*15.10 +MatchURI: cdrom:\[Ubuntu.*15.10 +Description: Cdrom with Ubuntu 15.10 'Wily Werewolf' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: wily +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: wily-security +ParentSuite: wily +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: wily-security +ParentSuite: wily +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +Description: Important security updates + +Suite: wily-updates +ParentSuite: wily +RepositoryType: deb +Description: Recommended updates + +Suite: wily-updates +ParentSuite: wily +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Recommended updates + +Suite: wily-proposed +ParentSuite: wily +RepositoryType: deb +Description: Pre-released updates + +Suite: wily-proposed +ParentSuite: wily +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Pre-released updates + +Suite: wily-backports +ParentSuite: wily +RepositoryType: deb +Description: Unsupported updates + +Suite: wily-backports +ParentSuite: wily +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Unsupported updates + + +Suite: vivid +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 15.04 'Vivid Vervet' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: vivid +ParentSuite: vivid +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 15.04 'Vivid Vervet' + +Suite: vivid +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*15.04 +MatchURI: cdrom:\[Ubuntu.*15.04 +Description: Cdrom with Ubuntu 15.04 'Vivid Vervet' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: vivid +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: vivid +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +Description: Independent +Component: main +CompDescription: Provided by third-party software developers +CompDescriptionLong: Software offered by third party developers. + +Suite: vivid-security +ParentSuite: vivid +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: vivid-security +ParentSuite: vivid +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +Description: Important security updates + +Suite: vivid-updates +ParentSuite: vivid +RepositoryType: deb +Description: Recommended updates + +Suite: vivid-updates +ParentSuite: vivid +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Recommended updates + +Suite: vivid-proposed +ParentSuite: vivid +RepositoryType: deb +Description: Pre-released updates + +Suite: vivid-proposed +ParentSuite: vivid +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Pre-released updates + +Suite: vivid-backports +ParentSuite: vivid +RepositoryType: deb +Description: Unsupported updates + +Suite: vivid-backports +ParentSuite: vivid +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Unsupported updates + + +Suite: utopic +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 14.10 'Utopic Unicorn' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: utopic +ParentSuite: utopic +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 14.10 'Utopic Unicorn' + +Suite: utopic +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*14.10 +MatchURI: cdrom:\[Ubuntu.*14.10 +Description: Cdrom with Ubuntu 14.10 'Utopic Unicorn' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: utopic +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: utopic +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +Description: Independent +Component: main +CompDescription: Provided by third-party software developers +CompDescriptionLong: Software offered by third party developers. + +Suite: utopic-security +ParentSuite: utopic +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: utopic-security +ParentSuite: utopic +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +Description: Important security updates + +Suite: utopic-updates +ParentSuite: utopic +RepositoryType: deb +Description: Recommended updates + +Suite: utopic-updates +ParentSuite: utopic +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Recommended updates + +Suite: utopic-proposed +ParentSuite: utopic +RepositoryType: deb +Description: Pre-released updates + +Suite: utopic-proposed +ParentSuite: utopic +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Pre-released updates + +Suite: utopic-backports +ParentSuite: utopic +RepositoryType: deb +Description: Unsupported updates + +Suite: utopic-backports +ParentSuite: utopic +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Unsupported updates + + +Suite: trusty +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 14.04 'Trusty Tahr' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: trusty +ParentSuite: trusty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 14.04 'Trusty Tahr' + +Suite: trusty +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*14.04 +MatchURI: cdrom:\[Ubuntu.*14.04 +Description: Cdrom with Ubuntu 14.04 'Trusty Tahr' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: trusty +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: trusty +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +Description: Independent +Component: main +CompDescription: Provided by third-party software developers +CompDescriptionLong: Software offered by third party developers. + +Suite: trusty-security +ParentSuite: trusty +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: trusty-security +ParentSuite: trusty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +Description: Important security updates + +Suite: trusty-updates +ParentSuite: trusty +RepositoryType: deb +Description: Recommended updates + +Suite: trusty-updates +ParentSuite: trusty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Recommended updates + +Suite: trusty-proposed +ParentSuite: trusty +RepositoryType: deb +Description: Pre-released updates + +Suite: trusty-proposed +ParentSuite: trusty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Pre-released updates + +Suite: trusty-backports +ParentSuite: trusty +RepositoryType: deb +Description: Unsupported updates + +Suite: trusty-backports +ParentSuite: trusty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Unsupported updates + + +Suite: saucy +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 13.10 'Saucy Salamander' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: saucy +ParentSuite: saucy +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 13.10 'Saucy Salamander' + +Suite: saucy +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*13.10 +MatchURI: cdrom:\[Ubuntu.*13.10 +Description: Cdrom with Ubuntu 13.10 'Saucy Salamander' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: saucy +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: saucy +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +Description: Independent +Component: main +CompDescription: Provided by third-party software developers +CompDescriptionLong: Software offered by third party developers. + +Suite: saucy-security +ParentSuite: saucy +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: saucy-security +ParentSuite: saucy +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +Description: Important security updates + +Suite: saucy-updates +ParentSuite: saucy +RepositoryType: deb +Description: Recommended updates + +Suite: saucy-updates +ParentSuite: saucy +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Recommended updates + +Suite: saucy-proposed +ParentSuite: saucy +RepositoryType: deb +Description: Pre-released updates + +Suite: saucy-proposed +ParentSuite: saucy +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Pre-released updates + +Suite: saucy-backports +ParentSuite: saucy +RepositoryType: deb +Description: Unsupported updates + +Suite: saucy-backports +ParentSuite: saucy +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Unsupported updates + + +Suite: raring +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 13.04 'Raring Ringtail' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: raring +ParentSuite: raring +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 13.04 'Raring Ringtail' + +Suite: raring +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*13.04 +MatchURI: cdrom:\[Ubuntu.*13.04 +Description: Cdrom with Ubuntu 13.04 'Raring Ringtail' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: raring +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: raring +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +Description: Independent +Component: main +CompDescription: Provided by third-party software developers +CompDescriptionLong: Software offered by third party developers. + +Suite: raring-security +ParentSuite: raring +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: raring-security +ParentSuite: raring +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +Description: Important security updates + +Suite: raring-updates +ParentSuite: raring +RepositoryType: deb +Description: Recommended updates + +Suite: raring-updates +ParentSuite: raring +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Recommended updates + +Suite: raring-proposed +ParentSuite: raring +RepositoryType: deb +Description: Pre-released updates + +Suite: raring-proposed +ParentSuite: raring +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Pre-released updates + +Suite: raring-backports +ParentSuite: raring +RepositoryType: deb +Description: Unsupported updates + +Suite: raring-backports +ParentSuite: raring +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Unsupported updates + + +Suite: quantal +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 12.10 'Quantal Quetzal' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: quantal +ParentSuite: quantal +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 12.10 'Quantal Quetzal' + +Suite: quantal +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*12.10 +MatchURI: cdrom:\[Ubuntu.*12.10 +Description: Cdrom with Ubuntu 12.10 'Quantal Quetzal' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: quantal +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: quantal +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +Description: Independent +Component: main +CompDescription: Provided by third-party software developers +CompDescriptionLong: Software offered by third party developers. + +Suite: quantal-security +ParentSuite: quantal +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: quantal-security +ParentSuite: quantal +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +Description: Important security updates + +Suite: quantal-updates +ParentSuite: quantal +RepositoryType: deb +Description: Recommended updates + +Suite: quantal-updates +ParentSuite: quantal +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Recommended updates + +Suite: quantal-proposed +ParentSuite: quantal +RepositoryType: deb +Description: Pre-released updates + +Suite: quantal-proposed +ParentSuite: quantal +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Pre-released updates + +Suite: quantal-backports +ParentSuite: quantal +RepositoryType: deb +Description: Unsupported updates + +Suite: quantal-backports +ParentSuite: quantal +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Unsupported updates + +Suite: precise +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 12.04 'Precise Pangolin' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: precise +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 12.04 'Precise Pangolin' + +Suite: precise +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*12.04 +MatchURI: cdrom:\[Ubuntu.*12.04 +Description: Cdrom with Ubuntu 12.04 'Precise Pangolin' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: precise +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: precise +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +Description: Independent +Component: main +CompDescription: Provided by third-party software developers +CompDescriptionLong: Software offered by third party developers. + +Suite: precise-security +ParentSuite: precise +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: precise-security +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +Description: Important security updates + +Suite: precise-updates +ParentSuite: precise +RepositoryType: deb +Description: Recommended updates + +Suite: precise-updates +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Recommended updates + +Suite: precise-proposed +ParentSuite: precise +RepositoryType: deb +Description: Pre-released updates + +Suite: precise-proposed +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Pre-released updates + +Suite: precise-backports +ParentSuite: precise +RepositoryType: deb +Description: Unsupported updates + +Suite: precise-backports +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Unsupported updates + +Suite: oneiric +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 11.10 'Oneiric Ocelot' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: oneiric +ParentSuite: oneiric +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 11.10 'Oneiric Ocelot' + +Suite: oneiric +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*11.10 +MatchURI: cdrom:\[Ubuntu.*11.10 +Description: Cdrom with Ubuntu 11.10 'Oneiric Ocelot' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: oneiric +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: oneiric +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +Description: Independent +Component: main +CompDescription: Provided by third-party software developers +CompDescriptionLong: Software offered by third party developers. + +Suite: oneiric-security +ParentSuite: oneiric +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: oneiric-security +ParentSuite: oneiric +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +Description: Important security updates + +Suite: oneiric-updates +ParentSuite: oneiric +RepositoryType: deb +Description: Recommended updates + +Suite: oneiric-updates +ParentSuite: oneiric +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Recommended updates + +Suite: oneiric-proposed +ParentSuite: oneiric +RepositoryType: deb +Description: Pre-released updates + +Suite: oneiric-proposed +ParentSuite: oneiric +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Pre-released updates + +Suite: oneiric-backports +ParentSuite: oneiric +RepositoryType: deb +Description: Unsupported updates + +Suite: oneiric-backports +ParentSuite: oneiric +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Unsupported updates + + +Suite: natty +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 11.04 'Natty Narwhal' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: natty +ParentSuite: natty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 11.04 'Natty Narwhal' + +Suite: natty +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*11.04 +MatchURI: cdrom:\[Ubuntu.*11.04 +Description: Cdrom with Ubuntu 11.04 'Natty Narwhal' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: natty +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: natty +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +Description: Independent +Component: main +CompDescription: Provided by third-party software developers +CompDescriptionLong: Software offered by third party developers. + +Suite: natty-security +ParentSuite: natty +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: natty-security +ParentSuite: natty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +Description: Important security updates + +Suite: natty-updates +ParentSuite: natty +RepositoryType: deb +Description: Recommended updates + +Suite: natty-updates +ParentSuite: natty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Recommended updates + +Suite: natty-proposed +ParentSuite: natty +RepositoryType: deb +Description: Pre-released updates + +Suite: natty-proposed +ParentSuite: natty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Pre-released updates + +Suite: natty-backports +ParentSuite: natty +RepositoryType: deb +Description: Unsupported updates + +Suite: natty-backports +ParentSuite: natty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Unsupported updates + +Suite: maverick +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 10.10 'Maverick Meerkat' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: maverick +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*10.10 +MatchURI: cdrom:\[Ubuntu.*10.10 +Description: Cdrom with Ubuntu 10.10 'Maverick Meerkat' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: maverick +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: maverick +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +Description: Independent +Component: main +CompDescription: Provided by third-party software developers +CompDescriptionLong: Software offered by third party developers. + +Suite: maverick-security +ParentSuite: maverick +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: maverick-updates +ParentSuite: maverick +RepositoryType: deb +Description: Recommended updates + +Suite: maverick-proposed +ParentSuite: maverick +RepositoryType: deb +Description: Pre-released updates + +Suite: maverick-backports +ParentSuite: maverick +RepositoryType: deb +Description: Unsupported updates + +Suite: lucid +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 10.04 'Lucid Lynx' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: lucid +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*10.04 +MatchURI: cdrom:\[Ubuntu.*10.04 +Description: Cdrom with Ubuntu 10.04 'Lucid Lynx' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: lucid-security +ParentSuite: lucid +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: lucid-updates +ParentSuite: lucid +RepositoryType: deb +Description: Recommended updates + +Suite: lucid-proposed +ParentSuite: lucid +RepositoryType: deb +Description: Pre-released updates + +Suite: lucid-backports +ParentSuite: lucid +RepositoryType: deb +Description: Unsupported updates + +Suite: karmic +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 9.10 'Karmic Koala' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: karmic +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*9.10 +MatchURI: cdrom:\[Ubuntu.*9.10 +Description: Cdrom with Ubuntu 9.10 'Karmic Koala' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: karmic-security +ParentSuite: karmic +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: karmic-updates +ParentSuite: karmic +RepositoryType: deb +Description: Recommended updates + +Suite: karmic-proposed +ParentSuite: karmic +RepositoryType: deb +Description: Pre-released updates + +Suite: karmic-backports +ParentSuite: karmic +RepositoryType: deb +Description: Unsupported updates + +Suite: jaunty +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 9.04 'Jaunty Jackalope' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: jaunty +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*9.04 +MatchURI: cdrom:\[Ubuntu.*9.04 +Description: Cdrom with Ubuntu 9.04 'Jaunty Jackalope' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: jaunty-security +ParentSuite: jaunty +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: jaunty-updates +ParentSuite: jaunty +RepositoryType: deb +Description: Recommended updates + +Suite: jaunty-proposed +ParentSuite: jaunty +RepositoryType: deb +Description: Pre-released updates + +Suite: jaunty-backports +ParentSuite: jaunty +RepositoryType: deb +Description: Unsupported updates + +Suite: intrepid +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 8.10 'Intrepid Ibex' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: intrepid +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*8.10 +MatchURI: cdrom:\[Ubuntu.*8.10 +Description: Cdrom with Ubuntu 8.10 'Intrepid Ibex' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: intrepid-security +ParentSuite: intrepid +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: intrepid-updates +ParentSuite: intrepid +RepositoryType: deb +Description: Recommended updates + +Suite: intrepid-proposed +ParentSuite: intrepid +RepositoryType: deb +Description: Pre-released updates + +Suite: intrepid-backports +ParentSuite: intrepid +RepositoryType: deb +Description: Unsupported updates + + +Suite: hardy +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 8.04 'Hardy Heron' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: hardy +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*8.04 +MatchURI: cdrom:\[Ubuntu.*8.04 +Description: Cdrom with Ubuntu 8.04 'Hardy Heron' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: hardy-security +ParentSuite: hardy +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: hardy-updates +ParentSuite: hardy +RepositoryType: deb +Description: Recommended updates + +Suite: hardy-proposed +ParentSuite: hardy +RepositoryType: deb +Description: Pre-released updates + +Suite: hardy-backports +ParentSuite: hardy +RepositoryType: deb +Description: Unsupported updates + + +Suite: gutsy +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu +BaseURI-sparc: http://archive.ubuntu.com/ubuntu/ +MatchURI-sparc: archive.ubuntu.com/ubuntu +MirrorsFile: Ubuntu.mirrors +Description: Ubuntu 7.10 'Gutsy Gibbon' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: gutsy +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*7.10 +MatchURI: cdrom:\[Ubuntu.*7.10 +Description: Cdrom with Ubuntu 7.10 'Gutsy Gibbon' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: gutsy-security +ParentSuite: gutsy +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-sparc: http://security.ubuntu.com/ubuntu/ +MatchURI-sparc: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: gutsy-updates +ParentSuite: gutsy +RepositoryType: deb +Description: Recommended updates + +Suite: gutsy-proposed +ParentSuite: gutsy +RepositoryType: deb +Description: Pre-released updates + +Suite: gutsy-backports +ParentSuite: gutsy +RepositoryType: deb +Description: Unsupported updates + + +Suite: feisty +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports +MirrorsFile: Ubuntu.mirrors +Description: Ubuntu 7.04 'Feisty Fawn' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: feisty +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*7.04 +MatchURI: cdrom:\[Ubuntu.*7.04 +Description: Cdrom with Ubuntu 7.04 'Feisty Fawn' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: feisty-security +ParentSuite: feisty +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports +Description: Important security updates + +Suite: feisty-updates +ParentSuite: feisty +RepositoryType: deb +Description: Recommended updates + +Suite: feisty-proposed +ParentSuite: feisty +RepositoryType: deb +Description: Pre-released updates + +Suite: feisty-backports +ParentSuite: feisty +RepositoryType: deb +Description: Unsupported updates + +Suite: edgy +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports +MirrorsFile: Ubuntu.mirrors +Description: Ubuntu 6.10 'Edgy Eft' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: edgy +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*6.10 +MatchURI: cdrom:\[Ubuntu.*6.10 +Description: Cdrom with Ubuntu 6.10 'Edgy Eft' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: edgy-security +ParentSuite: edgy +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports +Description: Important security updates + +Suite: edgy-updates +ParentSuite: edgy +RepositoryType: deb +Description: Recommended updates + +Suite: edgy-proposed +ParentSuite: edgy +RepositoryType: deb +Description: Pre-released updates + +Suite: edgy-backports +ParentSuite: edgy +RepositoryType: deb +Description: Unsupported updates + +Suite: dapper +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports +MirrorsFile: Ubuntu.mirrors +Description: Ubuntu 6.06 LTS 'Dapper Drake' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained (universe) +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +CompDescription: Restricted software (Multiverse) +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: dapper +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*6.06 +MatchURI: cdrom:\[Ubuntu.*6.06 +Description: Cdrom with Ubuntu 6.06 LTS 'Dapper Drake' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: dapper-security +ParentSuite: dapper +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports +Description: Important security updates + +Suite: dapper-updates +ParentSuite: dapper +RepositoryType: deb +Description: Recommended updates + +Suite: dapper-proposed +ParentSuite: dapper +RepositoryType: deb +Description: Pre-released updates + +Suite: dapper-backports +ParentSuite: dapper +RepositoryType: deb +Description: Unsupported updates + +Suite: breezy +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: Ubuntu.mirrors +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 5.10 'Breezy Badger' +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright +Component: universe +CompDescription: Community-maintained (Universe) +Component: multiverse +CompDescription: Non-free (Multiverse) + +Suite: breezy +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*5.10 +MatchURI: cdrom:\[Ubuntu.*5.10 +Description: Cdrom with Ubuntu 5.10 'Breezy Badger' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: breezy-security +ParentSuite: breezy +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 5.10 Security Updates + +Suite: breezy-updates +ParentSuite: breezy +RepositoryType: deb +Description: Ubuntu 5.10 Updates + +Suite: breezy-backports +ParentSuite: breezy +RepositoryType: deb +Description: Ubuntu 5.10 Backports + +Suite: hoary +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports +MirrorsFile: Ubuntu.mirrors +Description: Ubuntu 5.04 'Hoary Hedgehog' +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright +Component: universe +CompDescription: Community-maintained (Universe) +Component: multiverse +CompDescription: Non-free (Multiverse) + +Suite: hoary +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*5.04 +MatchURI: cdrom:\[Ubuntu.*5.04 +Description: Cdrom with Ubuntu 5.04 'Hoary Hedgehog' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: hoary-security +ParentSuite: hoary +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 5.04 Security Updates + +Suite: hoary-updates +ParentSuite: hoary +RepositoryType: deb +Description: Ubuntu 5.04 Updates + +Suite: hoary-backports +ParentSuite: hoary +RepositoryType: deb +Description: Ubuntu 5.04 Backports + +Suite: warty +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +Description: Ubuntu 4.10 'Warty Warthog' +Component: main +CompDescription: No longer officially supported +Component: restricted +CompDescription: Restricted copyright +Component: universe +CompDescription: Community-maintained (Universe) +Component: multiverse +CompDescription: Non-free (Multiverse) + +Suite: warty +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*4.10 +MatchURI: cdrom:\[Ubuntu.*4.10 +Description: Cdrom with Ubuntu 4.10 'Warty Warthog' +Available: False +Component: main +CompDescription: No longer officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: warty-security +ParentSuite: warty +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Ubuntu 4.10 Security Updates + +Suite: warty-updates +ParentSuite: warty +RepositoryType: deb +Description: Ubuntu 4.10 Updates + +Suite: warty-backports +ParentSuite: warty +RepositoryType: deb +Description: Ubuntu 4.10 Backports + diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/utils.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/utils.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/utils.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/utils.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,461 @@ +# utils.py +# +# Copyright (c) 2004-2008 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +from gettext import gettext as _ +from gettext import ngettext +from stat import (S_IMODE, ST_MODE, S_IXUSR) +from math import ceil + +import apt_pkg +apt_pkg.init_config() + +import locale +import logging +import re +import os +import os.path +import glob +import subprocess +import sys +import time +import urllib2 +import urlparse + +from copy import copy +from urlparse import urlsplit + + +class ExecutionTime(object): + """ + Helper that can be used in with statements to have a simple + measure of the timing of a particular block of code, e.g. + with ExecutionTime("db flush"): + db.flush() + """ + def __init__(self, info=""): + self.info = info + def __enter__(self): + self.now = time.time() + def __exit__(self, type, value, stack): + print "%s: %s" % (self.info, time.time() - self.now) + +def get_string_with_no_auth_from_source_entry(entry): + tmp = copy(entry) + url_parts = urlsplit(tmp.uri) + if url_parts.username: + tmp.uri = tmp.uri.replace(url_parts.username, "hidden-u") + if url_parts.password: + tmp.uri = tmp.uri.replace(url_parts.password, "hidden-p") + return str(tmp) + +def estimate_kernel_size_in_boot(): + """ estimate the amount of space that the current kernel takes in /boot """ + size = 0 + kver = os.uname()[2] + for f in glob.glob("/boot/*%s*" % kver): + size += os.path.getsize(f) + return size + +def is_unity_running(): + """ return True if Unity is currently running """ + unity_running = False + try: + import dbus + bus = dbus.SessionBus() + unity_running = bus.name_has_owner("com.canonical.Unity") + except: + logging.exception("could not check for Unity dbus service") + return unity_running + +def is_child_of_process_name(processname, pid=None): + if not pid: + pid = os.getpid() + while pid > 0: + stat_file = "/proc/%s/stat" % pid + stat = open(stat_file).read() + # extract command (inside ()) + command = stat.partition("(")[2].partition(")")[0] + if command == processname: + return True + # get parent (second to the right of command) and check that next + pid = int(stat.partition(")")[2].split()[1]) + return False + +def inside_chroot(): + """ returns True if we are inside a chroot + """ + # if there is no proc or no pid 1 we are very likely inside a chroot + if not os.path.exists("/proc") or not os.path.exists("/proc/1"): + return True + # if the inode is differnt for pid 1 "/" and our "/" + return os.stat("/") != os.stat("/proc/1/root") + +def wrap(t, width=70, subsequent_indent=""): + """ helpers inspired after textwrap - unfortunately + we can not use textwrap directly because it break + packagenames with "-" in them into new lines + """ + out = "" + for s in t.split(): + if (len(out)-out.rfind("\n")) + len(s) > width: + out += "\n" + subsequent_indent + out += s + " " + return out + +def twrap(s, **kwargs): + msg = "" + paras = s.split("\n") + for par in paras: + s = wrap(par, **kwargs) + msg += s+"\n" + return msg + +def lsmod(): + " return list of loaded modules (or [] if lsmod is not found) " + modules=[] + # FIXME raise? + if not os.path.exists("/sbin/lsmod"): + return [] + p=subprocess.Popen(["/sbin/lsmod"], stdout=subprocess.PIPE) + lines=p.communicate()[0].split("\n") + # remove heading line: "Modules Size Used by" + del lines[0] + # add lines to list, skip empty lines + for line in lines: + if line: + modules.append(line.split()[0]) + return modules + +def check_and_fix_xbit(path): + " check if a given binary has the executable bit and if not, add it" + if not os.path.exists(path): + return + mode = S_IMODE(os.stat(path)[ST_MODE]) + if not ((mode & S_IXUSR) == S_IXUSR): + os.chmod(path, mode | S_IXUSR) + +def country_mirror(): + " helper to get the country mirror from the current locale " + # special cases go here + lang_mirror = { 'c' : '', + } + # no lang, no mirror + if not 'LANG' in os.environ: + return '' + lang = os.environ['LANG'].lower() + # check if it is a special case + if lang[:5] in lang_mirror: + return lang_mirror[lang[:5]] + # now check for the most comon form (en_US.UTF-8) + if "_" in lang: + country = lang.split(".")[0].split("_")[1] + if "@" in country: + country = country.split("@")[0] + return country+"." + else: + return lang[:2]+"." + return '' + +def get_dist(): + " return the codename of the current runing distro " + # support debug overwrite + dist = os.environ.get("META_RELEASE_FAKE_CODENAME") + if dist: + logging.warn("using fake release name '%s' (because of META_RELEASE_FAKE_CODENAME environment) " % dist) + return dist + # then check the real one + from subprocess import Popen, PIPE + p = Popen(["lsb_release","-c","-s"],stdout=PIPE) + res = p.wait() + if res != 0: + sys.stderr.write("lsb_release returned exitcode: %i\n" % res) + return "unknown distribution" + dist = p.stdout.readline().strip() + return dist + +class HeadRequest(urllib2.Request): + def get_method(self): + return "HEAD" + +def url_downloadable(uri, debug_func=None): + """ + helper that checks if the given uri exists and is downloadable + (supports optional debug_func function handler to support + e.g. logging) + + Supports http (via HEAD) and ftp (via size request) + """ + if not debug_func: + lambda x: True + debug_func("url_downloadable: %s" % uri) + (scheme, netloc, path, querry, fragment) = urlparse.urlsplit(uri) + debug_func("s='%s' n='%s' p='%s' q='%s' f='%s'" % (scheme, netloc, path, querry, fragment)) + if scheme == "http": + try: + http_file = urllib2.urlopen(HeadRequest(uri)) + http_file.close() + if http_file.code == 200: + return True + return False + except Exception, e: + debug_func("error from httplib: '%s'" % e) + return False + elif scheme == "ftp": + import ftplib + try: + f = ftplib.FTP(netloc) + f.login() + f.cwd(os.path.dirname(path)) + size = f.size(os.path.basename(path)) + f.quit() + if debug_func: + debug_func("ftplib.size() returned: %s" % size) + if size != 0: + return True + except Exception, e: + if debug_func: + debug_func("error from ftplib: '%s'" % e) + return False + return False + +def init_proxy(gsettings=None): + """ init proxy settings + + * first check for http_proxy environment (always wins), + * then check the apt.conf http proxy, + * then look into synaptics conffile + * then into gconf (if gconfclient was supplied) + """ + SYNAPTIC_CONF_FILE = "/root/.synaptic/synaptic.conf" + proxy = None + # generic apt config wins + if apt_pkg.config.find("Acquire::http::Proxy") != '': + proxy = apt_pkg.config.find("Acquire::http::Proxy") + # then synaptic + elif os.path.exists(SYNAPTIC_CONF_FILE): + cnf = apt_pkg.Configuration() + apt_pkg.read_config_file(cnf, SYNAPTIC_CONF_FILE) + use_proxy = cnf.find_b("Synaptic::useProxy", False) + if use_proxy: + proxy_host = cnf.find("Synaptic::httpProxy") + proxy_port = str(cnf.find_i("Synaptic::httpProxyPort")) + if proxy_host and proxy_port: + proxy = "http://%s:%s/" % (proxy_host, proxy_port) + # gconf is no more + # elif gconfclient: + # try: # see LP: #281248 + # if gconfclient.get_bool("/system/http_proxy/use_http_proxy"): + # host = gconfclient.get_string("/system/http_proxy/host") + # port = gconfclient.get_int("/system/http_proxy/port") + # use_auth = gconfclient.get_bool("/system/http_proxy/use_authentication") + # if host and port: + # if use_auth: + # auth_user = gconfclient.get_string("/system/http_proxy/authentication_user") + # auth_pw = gconfclient.get_string("/system/http_proxy/authentication_password") + # proxy = "http://%s:%s@%s:%s/" % (auth_user,auth_pw,host, port) + # else: + # proxy = "http://%s:%s/" % (host, port) + # except Exception, e: + # print "error from gconf: %s" % e + # if we have a proxy, set it + if proxy: + # basic verification + if not re.match("http://\w+", proxy): + print >> sys.stderr, "proxy '%s' looks invalid" % proxy + return + proxy_support = urllib2.ProxyHandler({"http":proxy}) + opener = urllib2.build_opener(proxy_support) + urllib2.install_opener(opener) + os.putenv("http_proxy",proxy) + return proxy + +def on_battery(): + """ + Check via dbus if the system is running on battery. + This function is using UPower per default, if UPower is not + available it falls-back to DeviceKit.Power. + """ + try: + import dbus + bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM) + try: + devobj = bus.get_object('org.freedesktop.UPower', + '/org/freedesktop/UPower') + dev = dbus.Interface(devobj, 'org.freedesktop.DBus.Properties') + return dev.Get('org.freedesktop.UPower', 'OnBattery') + except dbus.exceptions.DBusException, e: + if e._dbus_error_name != 'org.freedesktop.DBus.Error.ServiceUnknown': + raise + devobj = bus.get_object('org.freedesktop.DeviceKit.Power', + '/org/freedesktop/DeviceKit/Power') + dev = dbus.Interface(devobj, "org.freedesktop.DBus.Properties") + return dev.Get("org.freedesktop.DeviceKit.Power", "on_battery") + except Exception, e: + #import sys + #print >>sys.stderr, "on_battery returned error: ", e + return False + +def inhibit_sleep(): + """ + Send a dbus signal to power-manager to not suspend + the system, using the freedesktop common interface + """ + try: + import dbus + bus = dbus.Bus(dbus.Bus.TYPE_SESSION) + devobj = bus.get_object('org.freedesktop.PowerManagement', + '/org/freedesktop/PowerManagement/Inhibit') + dev = dbus.Interface(devobj, "org.freedesktop.PowerManagement.Inhibit") + cookie = dev.Inhibit('UpdateManager', 'Updating system') + return (dev, cookie) + except Exception: + #print "could not send the dbus Inhibit signal: %s" % e + return (False, False) + +def allow_sleep(dev, cookie): + """Send a dbus signal to gnome-power-manager to allow a suspending + the system""" + try: + dev.UnInhibit(cookie) + except Exception, e: + print "could not send the dbus UnInhibit signal: %s" % e + + +def str_to_bool(str): + if str == "0" or str.upper() == "FALSE": + return False + return True + +def utf8(str): + return unicode(str, 'latin1').encode('utf-8') + +def get_lang(): + import logging + try: + (locale_s, encoding) = locale.getdefaultlocale() + return locale_s + except Exception: + logging.exception("gedefaultlocale() failed") + return None + +def get_ubuntu_flavor(): + """ try to guess the flavor based on the running desktop """ + # this will (of course) not work in a server environment, + # but the main use case for this is to show the right + # release notes + denv = os.environ.get("DESKTOP_SESSION", "") + if "gnome" in denv: + return "ubuntu" + elif "kde" in denv: + return "kubuntu" + elif "xfce" in denv or "xubuntu" in denv: + return "xubuntu" + elif "LXDE" in denv or "Lubuntu" in denv: + return "lubuntu" + # default to ubuntu if nothing more specific is found + return "ubuntu" + +def error(parent, summary, message): + from gi.repository import Gtk, Gdk + d = Gtk.MessageDialog(parent=parent, + flags=Gtk.DialogFlags.MODAL, + type=Gtk.MessageType.ERROR, + buttons=Gtk.ButtonsType.CLOSE) + d.set_markup("%s\n\n%s" % (summary, message)) + d.realize() + d.get_window().set_functions(Gdk.WMFunction.MOVE) + d.set_title("") + d.run() + d.destroy() + return False + +def humanize_size(bytes): + """ + Convert a given size in bytes to a nicer better readable unit + """ + + if bytes < 1000 * 1000: + # to have 0 for 0 bytes, 1 for 0-1000 bytes and for 1 and above round up + size_in_kb = int(ceil(bytes/float(1000))); + # TRANSLATORS: download size of small updates, e.g. "250 kB" + return ngettext("%(size).0f kB", "%(size).0f kB", size_in_kb) % { "size" : size_in_kb } + else: + # TRANSLATORS: download size of updates, e.g. "2.3 MB" + return locale.format_string(_("%.1f MB"), bytes / 1000.0 / 1000.0) + +def get_arch(): + return apt_pkg.Config.find("APT::Architecture") + + +def is_port_already_listening(port): + """ check if the current system is listening on the given tcp port """ + # index in the line + INDEX_LOCAL_ADDR = 1 + #INDEX_REMOTE_ADDR = 2 + INDEX_STATE = 3 + # state (st) that we care about + STATE_LISTENING = '0A' + # read the data + for line in open("/proc/net/tcp"): + line = line.strip() + if not line: + continue + # split, values are: + # sl local_address rem_address st tx_queue rx_queue tr tm->when retrnsmt uid timeout inode + values = line.split() + state = values[INDEX_STATE] + if state != STATE_LISTENING: + continue + local_port_str = values[INDEX_LOCAL_ADDR].split(":")[1] + local_port = int(local_port_str, 16) + if local_port == port: + return True + return False + + +def iptables_active(): + """ Return True if iptables is active """ + # FIXME: is there a better way? + iptables_empty="""Chain INPUT (policy ACCEPT) +target prot opt source destination + +Chain FORWARD (policy ACCEPT) +target prot opt source destination + +Chain OUTPUT (policy ACCEPT) +target prot opt source destination +""" + if os.getuid() != 0: + raise OSError, "Need root to check the iptables state" + if not os.path.exists("/sbin/iptables"): + return False + out = subprocess.Popen(["iptables", "-L"], + stdout=subprocess.PIPE).communicate()[0] + if out == iptables_empty: + return False + return True + + +if __name__ == "__main__": + #print mirror_from_sources_list() + #print on_battery() + #print inside_chroot() + print iptables_active() diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/window_main.ui update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/window_main.ui --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/window_main.ui 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/window_main.ui 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,267 @@ + + window_main + + + + 0 + 0 + 349 + 294 + + + + Distribution Upgrade + + + + + + Show Terminal >>> + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 302 + 21 + + + + + + + + + + + false + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 20 + 16 + + + + + + + + + + + false + + + + + + + + + + 0 + 0 + + + + + + + false + + + + + + + + 0 + 0 + + + + + + + false + + + + + + + Preparing to upgrade + + + false + + + + + + + + 0 + 0 + + + + + + + false + + + + + + + + 0 + 0 + + + + + + + false + + + + + + + Getting new packages + + + false + + + + + + + Cleaning up + + + false + + + + + + + Installing the upgrades + + + false + + + + + + + Setting new software channels + + + false + + + + + + + Restarting the computer + + + false + + + + + + + + 0 + 0 + + + + + + + false + + + + + + + + 0 + 0 + + + + + + + false + + + + + + + + + <b><big>Upgrading Ubuntu to version 12.04</big></b> + + + false + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + 24 + + + + + + + + + diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/xorg_fix_proprietary.py update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/xorg_fix_proprietary.py --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/xorg_fix_proprietary.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/xorg_fix_proprietary.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,165 @@ +#!/usr/bin/python +# +# this script will exaimne /etc/xorg/xorg.conf and +# transition from broken proprietary drivers to the free ones +# + +import sys +import os +import os.path +import logging +import time +import shutil +import subprocess +import apt_pkg +apt_pkg.init() + +# main xorg.conf +XORG_CONF="/etc/X11/xorg.conf" + +# really old and most likely obsolete conf +OBSOLETE_XORG_CONF="/etc/X11/XF86Config-4" + +def remove_input_devices(xorg_source=XORG_CONF, xorg_destination=XORG_CONF): + logging.debug("remove_input_devices") + content=[] + in_input_devices = False + for raw in open(xorg_source): + line = raw.strip() + if (line.lower().startswith("section") and + line.lower().split("#")[0].strip().endswith('"inputdevice"')): + logging.debug("found 'InputDevice' section") + content.append("# commented out by update-manager, HAL is now used and auto-detects devices\n") + content.append("# Keyboard settings are now read from /etc/default/console-setup\n") + content.append("#"+raw) + in_input_devices=True + elif line.lower().startswith("endsection") and in_input_devices: + content.append("#"+raw) + in_input_devices=False + elif line.lower().startswith("inputdevice"): + logging.debug("commenting out '%s' " % line) + content.append("# commented out by update-manager, HAL is now used and auto-detects devices\n") + content.append("# Keyboard settings are now read from /etc/default/console-setup\n") + content.append("#"+raw) + elif in_input_devices: + logging.debug("commenting out '%s' " % line) + content.append("#"+raw) + else: + content.append(raw) + open(xorg_destination+".new","w").write("".join(content)) + os.rename(xorg_destination+".new", xorg_destination) + return True + +def replace_driver_from_xorg(old_driver, new_driver, xorg=XORG_CONF): + """ + this removes old_driver driver from the xorg.conf and subsitutes + it with the new_driver + """ + if not os.path.exists(xorg): + logging.warning("file %s not found" % xorg) + return + content=[] + for line in open(xorg): + # remove comments + s=line.split("#")[0].strip() + # check for fglrx driver entry + if (s.lower().startswith("driver") and + s.endswith('"%s"' % old_driver)): + logging.debug("line '%s' found" % line) + line='\tDriver\t"%s"\n' % new_driver + logging.debug("replacing with '%s'" % line) + content.append(line) + # write out the new version + if open(xorg).readlines() != content: + logging.info("saveing new %s (%s -> %s)" % (xorg, old_driver, new_driver)) + open(xorg+".xorg_fix","w").write("".join(content)) + os.rename(xorg+".xorg_fix", xorg) + +def comment_out_driver_from_xorg(old_driver, xorg=XORG_CONF): + """ + this comments out a driver from xorg.conf + """ + if not os.path.exists(xorg): + logging.warning("file %s not found" % xorg) + return + content=[] + for line in open(xorg): + # remove comments + s=line.split("#")[0].strip() + # check for old_driver driver entry + if (s.lower().startswith("driver") and + s.endswith('"%s"' % old_driver)): + logging.debug("line '%s' found" % line) + line='#%s' % line + logging.debug("replacing with '%s'" % line) + content.append(line) + # write out the new version + if open(xorg).readlines() != content: + logging.info("saveing new %s (commenting %s)" % (xorg, old_driver)) + open(xorg+".xorg_fix","w").write("".join(content)) + os.rename(xorg+".xorg_fix", xorg) + +def is_multiseat(xorg_source=XORG_CONF): + " check if we have a multiseat xorg config " + def is_serverlayout_line(line): + return (not line.strip().startswith("#") and + line.strip().lower().endswith('"serverlayout"')) + msl = len(filter(is_serverlayout_line, open(xorg_source))) + logging.debug("is_multiseat: lines %i", msl) + return msl > 1 + +if __name__ == "__main__": + if not os.getuid() == 0: + print "Need to run as root" + sys.exit(1) + + # we pretend to be update-manger so that apport picks up when we crash + sys.argv[0] = "/usr/bin/update-manager" + + # setup logging + logging.basicConfig(level=logging.DEBUG, + filename="/var/log/dist-upgrade/xorg_fixup.log", + filemode='w') + + logging.info("%s running" % sys.argv[0]) + + if os.path.exists(OBSOLETE_XORG_CONF): + old = OBSOLETE_XORG_CONF + new = OBSOLETE_XORG_CONF+".obsolete" + logging.info("renaming obsolete %s -> %s" % (old, new)) + os.rename(old, new) + + if not os.path.exists(XORG_CONF): + logging.info("No xorg.conf, exiting") + sys.exit(0) + + # remove empty xorg.conf to help xorg and its auto probing logic + # (LP: #439551) + if os.path.getsize(XORG_CONF) == 0: + logging.info("xorg.conf is zero size, removing") + os.remove(XORG_CONF) + sys.exit(0) + + #make a backup of the xorg.conf + backup = XORG_CONF + ".dist-upgrade-" + time.strftime("%Y%m%d%H%M") + logging.debug("creating backup '%s'" % backup) + shutil.copy(XORG_CONF, backup) + + if (not os.path.exists("/usr/lib/xorg/modules/drivers/fglrx_drv.so") and + "fglrx" in open(XORG_CONF).read()): + logging.info("Removing fglrx from %s" % XORG_CONF) + comment_out_driver_from_xorg("fglrx") + + if (not os.path.exists("/usr/lib/xorg/modules/drivers/nvidia_drv.so") and + "nvidia" in open(XORG_CONF).read()): + logging.info("Removing nvidia from %s" % XORG_CONF) + comment_out_driver_from_xorg("nvidia") + + # now run the removeInputDevices() if we have a new xserver + ver=subprocess.Popen(["dpkg-query","-W","-f=${Version}","xserver-xorg-core"], stdout=subprocess.PIPE).communicate()[0] + logging.info("xserver-xorg-core version is '%s'" % ver) + if ver and apt_pkg.version_compare(ver, "2:1.5.0") > 0: + if not is_multiseat(): + remove_input_devices() + else: + logging.info("multiseat setup, ignoring") diff -Nru update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/zz-update-grub update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/zz-update-grub --- update-manager-17.10.11/AutoUpgradeTester/DistUpgrade/zz-update-grub 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/DistUpgrade/zz-update-grub 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,19 @@ +#! /bin/sh +set -e + +which update-grub >/dev/null 2>&1 || exit 0 + +set -- $DEB_MAINT_PARAMS +mode="${1#\'}" +mode="${mode%\'}" +case $0:$mode in + # Only run on postinst configure and postrm remove, to avoid wasting + # time by calling update-grub multiple times on upgrade and removal. + # Also run if we have no DEB_MAINT_PARAMS, in order to work with old + # kernel packages. + */postinst.d/*:|*/postinst.d/*:configure|*/postrm.d/*:|*/postrm.d/*:remove) + exec update-grub + ;; +esac + +exit 0 diff -Nru update-manager-17.10.11/AutoUpgradeTester/install_all_main.py update-manager-0.156.14.15/AutoUpgradeTester/install_all_main.py --- update-manager-17.10.11/AutoUpgradeTester/install_all_main.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/install_all_main.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,79 @@ +#!/usr/bin/python + +import apt +import apt_pkg + +def blacklisted(name): + # we need to blacklist linux-image-* as it does not install + # cleanly in the chroot (postinst failes) + blacklist = ["linux-image-","ltsp-client", + "glibc-doc-reference", "libpthread-dev", + "cman", "mysql-server", "fuse-utils", + "ltspfs", "gfs2-tools", "edubuntu-server", + "gnbd-client", "gnbd-server", "mysql-server-5.0", + "rgmanager", "clvm","redhat-cluster-suit", + # has a funny "can not be upgraded automatically" policy + # see debian #368226 + "quagga", + "system-config-cluster", "gfs-tools"] + for b in blacklist: + if name.startswith(b): + return True + return False + +#apt_pkg.Config.Set("Dir::State::status","./empty") + +cache = apt.Cache() +group = apt_pkg.GetPkgActionGroup(cache._depcache) +#print [pkg.name for pkg in cache if pkg.is_installed] + +troublemaker = set() +for pkg in cache: + for c in pkg.candidateOrigin: + if c.component == "main": + current = set([p.name for p in cache if p.marked_install]) + if not (pkg.is_installed or blacklisted(pkg.name)): + pkg.mark_install() + new = set([p.name for p in cache if p.marked_install]) + #if not pkg.markedInstall or len(new) < len(current): + if not (pkg.is_installed or pkg.marked_install): + print "Can't install: %s" % pkg.name + if len(current-new) > 0: + troublemaker.add(pkg.name) + print "Installing '%s' caused removals_ %s" % (pkg.name, current - new) + +#print len(troublemaker) +for pkg in ["ubuntu-desktop", "ubuntu-minimal", "ubuntu-standard"]: + cache[pkg].mark_install() + +# make sure we don't install blacklisted stuff +for pkg in cache: + if blacklisted(pkg.name): + pkg.mark_keep() + +print "We can install:" +print len([pkg.name for pkg in cache if pkg.marked_install]) +print "Download: " +pm = apt_pkg.GetPackageManager(cache._depcache) +fetcher = apt_pkg.GetAcquire() +pm.GetArchives(fetcher, cache._list, cache._records) +print apt_pkg.SizeToStr(fetcher.FetchNeeded) +print "Total space: ", apt_pkg.SizeToStr(cache._depcache.UsrSize) + +res = False +current = 0 +maxRetries = 3 +while current < maxRetries: + try: + res = cache.commit(apt.progress.text.AcquireProgress(), + apt.progress.base.InstallProgress()) + except IOError, e: + # fetch failed, will be retried + current += 1 + print "Retrying to fetch: ", current + continue + except SystemError, e: + print "Error installing packages! " + print e + print "Install result: ",res + break diff -Nru update-manager-17.10.11/AutoUpgradeTester/install_all.py update-manager-0.156.14.15/AutoUpgradeTester/install_all.py --- update-manager-17.10.11/AutoUpgradeTester/install_all.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/install_all.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,235 @@ +#!/usr/bin/python + + +import apt +import apt_pkg +import re +import os +import string +import sys + +# global install blacklist +pkg_blacklist = None + +# whitelist regexp to include only certain packages (useful for e.g. +# installing only all python packages) +pkg_whitelist = "" + +class InstallProgress(apt.progress.base.InstallProgress): + " Out install progress that can automatically remove broken pkgs " + def error(self, pkg, errormsg): + # on failure: + # - add failing package to "install_failures.txt" [done] + # - remove package from best.txt [done] + # FIXME: - remove all rdepends from best.txt + # - remove the failed install attempts [done] + # * explode if a package can not be removed and let the user cleanup + open("install_failures.txt","a").write("%s _:_ %s" % (pkg, errormsg)) + bad = set() + bad.add(os.path.basename(pkg).split("_")[0]) + # FIXME: just run apt-cache rdepends $pkg here? + # or use apt.Package.candidateDependencies ? + # or calculate the set again? <- BEST! + for name in bad: + new_best = open("best.txt").read().replace(name+"\n","") + open("best.txt","w").write(new_best) + open("install_blacklist.cfg","a").write("# auto added by install_all.py\n%s\n" % name) + +def do_install(cache): + # go and install + res = False + current = 0 + maxRetries = 5 + while current < maxRetries: + print "Retry: ", current + try: + res = cache.commit(apt.progress.text.AcquireProgress(), + InstallProgress()) + break + except IOError, e: + # fetch failed, will be retried + current += 1 + print "Retrying to fetch: ", current, e + continue + except SystemError, e: + print "Error installing packages! " + print e + print "Install result: ",res + break + # check for failed packages and remove them + if os.path.exists("install_failures.txt"): + failures = set(map(lambda s: os.path.basename(s.split("_:_")[0]).split("_")[0], + open("install_failures.txt").readlines())) + print "failed: ", failures + assert(os.system("dpkg -r %s" % " ".join(failures)) == 0) + assert(os.system("dpkg --configure -a") == 0) + # remove pos.txt and best.txt to force recalculation + os.unlink("pos.txt") + os.unlink("best.txt") + return res + +def blacklisted(name): + global pkg_blacklist + if pkg_blacklist is None and os.path.exists("install_blacklist.cfg"): + pkg_blacklist = set() + for name in map(string.strip, open("install_blacklist.cfg").readlines()): + if name and not name.startswith("#"): + pkg_blacklist.add(name) + print "blacklist: ", pkg_blacklist + if pkg_blacklist: + for b in pkg_blacklist: + if re.match(b, name): + return True + return False + +def reapply(cache, pkgnames): + for name in pkgnames: + cache[name].mark_install(False) + +def contains_blacklisted_pkg(cache): + for pkg in cache: + if pkg.marked_install and blacklisted(pkg.name): + return True + return False + + +# ---------------------------------------------------------------- + +#apt_pkg.Config.Set("Dir::State::status","./empty") + +# debug stuff +#apt_pkg.Config.Set("Debug::pkgProblemResolver","true") +#apt_pkg.Config.Set("Debug::pkgDepCache::AutoInstall","true") +#apt_pkg.Config.Set("Debug::pkgDpkgPM","true") + +# Increase the maxsize limits here +# +# this code in apt that splits the argument list if its too long +# is problematic, because it may happen that +# the argument list is split in a way that A depends on B +# and they are in the same "--configure A B" run +# - with the split they may now be configured in different +# runs + +apt_pkg.config.set("Dpkg::MaxArgs",str(16*1024)) +apt_pkg.config.set("Dpkg::MaxArgBytes",str(64*1024)) + +print "install_all.py" +os.environ["DEBIAN_FRONTEND"] = "noninteractive" +os.environ["APT_LISTCHANGES_FRONTEND"] = "none" + +cache = apt.Cache() + +# dapper does not have this yet +group = cache.actiongroup() +#print [pkg.name for pkg in cache if pkg.is_installed] + +# see what gives us problems +troublemaker = set() +best = set() + +# first install all of main, then the rest +comps= ["main","universe"] +i=0 + +# reapply checkpoints +if os.path.exists("best.txt"): + best = map(string.strip, open("best.txt").readlines()) + reapply(cache, best) + +if os.path.exists("pos.txt"): + (comp, i) = open("pos.txt").read().split() + i = int(i) + if comp == "universe": + comps = ["universe"] + +sorted_pkgs = cache.keys()[:] +sorted_pkgs.sort() + + +for comp in comps: + for pkgname in sorted_pkgs[i:]: + # skip multiarch packages + if ":" in pkgname: + continue + pkg = cache[pkgname] + i += 1 + percent = (float(i)/len(cache))*100.0 + print "\r%.3f " % percent, + sys.stdout.flush() + # ignore stuff that does not match the whitelist pattern + # (if we use this) + if pkg_whitelist: + if not re.match(pkg_whitelist, pkg.name): + #print "skipping '%s' (not in whitelist)" % pkg.name + continue + print "looking at ", pkg.name + # only work on stuff that has a origin + if pkg.candidate: + for c in pkg.candidate.origins: + if comp == None or c.component == comp: + current = set([p.name for p in cache if p.marked_install]) + if not (pkg.is_installed or blacklisted(pkg.name)): + try: + pkg.mark_install() + except SystemError, e: + print "Installing '%s' cause problems: %s" % (pkg.name, e) + pkg.mark_keep() + # check blacklist + if contains_blacklisted_pkg(cache): + cache.clear() + reapply(cache, best) + continue + new = set([p.name for p in cache if p.marked_install]) + #if not pkg.marked_install or len(new) < len(current): + if not (pkg.is_installed or pkg.marked_install): + print "Can't install: %s" % pkg.name + if len(current-new) > 0: + troublemaker.add(pkg.name) + print "Installing '%s' caused removals %s" % (pkg.name, current - new) + # FIXME: instead of len() use score() and score packages + # according to criteria like "in main", "priority" etc + if len(new) >= len(best): + best = new + open("best.txt","w").write("\n".join(best)) + open("pos.txt","w").write("%s %s" % (comp, i)) + else: + print "Installing '%s' reduced the set (%s < %s)" % (pkg.name, len(new), len(best)) + cache.clear() + reapply(cache, best) + i=0 + +# make sure that the ubuntu base packages are installed (and a bootloader) +print len(troublemaker) +for pkg in ["ubuntu-desktop", "ubuntu-minimal", "ubuntu-standard", "grub-pc"]: + cache[pkg].mark_install() + +# make sure we don't install blacklisted stuff +for pkg in cache: + if blacklisted(pkg.name): + pkg.mark_keep() + +# install it +print "We can install:", len([pkg.name for pkg in cache if pkg.marked_install]) +# get size +pm = apt_pkg.PackageManager(cache._depcache) +fetcher = apt_pkg.Acquire() +pm.get_archives(fetcher, cache._list, cache._records) +print "Download: ", apt_pkg.size_to_str(fetcher.fetch_needed) +print "Total space: ", apt_pkg.size_to_str(cache._depcache.usr_size) + +# write out file with all pkgs +outf = "all_pkgs.cfg" +print "writing out file with the selected package names to '%s'" % outf +f = open(outf, "w") +f.write("\n".join([pkg.name for pkg in cache if pkg.marked_install])) +f.close() + +# now do the real install +res = do_install(cache) + +if not res: + # FIXME: re-exec itself + sys.exit(1) + +sys.exit(0) diff -Nru update-manager-17.10.11/AutoUpgradeTester/install_blacklist.cfg update-manager-0.156.14.15/AutoUpgradeTester/install_blacklist.cfg --- update-manager-17.10.11/AutoUpgradeTester/install_blacklist.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/install_blacklist.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,33 @@ +# file-overwrite problem with libc6-dev +libpthread-dev +# FUBAR (was removed in feisty) +glibc-doc-reference +# has a funny "can not be upgraded automatically" policy +# see debian #368226 +quagga +# the following packages try to access /lib/modules/`uname -r` and fail +vmware-player-kernel-.* +# not installable on a regular machine +ltsp-client +ltsp-client-core +# why is this in the archive? +debsig-verify +# speedbar,ede fails for some reason +speedbar +ede +ecb +emacs-snapshot +# ec2 +ec2-init +linux-image-ec2 +linux-image-2.6.31-302-ec2 + +bacula-director-mysql +linux-backports-modules-wireless-2.6.32-21-generic-pae +linux-backports-modules-wireless-2.6.32-22-generic-pae +linux-backports-modules-wireless-2.6.32-23-generic-pae +linux-backports-modules-wireless-2.6.32-24-generic-pae + +# no fun +cloud-init +eucalyptus-.* \ No newline at end of file diff -Nru update-manager-17.10.11/AutoUpgradeTester/install_universe update-manager-0.156.14.15/AutoUpgradeTester/install_universe --- update-manager-17.10.11/AutoUpgradeTester/install_universe 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/install_universe 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,263 @@ +#!/usr/bin/python +""" +Install all packages with a desktop file in app-install-data +""" + + +import apt +import apt_pkg +import re +import os +import string +import sys + +# global install blacklist +pkg_blacklist = None + +# whitelist regexp to include only certain packages (useful for e.g. +# installing only all python packages) +pkg_whitelist = "" + +class InstallProgress(apt.progress.base.InstallProgress): + " Out install progress that can automatically remove broken pkgs " + def error(self, pkg, errormsg): + # on failure: + # - add failing package to "install_failures.txt" [done] + # - remove package from best.txt [done] + # FIXME: - remove all rdepends from best.txt + # - remove the failed install attempts [done] + # * explode if a package can not be removed and let the user cleanup + open("install_failures.txt","a").write("%s _:_ %s" % (pkg, errormsg)) + bad = set() + bad.add(os.path.basename(pkg).split("_")[0]) + # FIXME: just run apt-cache rdepends $pkg here? + # or use apt.Package.candidateDependencies ? + # or calculate the set again? <- BEST! + for name in bad: + new_best = open("best.txt").read().replace(name+"\n","") + open("best.txt","w").write(new_best) + open("install_blacklist.cfg","a").write("# auto added by install_all.py\n%s\n" % name) + +def do_install(cache): + # go and install + res = False + current = 0 + maxRetries = 5 + while current < maxRetries: + print "Retry: ", current + try: + res = cache.commit(apt.progress.text.AcquireProgress(), + InstallProgress()) + break + except IOError, e: + # fetch failed, will be retried + current += 1 + print "Retrying to fetch: ", current, e + continue + except SystemError, e: + print "Error installing packages! " + print e + print "Install result: ",res + break + # check for failed packages and remove them + if os.path.exists("install_failures.txt"): + failures = set(map(lambda s: os.path.basename(s.split("_:_")[0]).split("_")[0], + open("install_failures.txt").readlines())) + print "failed: ", failures + assert(os.system("dpkg -r %s" % " ".join(failures)) == 0) + assert(os.system("dpkg --configure -a") == 0) + # remove pos.txt and best.txt to force recalculation + os.unlink("pos.txt") + os.unlink("best.txt") + return res + +def blacklisted(name): + global pkg_blacklist + if pkg_blacklist is None and os.path.exists("install_blacklist.cfg"): + pkg_blacklist = set() + for name in map(string.strip, open("install_blacklist.cfg").readlines()): + if name and not name.startswith("#"): + pkg_blacklist.add(name) + print "blacklist: ", pkg_blacklist + if pkg_blacklist: + for b in pkg_blacklist: + if re.match(b, name): + return True + return False + +def reapply(cache, pkgnames): + for name in pkgnames: + cache[name].mark_install(False) + +def contains_blacklisted_pkg(cache): + for pkg in cache: + if pkg.marked_install and blacklisted(pkg.name): + return True + return False + +def appinstall_pkgs(): + import ConfigParser + + APPINSTALL_DIR = "/usr/share/app-install/desktop" + + content = ConfigParser.ConfigParser() + pkgs = [] + + # List of sections to skip. This must be a valid regular expression + # We must exclude window managers to not kill ourselves + for dsk in os.listdir(APPINSTALL_DIR): + dskfile = os.path.join(APPINSTALL_DIR, dsk) + if not 'desktop' in dsk[-7:]: + continue + try: + content.read(dskfile) + pkg = content.get('Desktop Entry', 'X-AppInstall-Package') + if not pkg in pkgs: + pkgs.append(pkg) + except: + print "Error: unable to parse %s" % dskfile + continue + + return pkgs + +# ---------------------------------------------------------------- + +#apt_pkg.Config.Set("Dir::State::status","./empty") + +# debug stuff +#apt_pkg.Config.Set("Debug::pkgProblemResolver","true") +#apt_pkg.Config.Set("Debug::pkgDepCache::AutoInstall","true") +#apt_pkg.Config.Set("Debug::pkgDpkgPM","true") + +# Increase the maxsize limits here +# +# this code in apt that splits the argument list if its too long +# is problematic, because it may happen that +# the argument list is split in a way that A depends on B +# and they are in the same "--configure A B" run +# - with the split they may now be configured in different +# runs + +apt_pkg.config.set("Dpkg::MaxArgs",str(16*1024)) +apt_pkg.config.set("Dpkg::MaxArgBytes",str(64*1024)) + +print "*** installings all packages from app-install-data ***" +os.environ["DEBIAN_FRONTEND"] = "noninteractive" +os.environ["APT_LISTCHANGES_FRONTEND"] = "none" + +cache = apt.Cache() + +# dapper does not have this yet +group = cache.actiongroup() +#print [pkg.name for pkg in cache if pkg.is_installed] + +# see what gives us problems +troublemaker = set() +best = set() + +# first install all of main, then the rest +comps= ["main","universe"] +i=0 + +# reapply checkpoints +if os.path.exists("best.txt"): + best = map(string.strip, open("best.txt").readlines()) + reapply(cache, best) + +comp = None +if os.path.exists("pos.txt"): + (comp, i) = open("pos.txt").read().split() + i = int(i) + +sorted_pkgs = appinstall_pkgs() +sorted_pkgs.sort() + +for pkgname in sorted_pkgs[i:]: + # skip multiarch packages + i += 1 + if ":" in pkgname: + continue + try: + pkg = cache[pkgname] + except: + print "WARNING: No package named %s" % pkg + continue + percent = (float(i)/len(sorted_pkgs))*100.0 + print "\r%.3f " % percent, + sys.stdout.flush() + # ignore stuff that does not match the whitelist pattern + # (if we use this) + if pkg_whitelist: + if not re.match(pkg_whitelist, pkg.name): + #print "skipping '%s' (not in whitelist)" % pkg.name + continue + print "looking at ", pkg.name + # only work on stuff that has a origin + if pkg.candidate: + for c in pkg.candidate.origins: + comp = c.component + if not (pkg.is_installed or blacklisted(pkg.name)): + current = set([p.name for p in cache if p.marked_install]) + try: + pkg.mark_install() + except SystemError, e: + print "Installing '%s' cause problems: %s" % (pkg.name, e) + pkg.mark_keep() + # check blacklist + if contains_blacklisted_pkg(cache): + cache.clear() + reapply(cache, best) + continue + new = set([p.name for p in cache if p.marked_install]) + #if not pkg.marked_install or len(new) < len(current): + if not (pkg.is_installed or pkg.marked_install): + print "Can't install: %s" % pkg.name + if len(current-new) > 0: + troublemaker.add(pkg.name) + print "Installing '%s' caused removals %s" % (pkg.name, current - new) + # FIXME: instead of len() use score() and score packages + # according to criteria like "in main", "priority" etc + if len(new) >= len(best): + best = new + open("best.txt","w").write("\n".join(best)) + open("pos.txt","w").write("%s %s" % (comp, i)) + else: + print "Installing '%s' reduced the set (%s < %s)" % (pkg.name, len(new), len(best)) + cache.clear() + reapply(cache, best) +i=0 + +# make sure that the ubuntu base packages are installed (and a bootloader) +print len(troublemaker) +for pkg in ["ubuntu-desktop", "ubuntu-minimal", "ubuntu-standard", "grub-pc"]: + cache[pkg].mark_install() + +# make sure we don't install blacklisted stuff +for pkg in cache: + if blacklisted(pkg.name): + pkg.mark_keep() + +# install it +print "We can install:", len([pkg.name for pkg in cache if pkg.marked_install]) +# get size +pm = apt_pkg.PackageManager(cache._depcache) +fetcher = apt_pkg.Acquire() +pm.get_archives(fetcher, cache._list, cache._records) +print "Download: ", apt_pkg.size_to_str(fetcher.fetch_needed) +print "Total space: ", apt_pkg.size_to_str(cache._depcache.usr_size) + +# write out file with all pkgs +outf = "all_pkgs.cfg" +print "writing out file with the selected package names to '%s'" % outf +f = open(outf, "w") +f.write("\n".join([pkg.name for pkg in cache if pkg.marked_install])) +f.close() + +# now do the real install +res = do_install(cache) + +if not res: + # FIXME: re-exec itself + sys.exit(1) + +sys.exit(0) diff -Nru update-manager-17.10.11/AutoUpgradeTester/jenkins/auto-upgrade-tester-jenkins-slave update-manager-0.156.14.15/AutoUpgradeTester/jenkins/auto-upgrade-tester-jenkins-slave --- update-manager-17.10.11/AutoUpgradeTester/jenkins/auto-upgrade-tester-jenkins-slave 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/jenkins/auto-upgrade-tester-jenkins-slave 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,12 @@ +# init configuration script for hudson-slave +# User and Group to execute slave daemon asa +# defaults to the ubuntu server iso testing +# account as part of this package +USER=upgrade-tester +GROUP=nogroup +# URL to access Hudson Master Server +HUDSON_MASTER= +# Options to pass to hudson-slave +# OPTS="-d" +# Run at startup +STARTUP=false diff -Nru update-manager-17.10.11/AutoUpgradeTester/jenkins/auto-upgrade-tester-jenkins-slave.conf update-manager-0.156.14.15/AutoUpgradeTester/jenkins/auto-upgrade-tester-jenkins-slave.conf --- update-manager-17.10.11/AutoUpgradeTester/jenkins/auto-upgrade-tester-jenkins-slave.conf 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/jenkins/auto-upgrade-tester-jenkins-slave.conf 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,28 @@ +# Hudson Slave + +description "auto-upgrade-tester-jenkins-slave: distributed job control" +author "James Page " + +start on (local-filesystems and net-device-up IFACE!=lo) +stop on runlevel [!2345] + +pre-start script + . /etc/default/auto-upgrade-tester-jenkins-slave + test -x /usr/bin/auto-upgrade-tester-jenkins-slave || { stop ; exit 0; } + test -r /etc/default/auto-upgrade-tester-jenkins-slave || { stop ; exit 0; } + test "${STARTUP}" = "true" || { stop; exit 0; } +end script + +script + . /etc/default/auto-upgrade-tester-jenkins-slave + + JDK_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun" + for jdir in $JDK_DIRS; do + if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then + JAVA_HOME="$jdir" + fi + done + export JAVA_HOME + + exec start-stop-daemon --start --chuid $USER:$GROUP --exec /usr/bin/auto-upgrade-tester-jenkins-slave -- $OPTS $HUDSON_MASTER +end script diff -Nru update-manager-17.10.11/AutoUpgradeTester/jeos/create-base-image.sh update-manager-0.156.14.15/AutoUpgradeTester/jeos/create-base-image.sh --- update-manager-17.10.11/AutoUpgradeTester/jeos/create-base-image.sh 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/jeos/create-base-image.sh 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,36 @@ +#!/bin/sh + +set -e + +DIST=$(lsb_release -c -s) + +if [ -z "$1" ]; then + echo "need distro codename to create as first argument " + exit 1 +fi + +# check depends +if [ ! -f /usr/bin/ubuntu-vm-builder ]; then + apt-get install -y ubuntu-vm-builder +fi + +if [ ! -f /usr/bin/kvm ]; then + apt-get install -y kvm +fi + +# create a default ssh key +if [ ! -e ssh-key ]; then + ssh-keygen -N '' -f ssh-key +fi + +KERNEL=generic +if [ "$1" = "dapper" ]; then + KERNEL=386 +fi + +# create the image +ubuntu-vm-builder kvm $1 --kernel-flavour $KERNEL --ssh-key $(pwd)/ssh-key.pub \ + --components main,restricted --rootsize 80000 --arch i386 --dest ubuntu-$1 + +# move into place +mv ubuntu-$1/*.qcow2 $1-i386.qcow2 diff -Nru update-manager-17.10.11/AutoUpgradeTester/jeos/README update-manager-0.156.14.15/AutoUpgradeTester/jeos/README --- update-manager-17.10.11/AutoUpgradeTester/jeos/README 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/jeos/README 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,49 @@ +Create the images by simply running +$ ./create-base-image.sh maverick +(or whatever distroibution release you want to create) + + +===== old info below ==== + +Images created with: + +First create a ssh key: +$ ssh-keygen -N '' -f ssh-key + +[intrepid] + +Can use the official ubuntu-vm-builder pacakges] + +$ sudo ubuntu-vm-builder kvm intrepid --kernel-flavour generic --ssh-key `pwd`/ssh-key.pub --components main,restricted --rootsize 80000 --arch i386 +$ mv ubuntu-kvm/disk0.qcow2 intrepid-i386.qcow2 +- login and check if openssh-server is installed (intrepid ubuntu-vm-builder FTW) + +For old releases: + +$ bzr get http://bazaar.launchpad.net/~mvo/ubuntu-jeos/mvo + +[hardy] +$ ./ubuntu-jeos-builder --vm kvm --kernel-flavour generic --suite hardy --ssh-key `pwd`/ssh-key.pub --components main,restricted --rootsize 80G --no-opt + +[gutsy] +$ ./ubuntu-jeos-builder --vm kvm --kernel-flavour generic --suite gutsy --ssh-key `pwd`/ssh-key.pub --components main,restricted --rootsize 80G --no-opt + + +[feisty] +$ ./ubuntu-jeos-builder --vm kvm --kernel-flavour generic --suite feisty --ssh-key `pwd`/ssh-key.pub --components main,restricted --rootsize 80G --no-opt + +[dapper] +$ ./ubuntu-jeos-builder --vm kvm --kernel-flavour 386 --suite dapper --ssh-key `pwd`/foo.pub --components main,restricted --rootsize 80G --no-opt + +(notice the different kernel names for dapper,feisty). The ssh-key is the +key that is used by the upgrade tester to log into the virtual machine. + +The copy it from +"jeos/ubuntu-jeos-$dist-i386/root.qcow2" +to +"jeos/$dist-i386.qcow2" + +Make sure you copy the "ssh-key" file into the profile dir so that the +upgrade tester can access it + + diff -Nru update-manager-17.10.11/AutoUpgradeTester/post_upgrade_tests/conffiles_test.sh update-manager-0.156.14.15/AutoUpgradeTester/post_upgrade_tests/conffiles_test.sh --- update-manager-17.10.11/AutoUpgradeTester/post_upgrade_tests/conffiles_test.sh 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/post_upgrade_tests/conffiles_test.sh 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +find /etc -name "*.dpkg-dist" -exec cp '{}' /tmp \; + +# check if we have a dpkg-dist file +if ls /tmp/*.dpkg-dist 2>/dev/null; then + exit 1 +fi + +exit 0 \ No newline at end of file diff -Nru update-manager-17.10.11/AutoUpgradeTester/post_upgrade_tests/debconf_test.py update-manager-0.156.14.15/AutoUpgradeTester/post_upgrade_tests/debconf_test.py --- update-manager-17.10.11/AutoUpgradeTester/post_upgrade_tests/debconf_test.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/post_upgrade_tests/debconf_test.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,65 @@ +#!/usr/bin/python +""" +Parse debconf log file and split in a file per prompt +Exit with status 1 if there is a debconf prompt not in whitelist +""" +import re, os, sys + +# Keep this path in sync with the corresponding setting in +# profile/defaults.cfg.d/defaults.cfg +DEBCONF_LOG_PATH = '/var/log/dist-upgrade/debconf.log' +RESULT_DIR = '/tmp' + +# Prompts in this list won't generate a test failure +# i.e WHITELIST = ['libraries/restart-without-asking'] +WHITELIST = [ + 'glibc/restart-services', + 'libraries/restart-without-asking' ] + +def run_test(logfile, resultdir): + """ Run the test and slice debconf log + + :param logfile: Path to debconf log + :param resultdir: Output directory to write log file to + """ + global WHITELIST + + ret = 0 + if not os.path.exists(logfile): + return ret + + re_dsetting = re.compile('^\w') + inprompt = False + prompt = dsetting = "" + + with open(logfile, 'r') as f_in: + for line in f_in.readlines(): + # Only keep interesting bits of the prompt + if line.startswith('#####'): + inprompt = not inprompt + + # Reached the second separator, write content to result file + # One per prompt + if not inprompt: + print "Got debconf prompt for '%s'" % dsetting + if dsetting in WHITELIST: + print ' But it is in Whitelist. Skipping!' + continue + else: + ret = 1 + + with open(os.path.join( + resultdir, + 'debconf_%s.log' % dsetting.replace('/', '_')), + 'w') as f_out: + f_out.write(prompt) + + if inprompt: + prompt += line + if re_dsetting.match(line) and '=' in line: + dsetting = line.split('=')[0] + + return ret + +if __name__ == '__main__': + sys.exit(run_test(DEBCONF_LOG_PATH, RESULT_DIR)) diff -Nru update-manager-17.10.11/AutoUpgradeTester/post_upgrade_tests/debsums_lite.py update-manager-0.156.14.15/AutoUpgradeTester/post_upgrade_tests/debsums_lite.py --- update-manager-17.10.11/AutoUpgradeTester/post_upgrade_tests/debsums_lite.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/post_upgrade_tests/debsums_lite.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,19 @@ +#!/usr/bin/python + +import glob +import os +import subprocess +import sys + +basepath = "/var/lib/dpkg/info/*.md5sums" +ok = True +for f in glob.glob(basepath): + ret = subprocess.call(["md5sum", "--quiet", "-c", + os.path.join(basepath, f)], + cwd="/") + if ret != 0: + ok = False + +if not ok: + print "WARNING: at least one md5sum mismatch" + sys.exit(1) diff -Nru update-manager-17.10.11/AutoUpgradeTester/post_upgrade_tests/kernel_test.py update-manager-0.156.14.15/AutoUpgradeTester/post_upgrade_tests/kernel_test.py --- update-manager-17.10.11/AutoUpgradeTester/post_upgrade_tests/kernel_test.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/post_upgrade_tests/kernel_test.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,24 @@ +#!/usr/bin/python + +import apt_pkg +import glob +import os +import sys + +current_kernelver = os.uname()[2] + +apt_pkg.init() + +vers = set() +for k in glob.glob("/boot/vmlinuz-*"): + ver = "-".join(k.split("-")[1:3]) + vers.add(ver) + if apt_pkg.VersionCompare(current_kernelver, ver) < 0: + print "WARNING: there is a kernel version '%s' installed higher than the running kernel" % (ver, current_kernelver) + sys.exit(1) + +print "kernel versions: %s" % ", ".join(vers) +if len(vers) < 2: + print "WARNING: only one kernel version found '%s'" % vers + print "expected at least two (new + previous)" + sys.exit(1) diff -Nru update-manager-17.10.11/AutoUpgradeTester/post_upgrade_tests/python_import_test.py update-manager-0.156.14.15/AutoUpgradeTester/post_upgrade_tests/python_import_test.py --- update-manager-17.10.11/AutoUpgradeTester/post_upgrade_tests/python_import_test.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/post_upgrade_tests/python_import_test.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,104 @@ +#!/usr/bin/python -u + +import logging +import os +import subprocess +import sys + + +OLD_PYTHONVER="python2.6" +NEW_PYTHONVER="python2.7" + +OLD_BASEPATH="/usr/lib/%s/dist-packages/" % OLD_PYTHONVER +NEW_BASEPATH="/usr/lib/%s/dist-packages/" % NEW_PYTHONVER + +# total imports +TOTAL = 0 +FAIL = 0 + +# stuff that we know does not work when doing a simple "import" +blacklist = ["speechd_config", + "PAMmodule.so", + "aomodule.so", + "plannerui.so", + # needs a KeyringDaemon + "desktopcouch", + # just hangs + "ropemacs", + # needs X + "keyring", + "invest", + "Onboard", + "goocanvasmodule.so", + ] + +def get_module_from_path(path): + f = os.path.basename(path) + if path and os.path.exists(os.path.join(path, "__init__.py")): + return f + elif f.endswith(".py"): + return f.split(".")[0] + # swig uses this, calls it "foomodule.so" but the import is "foo" + # (eg xdelta3module.so, pqueuemodule.so) + elif f.endswith("module.so"): + return f.split("modules.so")[0] + elif f.endswith(".so"): + return f.split(".")[0] + +def try_import(path): + global TOTAL, FAIL + logging.info("Importing %s" % path) + # a simple __import__(module) does not work, the problem + # is that module import have funny side-effects (like + # "import uno; import pyatspi" will fail, but importing + # them individually is fine + module = get_module_from_path(path) + if not module: + logging.warn("could not get module for '%s'" % path) + return True + cmd = ["python", "-c","import %s" % module] + logging.debug("cmd: '%s'" % cmd) + TOTAL += 1 + ret = subprocess.call(cmd) + if ret != 0: + FAIL += 1 + print "WARNING: failed to import '%s'" % module + subprocess.call(["dpkg", "-S", os.path.realpath(path)]) + print "\n\n" + return False + return True + +def py_module_filter(pymodule): + f = pymodule + # ignore a bunch of modules that + if (f.endswith(".egg-info") or + f.endswith(".pth") or + f.startswith("_") or + f.endswith(".pyc") or + f.endswith("_d.so") or + f in blacklist): + return False + return True + +if __name__ == "__main__": + #logging.basicConfig(level=logging.DEBUG) + + # Only compare if old and new paths exists + # When previous version of python is dropped then only new exists + if os.path.exists(OLD_BASEPATH) and os.path.exists(NEW_BASEPATH): + old_modules = set(filter(py_module_filter, os.listdir(OLD_BASEPATH))) + new_modules = set(filter(py_module_filter, os.listdir(NEW_BASEPATH))) + print "Available for the old version, but *not* the new: %s\n" % ( + ", ".join(old_modules - new_modules)) + + res = True + # FIXME: instead os os.listdir() use os.walk() to catch subdirs + # like lazr/* ? + for f in filter(py_module_filter, os.listdir(NEW_BASEPATH)): + logging.debug("looking at '%s'" % f) + res &= try_import(os.path.join(NEW_BASEPATH, f)) + + print "Total imports: %s" % TOTAL + print "Failures: %s" % FAIL + if not res: + sys.exit(1) diff -Nru update-manager-17.10.11/AutoUpgradeTester/post_upgrade_tests/README update-manager-0.156.14.15/AutoUpgradeTester/post_upgrade_tests/README --- update-manager-17.10.11/AutoUpgradeTester/post_upgrade_tests/README 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/post_upgrade_tests/README 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,8 @@ +The scripts in this folder are run after the upgrade was performed +and after a reboot. They can test various functionality like +- is the latest kernel running +- is the xserver running +- is python still working +- are my daemons still running + +etc diff -Nru update-manager-17.10.11/AutoUpgradeTester/post_upgrade_tests/test_lts_upgrade_system.py update-manager-0.156.14.15/AutoUpgradeTester/post_upgrade_tests/test_lts_upgrade_system.py --- update-manager-17.10.11/AutoUpgradeTester/post_upgrade_tests/test_lts_upgrade_system.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/post_upgrade_tests/test_lts_upgrade_system.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,66 @@ +#!/usr/bin/python +# +# This script checks system-wide configuration settings after an Ubuntu 10.04 +# LTS to Ubuntu 12.04 LTS upgrade. Run this after upgrading to 12.04 or later. +# It reads the old gdm settings and ensures that they were appropriately +# migrated to lightdm and that lightdm is the default DM. +# It does not need any particular privileges, it is fine to run this as any +# user. +# +# (C) 2012 Canonical Ltd. +# Author: Martin Pitt +# License: GPL v2 or higher + +import unittest +import os, sys +import ConfigParser + +class T(unittest.TestCase): + @classmethod + def setUpClass(klass): + # read gdm configuration + klass.gdm_config = klass._read_conf('/etc/gdm/custom.conf', 'daemon') + klass.lightdm_config = klass._read_conf('/etc/lightdm/lightdm.conf', 'SeatDefaults') + + def test_lightdm_default_dm(self): + '''lightdm is the default display manager''' + + with open('/etc/X11/default-display-manager') as f: + default_dm = f.read().strip() + + self.assertTrue(os.access(default_dm, os.X_OK)) + self.assertEqual(os.path.basename(default_dm), 'lightdm') + + def test_autologin_migration(self): + '''autologin migration from gdm to lightdm''' + + if self.gdm_config.get('automaticloginenable', 'false') == 'true': + gdm_autologin = self.gdm_config.get('automaticlogin', '') + else: + gdm_autologin = '' + + self.assertEqual(gdm_autologin, self.lightdm_config.get('autologin-user', '')) + + @classmethod + def _read_conf(klass, filename, section): + '''Read section from an INI configuration file. + + Return a dictionary with the configuration of the given section. + ''' + p = ConfigParser.ConfigParser() + p.read(filename) + config = {} + try: + for (key, value) in p.items(section): + config[key] = value + except ConfigParser.NoSectionError: + # just keep an empty config + pass + return config + +# Only run on lts-ubuntu testcases +if not os.path.exists('/upgrade-tester/prepare_lts_desktop'): + print "Not an Ubuntu Desktop LTS upgrade. Skipping!" + sys.exit(0) + +unittest.main() diff -Nru update-manager-17.10.11/AutoUpgradeTester/post_upgrade_tests/test_lts_upgrade_user.py update-manager-0.156.14.15/AutoUpgradeTester/post_upgrade_tests/test_lts_upgrade_user.py --- update-manager-17.10.11/AutoUpgradeTester/post_upgrade_tests/test_lts_upgrade_user.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/post_upgrade_tests/test_lts_upgrade_user.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,98 @@ +#!/usr/bin/python +# +# This script checks user configuration settings after an Ubuntu 10.04 +# LTS to Ubuntu 12.04 LTS upgrade. Run prepare_lts_upgrade_user.sh in 10.04 +# LTS, then upgrade to 12.04 LTS (or later), and run this script to confirm +# that settings were migrated properly. In particular this checks for gconf -> +# gsettings migration (and sometimes changing the format of the values) for +# popular settings, as well as custom panel/desktop launchers. +# +# You need to run both the prepare and this test script as the same user, +# in a full desktop session. +# +# (C) 2012 Canonical Ltd. +# Author: Martin Pitt +# License: GPL v2 or higher + +import unittest +import os, sys +import subprocess + +try: + from gi.repository import Gio +except: + # Not a desktop + print "Failed to import gi.repository. Not a LTS Desktop Upgrade. Skipping!" + sys.exit(0) + +class T(unittest.TestCase): + def test_background(self): + '''background image''' + + bg_settings = Gio.Settings('org.gnome.desktop.background') + # note: original gconf value does not have a file:// prefix, but GNOME + # 3.x requires this prefix + self.assertEqual(bg_settings.get_string('picture-uri'), + 'file://%s/mybackground.jpg' % os.environ['HOME']) + + def test_gtk_theme(self): + '''GTK theme''' + + iface_settings = Gio.Settings('org.gnome.desktop.interface') + self.assertEqual(iface_settings.get_string('gtk-theme'), 'Radiance') + + def test_custom_launchers(self): + '''Custom panel/desktop launchers appear in Unity launcher''' + + launcher_settings = Gio.Settings('com.canonical.Unity.Launcher') + favorites = launcher_settings['favorites'] + + # gedit was dragged from Application menu to panel, pointing to system + # .desktop file + self.assertTrue('gedit.desktop' in favorites) + + # custom "echo hello" panel starter uses its own .desktop file + for starter in favorites: + if 'echo' in starter: + self.assertTrue(os.path.exists(starter)) + break + else: + self.fail('custom hello starter not found') + + # gucharmap was dragged from Application menu to desktop, should be + # converted to system .desktop file + self.assertTrue('gucharmap.desktop' in favorites) + + # custom "bc -l" desktop starter uses its own .desktop file + self.assertTrue('%s/Desktop/termcalc.desktop' % os.environ['HOME'] in favorites) + + def test_keyboard_layouts(self): + '''Custom keyboard layouts are migrated and applied''' + + # verify gconf->gsettings migration + kbd_settings = Gio.Settings('org.gnome.libgnomekbd.keyboard') + self.assertEqual(kbd_settings['layouts'], + '[us,de\tnodeadkeys,gb,gb\tdvorak]') + +# NO DISPLAY IN AUTOMATED TEST +# # verify that they get applied to the X server correctly +# xprop = subprocess.Popen(['xprop', '-root', '_XKB_RULES_NAMES'], +# stdout=subprocess.PIPE) +# out = xprop.communicate()[0] +# self.assertEqual(xprop.returncode, 0) +# +# # chop off key name +# out = out.split('=', 1)[1].strip() +# +# self.assertEqual(out, '"evdev", "pc105", "us,de,gb,gb", ",nodeadkeys,,dvorak", "grp:alts_toggle"') + +# Only run on lts-ubuntu testcases +if not os.path.exists('/upgrade-tester/prepare_lts_desktop'): + print "Not an Ubuntu Desktop LTS upgrade. Skipping!" + sys.exit(0) + +if os.getuid() == 0: + # Root ? reexecute itself as user ubuntu + subprocess.call('sudo -H -u ubuntu dbus-launch %s' % os.path.abspath(__file__), shell=True) +else: + unittest.main() diff -Nru update-manager-17.10.11/AutoUpgradeTester/post_upgrade_tests/xserver_test.py update-manager-0.156.14.15/AutoUpgradeTester/post_upgrade_tests/xserver_test.py --- update-manager-17.10.11/AutoUpgradeTester/post_upgrade_tests/xserver_test.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/post_upgrade_tests/xserver_test.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,29 @@ +#!/usr/bin/python + +import glob +import os +import subprocess +import sys +import time + +def is_process_running(procname): + proclist = subprocess.Popen(["ps","-eo","comm"], stdout=subprocess.PIPE).communicate()[0] + for line in proclist.split("\n"): + if line == procname: + return True + return False + +if __name__ == "__main__": + if os.path.exists("/usr/bin/X") or glob.glob("/var/log/Xorg*.log"): + #print "Checking for running Xorg" + for i in range(10): + if not is_process_running("Xorg"): + print "Xorg not running yet, waiting" + # wait a bit to and see if it comes up + time.sleep(10) + if not is_process_running("Xorg"): + print "WARNING: /usr/bin/X found but no Xorg running" + sys.exit(1) + + + diff -Nru update-manager-17.10.11/AutoUpgradeTester/prepare_lts_desktop update-manager-0.156.14.15/AutoUpgradeTester/prepare_lts_desktop --- update-manager-17.10.11/AutoUpgradeTester/prepare_lts_desktop 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/prepare_lts_desktop 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,22 @@ +#!/bin/sh + +# Setup Autologin +cat > /etc/gdm/custom.conf < gsettings migration (and sometimes +# changing the format of the values) for popular settings, as well as custom +# panel/desktop launchers. +# +# You need to run this script in a fully running GNOME desktop session. + +# +# (C) 2012 Canonical Ltd. +# Author: Martin Pitt +# License: GPL v2 or higher + +set -e + +echo "Setting custom background..." +cp `ls /usr/share/backgrounds/*.jpg | head -n1` $HOME/mybackground.jpg +gconftool -s /desktop/gnome/background/picture_filename --type string $HOME/mybackground.jpg + +echo "Setting Radiance theme..." +gconftool -s /desktop/gnome/interface/gtk_theme --type string Radiance + +echo "Adding custom panel launchers..." +# add launcher for system desktop file (gedit) +gconftool -s /apps/panel/objects/object_0/menu_path --type string 'applications:/' +gconftool -s /apps/panel/objects/object_0/launcher_location --type string '/usr/share/applications/gedit.desktop' +gconftool -s /apps/panel/objects/object_0/bonobo_iid --type string '' +gconftool -s /apps/panel/objects/object_0/custom_icon --type string '' +gconftool -s /apps/panel/objects/object_0/locked --type bool false +gconftool -s /apps/panel/objects/object_0/panel_right_stick --type bool false +gconftool -s /apps/panel/objects/object_0/object_type --type string 'launcher-object' +gconftool -s /apps/panel/objects/object_0/use_custom_icon --type bool false +gconftool -s /apps/panel/objects/object_0/tooltip --type string '' +gconftool -s /apps/panel/objects/object_0/toplevel_id --type string 'top_panel_screen0' +gconftool -s /apps/panel/objects/object_0/action_type --type string 'lock' +gconftool -s /apps/panel/objects/object_0/use_menu_path --type bool false +gconftool -s /apps/panel/objects/object_0/position --type int 60 +gconftool -s /apps/panel/objects/object_0/attached_toplevel_id --type string '' + +# add launcher for custom desktop file +mkdir -p $HOME/.gnome2/panel2.d/default/launchers/ +mkdir -p $HOME/Desktop + +cat < $HOME/.gnome2/panel2.d/default/launchers/echo-1.desktop +#!/usr/bin/env xdg-open +[Desktop Entry] +Version=1.0 +Type=Application +Terminal=true +Icon[en_US]=partner +Name[en_US]=hello +Exec=echo hello +Name=hello +Icon=gnome-panel-launcher +EOF +chmod 755 $HOME/.gnome2/panel2.d/default/launchers/echo-1.desktop +gconftool -s /apps/panel/objects/object_1/menu_path --type string 'applications:/' +gconftool -s /apps/panel/objects/object_1/launcher_location --type string 'echo-1.desktop' +gconftool -s /apps/panel/objects/object_1/bonobo_iid --type string '' +gconftool -s /apps/panel/objects/object_1/custom_icon --type string '' +gconftool -s /apps/panel/objects/object_1/locked --type bool false +gconftool -s /apps/panel/objects/object_1/panel_right_stick --type bool false +gconftool -s /apps/panel/objects/object_1/object_type --type string 'launcher-object' +gconftool -s /apps/panel/objects/object_1/use_custom_icon --type bool false +gconftool -s /apps/panel/objects/object_1/tooltip --type string '' +gconftool -s /apps/panel/objects/object_1/toplevel_id --type string 'top_panel_screen0' +gconftool -s /apps/panel/objects/object_1/action_type --type string 'lock' +gconftool -s /apps/panel/objects/object_1/use_menu_path --type bool false +gconftool -s /apps/panel/objects/object_1/position --type int 90 +gconftool -s /apps/panel/objects/object_1/attached_toplevel_id --type string '' + +# add the two new launchers to the panel object list +old_list=`gconftool -g /apps/panel/general/object_id_list | sed 's/]$//'` +gconftool -s /apps/panel/general/object_id_list --type list --list-type string "$old_list,object_0,object_1]" + +echo "Adding custom desktop launchers ..." +cat < $HOME/Desktop/gucharmap.desktop +#!/usr/bin/env xdg-open +[Desktop Entry] +Name=Character Map +Comment=Insert special characters into documents +Exec=gucharmap +Icon=accessories-character-map +Terminal=false +Type=Application +Categories=GNOME;GTK;Utility; +X-GNOME-Bugzilla-Bugzilla=GNOME +X-GNOME-Bugzilla-Product=gucharmap +X-GNOME-Bugzilla-Component=general +X-GNOME-Bugzilla-Version=2.30.0 +StartupNotify=true +X-Ubuntu-Gettext-Domain=gucharmap +EOF +chmod 755 $HOME/Desktop/gucharmap.desktop + +cat < $HOME/Desktop/termcalc.desktop +#!/usr/bin/env xdg-open + +[Desktop Entry] +Version=1.0 +Type=Application +Terminal=true +Icon[en_US]=/usr/share/icons/gnome/scalable/apps/calc.svg +Name[en_US]=termcalc +Exec=bc -l +Name=termcalc +Icon=/usr/share/icons/gnome/scalable/apps/calc.svg +EOF +chmod 755 $HOME/Desktop/termcalc.desktop + +echo "Setting custom keyboard layouts..." +gconftool -s /desktop/gnome/peripherals/keyboard/kbd/layouts --type list --list-type string "[us,de nodeadkeys,gb,gb dvorak]" + +echo 'Success. Now upgrade to 12.04 LTS and run test_lts_upgrade_user.py' diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/auto-install-tester/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/auto-install-tester/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/auto-install-tester/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/auto-install-tester/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,60 @@ +[View] +#View=DistUpgradeViewGtk +View=DistUpgradeViewNonInteractive + +[Distro] +BaseMetaPkgs=ubuntu-minimal, ubuntu-standard + +[Aufs] +;EnableFullOverlay=yes +;EnableChrootOverlay=yes +;EnableChrootRsync=yes + +[Sources] +From=lucid +To=lucid + +[NonInteractive] +ProfileName=auto-install-tester +BasePkg = ubuntu-standard +AdditionalPkgs = pkgs.cfg +Mirror = http://archive.ubuntu.com/ubuntu +;Mirror = http://us.ec2.archive.ubuntu.com/ubuntu +;Proxy=http://192.168.1.1:3128/ +ForceOverwrite=no +Components=main,restricted,universe +Pockets=security,updates +UpgradeFromDistOnBootstrap=true +;AddRepo=local_testing.list +DpkgProgressLog=yes +ResultDir=/var/cache/auto-upgrade-tester/result +SSHKey=/var/cache/auto-upgrade-tester/ssh-key +DebugBrokenScripts=yes + +[KVM] +Virtio=True +VncNum=3 +SshPort=54324 +ImageDir=/var/cache/auto-upgrade-tester/ +CacheImageDir=/var/cache/auto-upgrade-tester/ +BaseImage=%(ImageDir)s/lucid-i386.qcow2 +;SwapImage=jeos/swap.qcow2 +CacheBaseImage=yes + +[EC2] +; Ubuntu official images: +; https://help.ubuntu.com/community/EC2StartersGuide#Getting%20the%20images +;AMI=ami-44bb5c2d +; inofficial image +AMI=ami-0d729464 +SSHKey=./ec2-keypair.pem +;Specify the security groups you want attached to +;the instance. For example: +;SecurityGroups = ssh,web +; Set this to "yes" if using an Ubuntu official AMI as we need to +; allow root logins +;UbuntuOfficialAMI = yes + +[CHROOT] +Tempdir=/tmp/upgrade-tester +CacheTarball=yes diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/auto-install-tester/pkgs_blacklist.txt update-manager-0.156.14.15/AutoUpgradeTester/profile/auto-install-tester/pkgs_blacklist.txt --- update-manager-17.10.11/AutoUpgradeTester/profile/auto-install-tester/pkgs_blacklist.txt 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/auto-install-tester/pkgs_blacklist.txt 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,3 @@ +emacspeak +espeak +pioneers-meta-server diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/auto-install-tester/pkgs.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/auto-install-tester/pkgs.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/auto-install-tester/pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/auto-install-tester/pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1 @@ +update-manager-core diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/dapper-hardy-lucid-server/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/dapper-hardy-lucid-server/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/dapper-hardy-lucid-server/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/dapper-hardy-lucid-server/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,67 @@ +# +# this is a dapper->hardy->lucid test image +# - its cheated because the base image was dapper and then it was +# *manually* upgraded to hardy, but because we cache the base +# image this is ok and its a dapper->hardy->lucid upgrade from +# that point on + +[View] +#View=DistUpgradeViewGtk +View=DistUpgradeViewNonInteractive + +[Distro] +BaseMetaPkgs=ubuntu-minimal, ubuntu-standard + +[Aufs] +;EnableFullOverlay=yes +;EnableChrootOverlay=yes +;EnableChrootRsync=yes + +[Sources] +From=hardy +To=lucid + +[NonInteractive] +ProfileName=dapper-hardy-lucid-server +BasePkg = ubuntu-standard +AdditionalPkgs = pkgs.cfg +Mirror = http://archive.ubuntu.com/ubuntu +;Mirror = http://us.ec2.archive.ubuntu.com/ubuntu +;Proxy=http://192.168.1.1:3128/ +ForceOverwrite=no +Components=main,restricted +Pockets=security,updates +UpgradeFromDistOnBootstrap=true +;AddRepo=local_testing.list +DpkgProgressLog=yes +ResultDir=/var/cache/auto-upgrade-tester/result +SSHKey=/var/cache/auto-upgrade-tester/ssh-key +DebugBrokenScripts=yes + +[KVM] +Virtio=True +VncNum=1 +SshPort=54322 +ImageDir=/var/cache/auto-upgrade-tester/ +CacheImageDir=/var/cache/auto-upgrade-tester/ +BaseImage=%(ImageDir)s/dapper-i386.qcow2 +;SwapImage=jeos/swap.qcow2 +CacheBaseImage=yes + +[EC2] +; Ubuntu official images: +; https://help.ubuntu.com/community/EC2StartersGuide#Getting%20the%20images +;AMI=ami-44bb5c2d +; inofficial image +AMI=ami-0d729464 +SSHKey=./ec2-keypair.pem +;Specify the security groups you want attached to +;the instance. For example: +;SecurityGroups = ssh,web +; Set this to "yes" if using an Ubuntu official AMI as we need to +; allow root logins +;UbuntuOfficialAMI = yes + +[CHROOT] +Tempdir=/tmp/upgrade-tester +CacheTarball=yes diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/dapper-hardy-lucid-ubuntu/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/dapper-hardy-lucid-ubuntu/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/dapper-hardy-lucid-ubuntu/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/dapper-hardy-lucid-ubuntu/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,67 @@ +# +# this is a dapper->hardy->lucid test image +# - its cheated because the base image was dapper and then it was +# *manually* upgraded to hardy, but because we cache the base +# image this is ok and its a dapper->hardy->lucid upgrade from +# that point on + +[View] +#View=DistUpgradeViewGtk +View=DistUpgradeViewNonInteractive + +[Distro] +BaseMetaPkgs=ubuntu-minimal, ubuntu-standard + +[Aufs] +;EnableFullOverlay=yes +;EnableChrootOverlay=yes +;EnableChrootRsync=yes + +[Sources] +From=hardy +To=lucid + +[NonInteractive] +ProfileName=dapper-hardy-lucid-ubuntu +BasePkg = ubuntu-desktop +AdditionalPkgs = pkgs.cfg +Mirror = http://archive.ubuntu.com/ubuntu +;Mirror = http://us.ec2.archive.ubuntu.com/ubuntu +;Proxy=http://192.168.1.1:3128/ +ForceOverwrite=no +Components=main,restricted +Pockets=security,updates +UpgradeFromDistOnBootstrap=true +;AddRepo=local_testing.list +DpkgProgressLog=yes +ResultDir=/var/cache/auto-upgrade-tester/result +SSHKey=/var/cache/auto-upgrade-tester/ssh-key +DebugBrokenScripts=yes + +[KVM] +Virtio=True +VncNum=1 +SshPort=54322 +ImageDir=/var/cache/auto-upgrade-tester/ +CacheImageDir=/var/cache/auto-upgrade-tester/ +BaseImage=%(ImageDir)s/dapper-i386.qcow2 +;SwapImage=jeos/swap.qcow2 +CacheBaseImage=yes + +[EC2] +; Ubuntu official images: +; https://help.ubuntu.com/community/EC2StartersGuide#Getting%20the%20images +;AMI=ami-44bb5c2d +; inofficial image +AMI=ami-0d729464 +SSHKey=./ec2-keypair.pem +;Specify the security groups you want attached to +;the instance. For example: +;SecurityGroups = ssh,web +; Set this to "yes" if using an Ubuntu official AMI as we need to +; allow root logins +;UbuntuOfficialAMI = yes + +[CHROOT] +Tempdir=/tmp/upgrade-tester +CacheTarball=yes diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/defaults.cfg.d/defaults.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/defaults.cfg.d/defaults.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/defaults.cfg.d/defaults.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/defaults.cfg.d/defaults.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,63 @@ +# global defaults, override as needed in the indivual configuration +# files +# +[DEFAULT] +AutoUpgradeTesterBaseDir=/var/cache +SourceRelease=oneiric +TargetRelease=precise + +[Distro] +BaseMetaPkgs=ubuntu-minimal, ubuntu-standard + +[Distro] +BaseMetaPkgs=ubuntu-minimal, ubuntu-standard + +[Sources] +From=%(SourceRelease)s +To=%(TargetRelease)s + +[NonInteractive] +BasePkg = ubuntu-standard +Mirror = http://archive.ubuntu.com/ubuntu +ForceOverwrite=no +Components=main,restricted +Pockets=security,updates +UpgradeFromDistOnBootstrap=false +DpkgProgressLog=no +ResultDir=%(AutoUpgradeTesterBaseDir)s/auto-upgrade-tester/result +SSHKey=%(AutoUpgradeTesterBaseDir)s/auto-upgrade-tester/ssh-key +DebugBrokenScripts=yes +UseUpgraderFromBzr=false +;AddRepo=local_testing.list +DebconfLog=/var/log/dist-upgrade/debconf.log + + +[KVM] +Virtio=True +Arch=i386 +ImageDir=%(AutoUpgradeTesterBaseDir)s/auto-upgrade-tester/ +CacheImageDir=%(AutoUpgradeTesterBaseDir)s/auto-upgrade-tester/ +BaseImage=%(ImageDir)s/%(SourceRelease)s-%(Arch)s.qcow2 +CacheBaseImage=yes +VncNum=1 +SshPort=54322 +VirtualRam=1536 +RootSize=80000 + +[EC2] +; Ubuntu official images: +; https://help.ubuntu.com/community/EC2StartersGuide#Getting%20the%20images +;AMI=ami-44bb5c2d +; inofficial image +AMI=ami-0d729464 +SSHKey=./ec2-keypair.pem +;Specify the security groups you want attached to +;the instance. For example: +;SecurityGroups = ssh,web +; Set this to "yes" if using an Ubuntu official AMI as we need to +; allow root logins +;UbuntuOfficialAMI = yes + +[CHROOT] +Tempdir=/tmp/upgrade-tester +CacheTarball=yes diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/edubuntu/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/edubuntu/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/edubuntu/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/edubuntu/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,8 @@ +[Sources] +Components=main,restricted,universe,multiverse + +[NonInteractive] +ProfileName = edubuntu +BasePkg = edubuntu-desktop +Components=main,restricted,universe,multiverse + diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/euca-cloud/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/euca-cloud/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/euca-cloud/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/euca-cloud/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,4 @@ +[NonInteractive] +ProfileName=eua-cloud +AdditionalPkgs = pkgs.cfg + diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/euca-cloud/pkgs.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/euca-cloud/pkgs.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/euca-cloud/pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/euca-cloud/pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,5 @@ +python-apt +eucalyptus-cc +eucalyptus-cloud +eucalyptus-walrus +eucalyptus-sc diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/euca-nc/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/euca-nc/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/euca-nc/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/euca-nc/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,3 @@ +[NonInteractive] +ProfileName=eua-nc +AdditionalPkgs = pkgs.cfg diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/euca-nc/pkgs.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/euca-nc/pkgs.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/euca-nc/pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/euca-nc/pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,2 @@ +python-apt +eucalyptus-nc diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/kubuntu/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/kubuntu/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/kubuntu/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/kubuntu/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,3 @@ +[NonInteractive] +ProfileName=kubuntu +BasePkg = kubuntu-desktop diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-kubuntu/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-kubuntu/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-kubuntu/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-kubuntu/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,6 @@ +[DEFAULT] +SourceRelease=lucid + +[NonInteractive] +ProfileName=lts-kubuntu +BasePkg = kubuntu-desktop diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all/demoted.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all/demoted.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all/demoted.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all/demoted.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,245 @@ +# demoted packages from oneiric to precise +ajaxterm +asp.net-examples +at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu +cantor +cantor-dbg +cobbler-enlist +couchdb-bin +dcraw +defoma +defoma-doc +desktopcouch +desktopcouch-tools +desktopcouch-ubuntuone +ecosconfig-imx +evolution-couchdb +evolution-couchdb-backend +exiv2 +fortunes-ubuntu-server +g++-4.5-multilib +gamin +gbrainy +gcc-4.4-source +gcc-4.5-multilib +gir1.2-couchdb-1.0 +gir1.2-desktopcouch-1.0 +gnome-desktop-data +gnome-search-tool +jsvc +jython +jython-doc +kaffeine +kaffeine-dbg +kdevelop +kdevelop-data +kdevelop-dev +kdevplatform-dbg +kdevplatform-dev +kdewallpapers +koffice-l10n-ca +koffice-l10n-cavalencia +koffice-l10n-da +koffice-l10n-de +koffice-l10n-el +koffice-l10n-engb +koffice-l10n-es +koffice-l10n-et +koffice-l10n-fr +koffice-l10n-gl +koffice-l10n-hu +koffice-l10n-it +koffice-l10n-ja +koffice-l10n-kk +koffice-l10n-nb +koffice-l10n-nds +koffice-l10n-nl +koffice-l10n-pl +koffice-l10n-pt +koffice-l10n-ptbr +koffice-l10n-ru +koffice-l10n-sv +koffice-l10n-tr +koffice-l10n-uk +koffice-l10n-wa +koffice-l10n-zhcn +koffice-l10n-zhtw +lib32go0 +lib32go0-dbg +lib64go0 +lib64go0-dbg +libaccess-bridge-java +libaccess-bridge-java-jni +libamd2.2.0 +libatspi-dbg +libatspi-dev +libatspi1.0-0 +libbtf1.1.0 +libcamd2.2.0 +libccolamd2.7.1 +libcholmod1.7.1 +libcolamd2.7.1 +libcommons-daemon-java +libcouchdb-glib-1.0-2 +libcouchdb-glib-dev +libcouchdb-glib-doc +libcsparse2.2.3 +libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev +libdesktopcouch-glib-1.0-2 +libdesktopcouch-glib-dev +libdirectfb-1.2-9 +libdirectfb-1.2-9-dbg +libdirectfb-bin +libdirectfb-bin-dbg +libdirectfb-dev +libdirectfb-extra +libdirectfb-extra-dbg +libgamin-dev +libgamin0 +libgdata-cil-dev +libgdict-1.0-6 +libgdict-1.0-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil +libglademm-2.4-1c2a +libglademm-2.4-dbg +libglademm-2.4-dev +libglademm-2.4-doc +libgladeui-1-11 +libgladeui-1-dev +libgmm-dev +libgo0 +libgo0-dbg +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev +libgtkhtml-editor-common +libgtkhtml-editor-dev +libgtkhtml-editor0 +libgtkhtml3.14-19 +libgtkhtml3.14-dbg +libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev +libklu1.1.0 +libldl2.0.1 +libllvm-2.8-ocaml-dev +libllvm-2.9-ocaml-dev +libllvm2.8 +libllvm2.9 +liblpsolve55-dev +libmodplug-dev +libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil +libmozjs185-1.0 +libmozjs185-dev +libmusicbrainz4-dev +libmysql-java +libnotify-cil-dev +libnotify0.4-cil +libofa0 +libofa0-dev +libpg-java +libpod-plainer-perl +libqt4-declarative-shaders +librcps-dev +librcps0 +libreadline-java +libreadline-java-doc +libsac-java +libsac-java-doc +libsac-java-gcj +libsublime-dev +libsuitesparse-dbg +libsuitesparse-dev +libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil +libtextcat-data +libtextcat-dev +libtextcat0 +libts-0.0-0 +libts-0.0-0-dbg +libts-bin +libts-dev +libumfpack5.4.0 +libvala-0.12-0 +libvala-0.12-0-dbg +libxine-dev +libxine1 +libxine1-bin +libxine1-console +libxine1-dbg +libxine1-doc +libxine1-ffmpeg +libxine1-gnome +libxine1-misc-plugins +libxine1-x +linux-wlan-ng +linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime +llvm-2.9 +llvm-2.9-dev +llvm-2.9-doc +llvm-2.9-examples +llvm-2.9-runtime +lp-solve +lp-solve-doc +mono-jay +mono-xsp2 +mono-xsp2-base +myspell-tools +nova-ajax-console-proxy +oxygen-icon-theme-complete +pngquant +python-aptdaemon.gtkwidgets +python-bittorrent +python-central +python-desktopcouch +python-desktopcouch-application +python-desktopcouch-records +python-desktopcouch-recordtypes +python-fontforge +python-gamin +python-indicate +python-smartpm +python-support +python-telepathy +python-xklavier +qt3-designer +squid +squid-common +swift +tomboy +tomcat6-user +tsconf +ttf-lao +ttf-sil-padauk +ttf-unfonts-extra +unionfs-fuse +vala-0.12-doc +valac-0.12 +valac-0.12-dbg +vinagre +x-ttcidfont-conf +xserver-xephyr +zeitgeist-extension-fts diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,8 @@ +[DEFAULT] +SourceRelease=lucid + +[NonInteractive] +ProfileName = lts-main-all +AdditionalPkgs = pkgs.cfg +PostBootstrapScript=/usr/share/pyshared/AutoUpgradeTester/install_all.py +;PostBootstrapScript=/home/upgrade-tester/update-manager/AutoUpgradeTester/install_all.py diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all/DistUpgrade.cfg.dapper update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all/DistUpgrade.cfg.dapper --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all/DistUpgrade.cfg.dapper 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all/DistUpgrade.cfg.dapper 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,65 @@ +[View] +#View=DistUpgradeViewGtk +View=DistUpgradeViewNonInteractive + +# Distro contains global information about the upgrade +[Distro] +# the meta-pkgs we support +MetaPkgs=ubuntu-desktop, kubuntu-desktop, edubuntu-desktop, xubuntu-desktop +BaseMetaPkgs=ubuntu-minimal, ubuntu-standard +PostUpgradePurge=xorg-common, libgl1-mesa +Demotions=demoted.cfg +RemoveEssentialOk=sysvinit +RemovalBlacklistFile=removal_blacklist.cfg + +# information about the individual meta-pkgs +[ubuntu-desktop] +KeyDependencies=gdm, gnome-panel, ubuntu-artwork +# those pkgs will be marked remove right after the distUpgrade in the cache +PostUpgradeRemove=xchat, xscreensaver + +[kubuntu-desktop] +KeyDependencies=kdm, kicker, kubuntu-artwork-usplash +# those packages are marked as obsolete right after the upgrade +ForcedObsoletes=ivman + +[edubuntu-desktop] +KeyDependencies=edubuntu-artwork, tuxpaint + +[xubuntu-desktop] +KeyDependencies=xubuntu-artwork-usplash, xubuntu-default-settings, xfce4 + + +[Files] +BackupExt=distUpgrade + +[Sources] +From=dapper +To=hardy +ValidOrigin=Ubuntu +ValidMirrors = mirrors.cfg + +[Network] +MaxRetries=3 + +[PreRequists] +Packages=release-upgrader-apt,release-upgrader-dpkg +SourcesList=prerequists-sources.list + +[NonInteractive] +ProfileName = main-all +BasePkg = ubuntu-standard +AdditionalPkgs = pkgs.cfg +Mirror = http://archive.ubuntu.com/ubuntu +Proxy=http://192.168.1.1:3128/ +ForceOverwrite=yes +CacheTarball=yes +PostBootstrapScript=install_all.py +Components=main,restricted +Pockets=security,updates +BaseImage=jeos/dapper-i386.qcow2 +CacheBaseImage=yes +SwapImage=jeos/swap.qcow2 +UpgradeFromDistOnBootstrap=true +SSHKey=ssh-key +ReadReboot=yes \ No newline at end of file diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all/install_blacklist.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all/install_blacklist.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all/install_blacklist.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all/install_blacklist.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,46 @@ +# jaunty: endless loop with DEBIAN_FRONTEND=noninteractive +moodle +# has a funny "can not be upgraded automatically" policy +# see debian #368226 +quagga +# not installable on a regular machine (preinst error) +ltsp-client +# gwenview-i18n has some file conflicts +gwenview-i18n +# ipppd needs MAKEDEV +ipppd +# cmake has incorrect emacs dependencies +cmake +# cluster manager hangs on shutdown +cman + +# Conflicts/uninstallable packages in Oneiric +libgladeui-doc +mythes-it +amavisd-new +grub-legacy-ec2 + +# LP:#901638 +tdsodbc + +# Only useful on livecd +casper +ubiquity + +# No need for so many kernels +linux-image-.* + +# Failed to install +bacula-director-mysql +dovecot-common +rabbitmq-server + +# cloud/ec2 no fun +cloud-init +ec2-init +linux-image-ec2 +linux-image-2.6.31-302-ec2 + +# not installable on a regular machine +ltsp-client +ltsp-client-core diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all/pkgs.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all/pkgs.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all/pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all/pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,3 @@ +python-apt +python-gnupginterface +grub-pc diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all/prerequists-sources.list update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all/prerequists-sources.list --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all/prerequists-sources.list 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all/prerequists-sources.list 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,5 @@ +# sources.list fragment for pre-requists (one with countrymirror, one fallback) +deb http://archive.ubuntu.com/ubuntu dapper-backports main/debian-installer +#deb http://archive.ubuntu.com/ubuntu feisty-backports main/debian-installer +# below is just for testing +#deb http://archive.dogfood.launchpad.net/ubuntu feisty-backports main/debian-installer diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all/removal_blacklist.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all/removal_blacklist.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all/removal_blacklist.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all/removal_blacklist.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,11 @@ +# blacklist of packages that should never be removed +ubuntu-standard +ubuntu-minimal +ubuntu-desktop +kubuntu-desktop +edubuntu-desktop +gobuntu-desktop +# never remove nvidia-glx and friends +^nvidia-glx$ +^nvidia-glx-new$ +^nvidia-glx-legacy$ diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all-amd64/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all-amd64/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all-amd64/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all-amd64/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,12 @@ +[DEFAULT] +SourceRelease=lucid + +[NonInteractive] +ProfileName = lts-main-all-amd64 +AdditionalPkgs = pkgs.cfg +PostBootstrapScript=/usr/share/pyshared/AutoUpgradeTester/install_all.py +;PostBootstrapScript=/home/upgrade-tester/update-manager/AutoUpgradeTester/install_all.py + +[KVM] +Arch=amd64 + diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all-amd64/DistUpgrade.cfg.dapper update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all-amd64/DistUpgrade.cfg.dapper --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all-amd64/DistUpgrade.cfg.dapper 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all-amd64/DistUpgrade.cfg.dapper 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,65 @@ +[View] +#View=DistUpgradeViewGtk +View=DistUpgradeViewNonInteractive + +# Distro contains global information about the upgrade +[Distro] +# the meta-pkgs we support +MetaPkgs=ubuntu-desktop, kubuntu-desktop, edubuntu-desktop, xubuntu-desktop +BaseMetaPkgs=ubuntu-minimal, ubuntu-standard +PostUpgradePurge=xorg-common, libgl1-mesa +Demotions=demoted.cfg +RemoveEssentialOk=sysvinit +RemovalBlacklistFile=removal_blacklist.cfg + +# information about the individual meta-pkgs +[ubuntu-desktop] +KeyDependencies=gdm, gnome-panel, ubuntu-artwork +# those pkgs will be marked remove right after the distUpgrade in the cache +PostUpgradeRemove=xchat, xscreensaver + +[kubuntu-desktop] +KeyDependencies=kdm, kicker, kubuntu-artwork-usplash +# those packages are marked as obsolete right after the upgrade +ForcedObsoletes=ivman + +[edubuntu-desktop] +KeyDependencies=edubuntu-artwork, tuxpaint + +[xubuntu-desktop] +KeyDependencies=xubuntu-artwork-usplash, xubuntu-default-settings, xfce4 + + +[Files] +BackupExt=distUpgrade + +[Sources] +From=dapper +To=hardy +ValidOrigin=Ubuntu +ValidMirrors = mirrors.cfg + +[Network] +MaxRetries=3 + +[PreRequists] +Packages=release-upgrader-apt,release-upgrader-dpkg +SourcesList=prerequists-sources.list + +[NonInteractive] +ProfileName = main-all +BasePkg = ubuntu-standard +AdditionalPkgs = pkgs.cfg +Mirror = http://archive.ubuntu.com/ubuntu +Proxy=http://192.168.1.1:3128/ +ForceOverwrite=yes +CacheTarball=yes +PostBootstrapScript=install_all.py +Components=main,restricted +Pockets=security,updates +BaseImage=jeos/dapper-i386.qcow2 +CacheBaseImage=yes +SwapImage=jeos/swap.qcow2 +UpgradeFromDistOnBootstrap=true +SSHKey=ssh-key +ReadReboot=yes \ No newline at end of file diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all-amd64/install_blacklist.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all-amd64/install_blacklist.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all-amd64/install_blacklist.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all-amd64/install_blacklist.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,46 @@ +# jaunty: endless loop with DEBIAN_FRONTEND=noninteractive +moodle +# has a funny "can not be upgraded automatically" policy +# see debian #368226 +quagga +# not installable on a regular machine (preinst error) +ltsp-client +# gwenview-i18n has some file conflicts +gwenview-i18n +# ipppd needs MAKEDEV +ipppd +# cmake has incorrect emacs dependencies +cmake +# cluster manager hangs on shutdown +cman + +# Conflicts/uninstallable packages in Oneiric +libgladeui-doc +mythes-it +amavisd-new +grub-legacy-ec2 + +# LP:#901638 +tdsodbc + +# Only useful on livecd +casper +ubiquity + +# No need for so many kernels +linux-image-.* + +# Failed to install +bacula-director-mysql +dovecot-common +rabbitmq-server + +# cloud/ec2 no fun +cloud-init +ec2-init +linux-image-ec2 +linux-image-2.6.31-302-ec2 + +# not installable on a regular machine +ltsp-client +ltsp-client-core diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all-amd64/pkgs.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all-amd64/pkgs.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all-amd64/pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all-amd64/pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,3 @@ +python-apt +python-gnupginterface +grub-pc diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all-amd64/prerequists-sources.list update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all-amd64/prerequists-sources.list --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all-amd64/prerequists-sources.list 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all-amd64/prerequists-sources.list 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,5 @@ +# sources.list fragment for pre-requists (one with countrymirror, one fallback) +deb http://archive.ubuntu.com/ubuntu dapper-backports main/debian-installer +#deb http://archive.ubuntu.com/ubuntu feisty-backports main/debian-installer +# below is just for testing +#deb http://archive.dogfood.launchpad.net/ubuntu feisty-backports main/debian-installer diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all-amd64/removal_blacklist.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all-amd64/removal_blacklist.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-main-all-amd64/removal_blacklist.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-main-all-amd64/removal_blacklist.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,11 @@ +# blacklist of packages that should never be removed +ubuntu-standard +ubuntu-minimal +ubuntu-desktop +kubuntu-desktop +edubuntu-desktop +gobuntu-desktop +# never remove nvidia-glx and friends +^nvidia-glx$ +^nvidia-glx-new$ +^nvidia-glx-legacy$ diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-mythbuntu/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-mythbuntu/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-mythbuntu/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-mythbuntu/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,8 @@ +[DEFAULT] +SourceRelease=lucid + +[NonInteractive] +ProfileName=lts-mythbuntu +BasePkg = mythbuntu-desktop +Components=main,restricted,universe,multiverse +Pockets=security,updates diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-server/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-server/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-server/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-server/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,7 @@ +[DEFAULT] +SourceRelease=lucid + +[NonInteractive] +ProfileName=lts-server +AdditionalPkgs = pkgs.cfg +;UseUpgraderFromBzr=true \ No newline at end of file diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-server/DistUpgrade.cfg.dapper update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-server/DistUpgrade.cfg.dapper --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-server/DistUpgrade.cfg.dapper 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-server/DistUpgrade.cfg.dapper 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,53 @@ +[View] +#View=DistUpgradeViewGtk +View=DistUpgradeViewNonInteractive +Depends=python-gnupginterface + +# Distro contains global information about the upgrade +[Distro] +# the meta-pkgs we support +MetaPkgs=ubuntu-standard +BaseMetaPkgs=ubuntu-minimal +Demotions=demotions.cfg +RemoveEssentialOk=sysvinit +AllowUnauthenticated=yes + +[Files] +BackupExt=distUpgrade + +[ubuntu-standard] +KeyDependencies=w3m, wget + +[Sources] +From=dapper +To=hardy +ValidOrigin=Ubuntu +ValidMirrors = mirrors.cfg + +[Network] +MaxRetries=3 + +[PreRequists] +Packages=release-upgrader-apt,release-upgrader-dpkg +SourcesList=prerequists-sources.dapper.list +SourcesList-ia64=prerequists-sources.dapper-ports.list +SourcesList-hppa=prerequists-sources.dapper-ports.list + +[NonInteractive] +ProfileName=server +BasePkg = ubuntu-standard +AdditionalPkgs = pkgs.cfg +Mirror = http://archive.ubuntu.com/ubuntu +Proxy=http://192.168.1.1:3128/ +ForceOverwrite=no +SSHKey=ssh-key +BaseImage=jeos/dapper-i386.qcow2 +SwapImage=jeos/swap.qcow2 +Components=main,restricted +Pockets=security,updates +UpgradeFromDistOnBoostrap=true +CacheBaseImage=yes +RealReboot=yes +; WARNING: if AddRepo is used, remember to set Distro/AllowUnauthenticted too +;AddRepo=local_testing.list +;PreRequistsFiles=backports/release-upgrader-apt_0.7.9ubuntu1_i386.udeb, backports/release-upgrader-dpkg_1.14.5ubuntu11.6_i386.udeb diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-server/local_testing.list update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-server/local_testing.list --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-server/local_testing.list 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-server/local_testing.list 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1 @@ +deb http://ppa.launchpad.net/mvo/apt-lucid-chris/ubuntu lucid main diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-server/pkgs.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-server/pkgs.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-server/pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-server/pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,3 @@ +grub-pc +python-apt +python-gnupginterface diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-server/prerequists-sources.dapper.list update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-server/prerequists-sources.dapper.list --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-server/prerequists-sources.dapper.list 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-server/prerequists-sources.dapper.list 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,4 @@ +# sources.list fragment for pre-requists (mirror from sources.list + fallback) +# this is safe to remove after the upgrade +${mirror} +deb http://archive.ubuntu.com/ubuntu dapper-backports main/debian-installer diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-server-amd64/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-server-amd64/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-server-amd64/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-server-amd64/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,9 @@ +[DEFAULT] +SourceRelease=lucid + +[NonInteractive] +ProfileName=lts-server-amd64 +AdditionalPkgs = pkgs.cfg + +[KVM] +Arch=amd64 diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-server-amd64/pkgs.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-server-amd64/pkgs.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-server-amd64/pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-server-amd64/pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,3 @@ +grub-pc +python-apt +python-gnupginterface diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-server-tasks/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-server-tasks/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-server-tasks/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-server-tasks/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,6 @@ +[DEFAULT] +SourceRelease=lucid + +[NonInteractive] +ProfileName = lts-server-tasks +AdditionalPkgs = pkgs.cfg diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-server-tasks/pkgs.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-server-tasks/pkgs.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-server-tasks/pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-server-tasks/pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,10 @@ +grub-pc +python-apt +python-gnupginterface +dns-server^ +lamp-server^ +mail-server^ +openssh-server^ +postgresql-server^ +print-server^ +samba-server^ diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-ubuntu/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-ubuntu/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-ubuntu/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-ubuntu/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,10 @@ +[DEFAULT] +SourceRelease=lucid + +[NonInteractive] +ProfileName=lts-ubuntu +BasePkg = ubuntu-desktop +AdditionalPkgs = pkgs.cfg +PostBootstrapData = /usr/share/pyshared/AutoUpgradeTester/prepare_lts_user +PostBootstrapScript = /usr/share/pyshared/AutoUpgradeTester/prepare_lts_desktop +;UseUpgraderFromBzr=true diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-ubuntu/DistUpgrade.cfg.dapper update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-ubuntu/DistUpgrade.cfg.dapper --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-ubuntu/DistUpgrade.cfg.dapper 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-ubuntu/DistUpgrade.cfg.dapper 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,67 @@ +[View] +#View=DistUpgradeViewGtk +View=DistUpgradeViewNonInteractive + +# Distro contains global information about the upgrade +[Distro] +# the meta-pkgs we support +MetaPkgs=ubuntu-desktop, kubuntu-desktop, edubuntu-desktop, xubuntu-desktop +BaseMetaPkgs=ubuntu-minimal, ubuntu-standard +PostUpgradePurge=xorg-common, libgl1-mesa +Demotions=demoted.cfg +RemoveEssentialOk=sysvinit +RemovalBlacklistFile=removal_blacklist.cfg +AllowUnauthenticated=yes +PostInstallScripts=/usr/lib/udev/migrate-fstab-to-uuid.sh + +# information about the individual meta-pkgs +[ubuntu-desktop] +KeyDependencies=gdm, gnome-panel, ubuntu-artwork +# those pkgs will be marked remove right after the distUpgrade in the cache +PostUpgradeRemove=xchat, xscreensaver + +[kubuntu-desktop] +KeyDependencies=kdm, kicker, kubuntu-artwork-usplash +# those packages are marked as obsolete right after the upgrade +ForcedObsoletes=ivman + +[edubuntu-desktop] +KeyDependencies=edubuntu-artwork, tuxpaint + +[xubuntu-desktop] +KeyDependencies=xubuntu-artwork-usplash, xubuntu-default-settings, xfce4 + + +[Files] +BackupExt=distUpgrade + +[PreRequists] +Packages=release-upgrader-apt,release-upgrader-dpkg +SourcesList=prerequists-sources.dapper.list + +[Sources] +From=dapper +To=hardy +ValidOrigin=Ubuntu +ValidMirrors = mirrors.cfg + +[Network] +MaxRetries=3 + +[NonInteractive] +ProfileName = ubuntu +BasePkg = ubuntu-desktop +AdditionalPkgs = pkgs.cfg +Mirror = http://archive.ubuntu.com/ubuntu +Proxy=http://192.168.1.1:3128/ +ForceOverwrite=yes +Components=main,restricted +Pockets=security,updates +SSHKey=ssh-key +BaseImage=jeos/dapper-i386.qcow2 +CacheBaseImage=yes +SwapImage=jeos/swap.qcow2 +UpgradeFromDistOnBootstrap=true +WorkaroundNetworkManager=true +; WARNING: if AddRepo is used, remember to set Distro/AllowUnauthenticted too +AddRepo=local_testing.list diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-ubuntu/pkgs.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-ubuntu/pkgs.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-ubuntu/pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-ubuntu/pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,3 @@ +ubuntu-minimal +ubuntu-standard +grub-pc diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-ubuntu/prerequists-sources.dapper.list update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-ubuntu/prerequists-sources.dapper.list --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-ubuntu/prerequists-sources.dapper.list 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-ubuntu/prerequists-sources.dapper.list 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,4 @@ +# sources.list fragment for pre-requists (mirror from sources.list + fallback) +# this is safe to remove after the upgrade +${mirror} +deb http://archive.ubuntu.com/ubuntu dapper-backports main/debian-installer diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-ubuntu-amd64/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-ubuntu-amd64/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-ubuntu-amd64/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-ubuntu-amd64/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,13 @@ +[DEFAULT] +SourceRelease=lucid + +[NonInteractive] +ProfileName=lts-ubuntu-amd64 +BasePkg = ubuntu-desktop +AdditionalPkgs = pkgs.cfg +PostBootstrapData = /usr/share/pyshared/AutoUpgradeTester/prepare_lts_user +PostBootstrapScript = /usr/share/pyshared/AutoUpgradeTester/prepare_lts_desktop + +[KVM] +Arch=amd64 + diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-ubuntu-amd64/pkgs.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-ubuntu-amd64/pkgs.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-ubuntu-amd64/pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-ubuntu-amd64/pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,3 @@ +ubuntu-minimal +ubuntu-standard +grub-pc diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-universe-amd64/demoted.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-universe-amd64/demoted.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-universe-amd64/demoted.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-universe-amd64/demoted.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,245 @@ +# demoted packages from oneiric to precise +ajaxterm +asp.net-examples +at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu +cantor +cantor-dbg +cobbler-enlist +couchdb-bin +dcraw +defoma +defoma-doc +desktopcouch +desktopcouch-tools +desktopcouch-ubuntuone +ecosconfig-imx +evolution-couchdb +evolution-couchdb-backend +exiv2 +fortunes-ubuntu-server +g++-4.5-multilib +gamin +gbrainy +gcc-4.4-source +gcc-4.5-multilib +gir1.2-couchdb-1.0 +gir1.2-desktopcouch-1.0 +gnome-desktop-data +gnome-search-tool +jsvc +jython +jython-doc +kaffeine +kaffeine-dbg +kdevelop +kdevelop-data +kdevelop-dev +kdevplatform-dbg +kdevplatform-dev +kdewallpapers +koffice-l10n-ca +koffice-l10n-cavalencia +koffice-l10n-da +koffice-l10n-de +koffice-l10n-el +koffice-l10n-engb +koffice-l10n-es +koffice-l10n-et +koffice-l10n-fr +koffice-l10n-gl +koffice-l10n-hu +koffice-l10n-it +koffice-l10n-ja +koffice-l10n-kk +koffice-l10n-nb +koffice-l10n-nds +koffice-l10n-nl +koffice-l10n-pl +koffice-l10n-pt +koffice-l10n-ptbr +koffice-l10n-ru +koffice-l10n-sv +koffice-l10n-tr +koffice-l10n-uk +koffice-l10n-wa +koffice-l10n-zhcn +koffice-l10n-zhtw +lib32go0 +lib32go0-dbg +lib64go0 +lib64go0-dbg +libaccess-bridge-java +libaccess-bridge-java-jni +libamd2.2.0 +libatspi-dbg +libatspi-dev +libatspi1.0-0 +libbtf1.1.0 +libcamd2.2.0 +libccolamd2.7.1 +libcholmod1.7.1 +libcolamd2.7.1 +libcommons-daemon-java +libcouchdb-glib-1.0-2 +libcouchdb-glib-dev +libcouchdb-glib-doc +libcsparse2.2.3 +libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev +libdesktopcouch-glib-1.0-2 +libdesktopcouch-glib-dev +libdirectfb-1.2-9 +libdirectfb-1.2-9-dbg +libdirectfb-bin +libdirectfb-bin-dbg +libdirectfb-dev +libdirectfb-extra +libdirectfb-extra-dbg +libgamin-dev +libgamin0 +libgdata-cil-dev +libgdict-1.0-6 +libgdict-1.0-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil +libglademm-2.4-1c2a +libglademm-2.4-dbg +libglademm-2.4-dev +libglademm-2.4-doc +libgladeui-1-11 +libgladeui-1-dev +libgmm-dev +libgo0 +libgo0-dbg +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev +libgtkhtml-editor-common +libgtkhtml-editor-dev +libgtkhtml-editor0 +libgtkhtml3.14-19 +libgtkhtml3.14-dbg +libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev +libklu1.1.0 +libldl2.0.1 +libllvm-2.8-ocaml-dev +libllvm-2.9-ocaml-dev +libllvm2.8 +libllvm2.9 +liblpsolve55-dev +libmodplug-dev +libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil +libmozjs185-1.0 +libmozjs185-dev +libmusicbrainz4-dev +libmysql-java +libnotify-cil-dev +libnotify0.4-cil +libofa0 +libofa0-dev +libpg-java +libpod-plainer-perl +libqt4-declarative-shaders +librcps-dev +librcps0 +libreadline-java +libreadline-java-doc +libsac-java +libsac-java-doc +libsac-java-gcj +libsublime-dev +libsuitesparse-dbg +libsuitesparse-dev +libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil +libtextcat-data +libtextcat-dev +libtextcat0 +libts-0.0-0 +libts-0.0-0-dbg +libts-bin +libts-dev +libumfpack5.4.0 +libvala-0.12-0 +libvala-0.12-0-dbg +libxine-dev +libxine1 +libxine1-bin +libxine1-console +libxine1-dbg +libxine1-doc +libxine1-ffmpeg +libxine1-gnome +libxine1-misc-plugins +libxine1-x +linux-wlan-ng +linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime +llvm-2.9 +llvm-2.9-dev +llvm-2.9-doc +llvm-2.9-examples +llvm-2.9-runtime +lp-solve +lp-solve-doc +mono-jay +mono-xsp2 +mono-xsp2-base +myspell-tools +nova-ajax-console-proxy +oxygen-icon-theme-complete +pngquant +python-aptdaemon.gtkwidgets +python-bittorrent +python-central +python-desktopcouch +python-desktopcouch-application +python-desktopcouch-records +python-desktopcouch-recordtypes +python-fontforge +python-gamin +python-indicate +python-smartpm +python-support +python-telepathy +python-xklavier +qt3-designer +squid +squid-common +swift +tomboy +tomcat6-user +tsconf +ttf-lao +ttf-sil-padauk +ttf-unfonts-extra +unionfs-fuse +vala-0.12-doc +valac-0.12 +valac-0.12-dbg +vinagre +x-ttcidfont-conf +xserver-xephyr +zeitgeist-extension-fts diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-universe-amd64/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-universe-amd64/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-universe-amd64/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-universe-amd64/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,12 @@ +[DEFAULT] +SourceRelease=lucid + +[NonInteractive] +ProfileName = lts-universe-amd64 +AdditionalPkgs = pkgs.cfg +Components=main,restricted,universe +PostBootstrapScript=/home/upgrade-tester/update-manager/AutoUpgradeTester/install_universe + +[KVM] +Arch = amd64 +VirtualRam = 3072 diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-universe-amd64/install_blacklist.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-universe-amd64/install_blacklist.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-universe-amd64/install_blacklist.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-universe-amd64/install_blacklist.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,40 @@ +# jaunty: endless loop with DEBIAN_FRONTEND=noninteractive +moodle +# has a funny "can not be upgraded automatically" policy +# see debian #368226 +quagga +# not installable on a regular machine (preinst error) +ltsp-client +# gwenview-i18n has some file conflicts +gwenview-i18n +# ipppd needs MAKEDEV +ipppd +# cmake has incorrect emacs dependencies +cmake +# cluster manager hangs on shutdown +cman + +# Conflicts/uninstallable packages in Oneiric +libgladeui-doc +mythes-it +amavisd-new +grub-legacy-ec2 + +# LP:#901638 +tdsodbc + +# Only useful on livecd +casper +ubiquity + +# Breaks apache +lwat + +# Broken on collectd +kcollectd + +# Failed to install on lucid +global +likewise-open +likewise-open-gui + diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-universe-amd64/pkgs.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-universe-amd64/pkgs.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-universe-amd64/pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-universe-amd64/pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,3 @@ +grub-pc +python-apt +app-install-data diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-universe-i386/demoted.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-universe-i386/demoted.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-universe-i386/demoted.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-universe-i386/demoted.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,245 @@ +# demoted packages from oneiric to precise +ajaxterm +asp.net-examples +at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu +cantor +cantor-dbg +cobbler-enlist +couchdb-bin +dcraw +defoma +defoma-doc +desktopcouch +desktopcouch-tools +desktopcouch-ubuntuone +ecosconfig-imx +evolution-couchdb +evolution-couchdb-backend +exiv2 +fortunes-ubuntu-server +g++-4.5-multilib +gamin +gbrainy +gcc-4.4-source +gcc-4.5-multilib +gir1.2-couchdb-1.0 +gir1.2-desktopcouch-1.0 +gnome-desktop-data +gnome-search-tool +jsvc +jython +jython-doc +kaffeine +kaffeine-dbg +kdevelop +kdevelop-data +kdevelop-dev +kdevplatform-dbg +kdevplatform-dev +kdewallpapers +koffice-l10n-ca +koffice-l10n-cavalencia +koffice-l10n-da +koffice-l10n-de +koffice-l10n-el +koffice-l10n-engb +koffice-l10n-es +koffice-l10n-et +koffice-l10n-fr +koffice-l10n-gl +koffice-l10n-hu +koffice-l10n-it +koffice-l10n-ja +koffice-l10n-kk +koffice-l10n-nb +koffice-l10n-nds +koffice-l10n-nl +koffice-l10n-pl +koffice-l10n-pt +koffice-l10n-ptbr +koffice-l10n-ru +koffice-l10n-sv +koffice-l10n-tr +koffice-l10n-uk +koffice-l10n-wa +koffice-l10n-zhcn +koffice-l10n-zhtw +lib32go0 +lib32go0-dbg +lib64go0 +lib64go0-dbg +libaccess-bridge-java +libaccess-bridge-java-jni +libamd2.2.0 +libatspi-dbg +libatspi-dev +libatspi1.0-0 +libbtf1.1.0 +libcamd2.2.0 +libccolamd2.7.1 +libcholmod1.7.1 +libcolamd2.7.1 +libcommons-daemon-java +libcouchdb-glib-1.0-2 +libcouchdb-glib-dev +libcouchdb-glib-doc +libcsparse2.2.3 +libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev +libdesktopcouch-glib-1.0-2 +libdesktopcouch-glib-dev +libdirectfb-1.2-9 +libdirectfb-1.2-9-dbg +libdirectfb-bin +libdirectfb-bin-dbg +libdirectfb-dev +libdirectfb-extra +libdirectfb-extra-dbg +libgamin-dev +libgamin0 +libgdata-cil-dev +libgdict-1.0-6 +libgdict-1.0-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil +libglademm-2.4-1c2a +libglademm-2.4-dbg +libglademm-2.4-dev +libglademm-2.4-doc +libgladeui-1-11 +libgladeui-1-dev +libgmm-dev +libgo0 +libgo0-dbg +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev +libgtkhtml-editor-common +libgtkhtml-editor-dev +libgtkhtml-editor0 +libgtkhtml3.14-19 +libgtkhtml3.14-dbg +libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev +libklu1.1.0 +libldl2.0.1 +libllvm-2.8-ocaml-dev +libllvm-2.9-ocaml-dev +libllvm2.8 +libllvm2.9 +liblpsolve55-dev +libmodplug-dev +libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil +libmozjs185-1.0 +libmozjs185-dev +libmusicbrainz4-dev +libmysql-java +libnotify-cil-dev +libnotify0.4-cil +libofa0 +libofa0-dev +libpg-java +libpod-plainer-perl +libqt4-declarative-shaders +librcps-dev +librcps0 +libreadline-java +libreadline-java-doc +libsac-java +libsac-java-doc +libsac-java-gcj +libsublime-dev +libsuitesparse-dbg +libsuitesparse-dev +libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil +libtextcat-data +libtextcat-dev +libtextcat0 +libts-0.0-0 +libts-0.0-0-dbg +libts-bin +libts-dev +libumfpack5.4.0 +libvala-0.12-0 +libvala-0.12-0-dbg +libxine-dev +libxine1 +libxine1-bin +libxine1-console +libxine1-dbg +libxine1-doc +libxine1-ffmpeg +libxine1-gnome +libxine1-misc-plugins +libxine1-x +linux-wlan-ng +linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime +llvm-2.9 +llvm-2.9-dev +llvm-2.9-doc +llvm-2.9-examples +llvm-2.9-runtime +lp-solve +lp-solve-doc +mono-jay +mono-xsp2 +mono-xsp2-base +myspell-tools +nova-ajax-console-proxy +oxygen-icon-theme-complete +pngquant +python-aptdaemon.gtkwidgets +python-bittorrent +python-central +python-desktopcouch +python-desktopcouch-application +python-desktopcouch-records +python-desktopcouch-recordtypes +python-fontforge +python-gamin +python-indicate +python-smartpm +python-support +python-telepathy +python-xklavier +qt3-designer +squid +squid-common +swift +tomboy +tomcat6-user +tsconf +ttf-lao +ttf-sil-padauk +ttf-unfonts-extra +unionfs-fuse +vala-0.12-doc +valac-0.12 +valac-0.12-dbg +vinagre +x-ttcidfont-conf +xserver-xephyr +zeitgeist-extension-fts diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-universe-i386/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-universe-i386/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-universe-i386/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-universe-i386/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,11 @@ +[DEFAULT] +SourceRelease=lucid + +[NonInteractive] +ProfileName = lts-universe-i386 +AdditionalPkgs = pkgs.cfg +Components=main,restricted,universe +PostBootstrapScript=/home/upgrade-tester/update-manager/AutoUpgradeTester/install_universe + +[KVM] +VirtualRam = 3072 diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-universe-i386/install_blacklist.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-universe-i386/install_blacklist.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-universe-i386/install_blacklist.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-universe-i386/install_blacklist.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,40 @@ +# jaunty: endless loop with DEBIAN_FRONTEND=noninteractive +moodle +# has a funny "can not be upgraded automatically" policy +# see debian #368226 +quagga +# not installable on a regular machine (preinst error) +ltsp-client +# gwenview-i18n has some file conflicts +gwenview-i18n +# ipppd needs MAKEDEV +ipppd +# cmake has incorrect emacs dependencies +cmake +# cluster manager hangs on shutdown +cman + +# Conflicts/uninstallable packages in Oneiric +libgladeui-doc +mythes-it +amavisd-new +grub-legacy-ec2 + +# LP:#901638 +tdsodbc + +# Only useful on livecd +casper +ubiquity + +# Breaks apache +lwat + +# Broken on collectd +kcollectd + +# Failed to install on lucid +global +likewise-open +likewise-open-gui + diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lts-universe-i386/pkgs.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-universe-i386/pkgs.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lts-universe-i386/pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lts-universe-i386/pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,3 @@ +grub-pc +python-apt +app-install-data diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/lubuntu/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/lubuntu/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/lubuntu/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/lubuntu/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,4 @@ +[NonInteractive] +ProfileName = lubuntu +BasePkg = lubuntu-desktop +Components=main,restricted,universe diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/main-all/demoted.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/main-all/demoted.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/main-all/demoted.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/main-all/demoted.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,245 @@ +# demoted packages from oneiric to precise +ajaxterm +asp.net-examples +at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu +cantor +cantor-dbg +cobbler-enlist +couchdb-bin +dcraw +defoma +defoma-doc +desktopcouch +desktopcouch-tools +desktopcouch-ubuntuone +ecosconfig-imx +evolution-couchdb +evolution-couchdb-backend +exiv2 +fortunes-ubuntu-server +g++-4.5-multilib +gamin +gbrainy +gcc-4.4-source +gcc-4.5-multilib +gir1.2-couchdb-1.0 +gir1.2-desktopcouch-1.0 +gnome-desktop-data +gnome-search-tool +jsvc +jython +jython-doc +kaffeine +kaffeine-dbg +kdevelop +kdevelop-data +kdevelop-dev +kdevplatform-dbg +kdevplatform-dev +kdewallpapers +koffice-l10n-ca +koffice-l10n-cavalencia +koffice-l10n-da +koffice-l10n-de +koffice-l10n-el +koffice-l10n-engb +koffice-l10n-es +koffice-l10n-et +koffice-l10n-fr +koffice-l10n-gl +koffice-l10n-hu +koffice-l10n-it +koffice-l10n-ja +koffice-l10n-kk +koffice-l10n-nb +koffice-l10n-nds +koffice-l10n-nl +koffice-l10n-pl +koffice-l10n-pt +koffice-l10n-ptbr +koffice-l10n-ru +koffice-l10n-sv +koffice-l10n-tr +koffice-l10n-uk +koffice-l10n-wa +koffice-l10n-zhcn +koffice-l10n-zhtw +lib32go0 +lib32go0-dbg +lib64go0 +lib64go0-dbg +libaccess-bridge-java +libaccess-bridge-java-jni +libamd2.2.0 +libatspi-dbg +libatspi-dev +libatspi1.0-0 +libbtf1.1.0 +libcamd2.2.0 +libccolamd2.7.1 +libcholmod1.7.1 +libcolamd2.7.1 +libcommons-daemon-java +libcouchdb-glib-1.0-2 +libcouchdb-glib-dev +libcouchdb-glib-doc +libcsparse2.2.3 +libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev +libdesktopcouch-glib-1.0-2 +libdesktopcouch-glib-dev +libdirectfb-1.2-9 +libdirectfb-1.2-9-dbg +libdirectfb-bin +libdirectfb-bin-dbg +libdirectfb-dev +libdirectfb-extra +libdirectfb-extra-dbg +libgamin-dev +libgamin0 +libgdata-cil-dev +libgdict-1.0-6 +libgdict-1.0-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil +libglademm-2.4-1c2a +libglademm-2.4-dbg +libglademm-2.4-dev +libglademm-2.4-doc +libgladeui-1-11 +libgladeui-1-dev +libgmm-dev +libgo0 +libgo0-dbg +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev +libgtkhtml-editor-common +libgtkhtml-editor-dev +libgtkhtml-editor0 +libgtkhtml3.14-19 +libgtkhtml3.14-dbg +libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev +libklu1.1.0 +libldl2.0.1 +libllvm-2.8-ocaml-dev +libllvm-2.9-ocaml-dev +libllvm2.8 +libllvm2.9 +liblpsolve55-dev +libmodplug-dev +libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil +libmozjs185-1.0 +libmozjs185-dev +libmusicbrainz4-dev +libmysql-java +libnotify-cil-dev +libnotify0.4-cil +libofa0 +libofa0-dev +libpg-java +libpod-plainer-perl +libqt4-declarative-shaders +librcps-dev +librcps0 +libreadline-java +libreadline-java-doc +libsac-java +libsac-java-doc +libsac-java-gcj +libsublime-dev +libsuitesparse-dbg +libsuitesparse-dev +libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil +libtextcat-data +libtextcat-dev +libtextcat0 +libts-0.0-0 +libts-0.0-0-dbg +libts-bin +libts-dev +libumfpack5.4.0 +libvala-0.12-0 +libvala-0.12-0-dbg +libxine-dev +libxine1 +libxine1-bin +libxine1-console +libxine1-dbg +libxine1-doc +libxine1-ffmpeg +libxine1-gnome +libxine1-misc-plugins +libxine1-x +linux-wlan-ng +linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime +llvm-2.9 +llvm-2.9-dev +llvm-2.9-doc +llvm-2.9-examples +llvm-2.9-runtime +lp-solve +lp-solve-doc +mono-jay +mono-xsp2 +mono-xsp2-base +myspell-tools +nova-ajax-console-proxy +oxygen-icon-theme-complete +pngquant +python-aptdaemon.gtkwidgets +python-bittorrent +python-central +python-desktopcouch +python-desktopcouch-application +python-desktopcouch-records +python-desktopcouch-recordtypes +python-fontforge +python-gamin +python-indicate +python-smartpm +python-support +python-telepathy +python-xklavier +qt3-designer +squid +squid-common +swift +tomboy +tomcat6-user +tsconf +ttf-lao +ttf-sil-padauk +ttf-unfonts-extra +unionfs-fuse +vala-0.12-doc +valac-0.12 +valac-0.12-dbg +vinagre +x-ttcidfont-conf +xserver-xephyr +zeitgeist-extension-fts diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/main-all/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/main-all/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/main-all/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/main-all/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,5 @@ +[NonInteractive] +ProfileName = main-all +AdditionalPkgs = pkgs.cfg +PostBootstrapScript=/usr/share/pyshared/AutoUpgradeTester/install_all.py +;PostBootstrapScript=/home/upgrade-tester/update-manager/AutoUpgradeTester/install_all.py diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/main-all/install_blacklist.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/main-all/install_blacklist.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/main-all/install_blacklist.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/main-all/install_blacklist.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,28 @@ +# jaunty: endless loop with DEBIAN_FRONTEND=noninteractive +moodle +# has a funny "can not be upgraded automatically" policy +# see debian #368226 +quagga +# not installable on a regular machine (preinst error) +ltsp-client +# gwenview-i18n has some file conflicts +gwenview-i18n +# ipppd needs MAKEDEV +ipppd +# cmake has incorrect emacs dependencies +cmake +# cluster manager hangs on shutdown +cman + +# Conflicts/uninstallable packages in Oneiric +libgladeui-doc +mythes-it +amavisd-new +grub-legacy-ec2 + +# LP:#901638 +tdsodbc + +# Only useful on livecd +casper +ubiquity diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/main-all/pkgs.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/main-all/pkgs.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/main-all/pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/main-all/pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,2 @@ +grub-pc +python-apt diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/main-all-amd64/demoted.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/main-all-amd64/demoted.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/main-all-amd64/demoted.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/main-all-amd64/demoted.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,245 @@ +# demoted packages from oneiric to precise +ajaxterm +asp.net-examples +at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu +cantor +cantor-dbg +cobbler-enlist +couchdb-bin +dcraw +defoma +defoma-doc +desktopcouch +desktopcouch-tools +desktopcouch-ubuntuone +ecosconfig-imx +evolution-couchdb +evolution-couchdb-backend +exiv2 +fortunes-ubuntu-server +g++-4.5-multilib +gamin +gbrainy +gcc-4.4-source +gcc-4.5-multilib +gir1.2-couchdb-1.0 +gir1.2-desktopcouch-1.0 +gnome-desktop-data +gnome-search-tool +jsvc +jython +jython-doc +kaffeine +kaffeine-dbg +kdevelop +kdevelop-data +kdevelop-dev +kdevplatform-dbg +kdevplatform-dev +kdewallpapers +koffice-l10n-ca +koffice-l10n-cavalencia +koffice-l10n-da +koffice-l10n-de +koffice-l10n-el +koffice-l10n-engb +koffice-l10n-es +koffice-l10n-et +koffice-l10n-fr +koffice-l10n-gl +koffice-l10n-hu +koffice-l10n-it +koffice-l10n-ja +koffice-l10n-kk +koffice-l10n-nb +koffice-l10n-nds +koffice-l10n-nl +koffice-l10n-pl +koffice-l10n-pt +koffice-l10n-ptbr +koffice-l10n-ru +koffice-l10n-sv +koffice-l10n-tr +koffice-l10n-uk +koffice-l10n-wa +koffice-l10n-zhcn +koffice-l10n-zhtw +lib32go0 +lib32go0-dbg +lib64go0 +lib64go0-dbg +libaccess-bridge-java +libaccess-bridge-java-jni +libamd2.2.0 +libatspi-dbg +libatspi-dev +libatspi1.0-0 +libbtf1.1.0 +libcamd2.2.0 +libccolamd2.7.1 +libcholmod1.7.1 +libcolamd2.7.1 +libcommons-daemon-java +libcouchdb-glib-1.0-2 +libcouchdb-glib-dev +libcouchdb-glib-doc +libcsparse2.2.3 +libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev +libdesktopcouch-glib-1.0-2 +libdesktopcouch-glib-dev +libdirectfb-1.2-9 +libdirectfb-1.2-9-dbg +libdirectfb-bin +libdirectfb-bin-dbg +libdirectfb-dev +libdirectfb-extra +libdirectfb-extra-dbg +libgamin-dev +libgamin0 +libgdata-cil-dev +libgdict-1.0-6 +libgdict-1.0-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil +libglademm-2.4-1c2a +libglademm-2.4-dbg +libglademm-2.4-dev +libglademm-2.4-doc +libgladeui-1-11 +libgladeui-1-dev +libgmm-dev +libgo0 +libgo0-dbg +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev +libgtkhtml-editor-common +libgtkhtml-editor-dev +libgtkhtml-editor0 +libgtkhtml3.14-19 +libgtkhtml3.14-dbg +libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev +libklu1.1.0 +libldl2.0.1 +libllvm-2.8-ocaml-dev +libllvm-2.9-ocaml-dev +libllvm2.8 +libllvm2.9 +liblpsolve55-dev +libmodplug-dev +libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil +libmozjs185-1.0 +libmozjs185-dev +libmusicbrainz4-dev +libmysql-java +libnotify-cil-dev +libnotify0.4-cil +libofa0 +libofa0-dev +libpg-java +libpod-plainer-perl +libqt4-declarative-shaders +librcps-dev +librcps0 +libreadline-java +libreadline-java-doc +libsac-java +libsac-java-doc +libsac-java-gcj +libsublime-dev +libsuitesparse-dbg +libsuitesparse-dev +libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil +libtextcat-data +libtextcat-dev +libtextcat0 +libts-0.0-0 +libts-0.0-0-dbg +libts-bin +libts-dev +libumfpack5.4.0 +libvala-0.12-0 +libvala-0.12-0-dbg +libxine-dev +libxine1 +libxine1-bin +libxine1-console +libxine1-dbg +libxine1-doc +libxine1-ffmpeg +libxine1-gnome +libxine1-misc-plugins +libxine1-x +linux-wlan-ng +linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime +llvm-2.9 +llvm-2.9-dev +llvm-2.9-doc +llvm-2.9-examples +llvm-2.9-runtime +lp-solve +lp-solve-doc +mono-jay +mono-xsp2 +mono-xsp2-base +myspell-tools +nova-ajax-console-proxy +oxygen-icon-theme-complete +pngquant +python-aptdaemon.gtkwidgets +python-bittorrent +python-central +python-desktopcouch +python-desktopcouch-application +python-desktopcouch-records +python-desktopcouch-recordtypes +python-fontforge +python-gamin +python-indicate +python-smartpm +python-support +python-telepathy +python-xklavier +qt3-designer +squid +squid-common +swift +tomboy +tomcat6-user +tsconf +ttf-lao +ttf-sil-padauk +ttf-unfonts-extra +unionfs-fuse +vala-0.12-doc +valac-0.12 +valac-0.12-dbg +vinagre +x-ttcidfont-conf +xserver-xephyr +zeitgeist-extension-fts diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/main-all-amd64/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/main-all-amd64/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/main-all-amd64/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/main-all-amd64/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,8 @@ +[NonInteractive] +ProfileName = main-all-amd64 +AdditionalPkgs = pkgs.cfg +PostBootstrapScript=/usr/share/pyshared/AutoUpgradeTester/install_all.py +;PostBootstrapScript=/home/upgrade-tester/update-manager/AutoUpgradeTester/install_all.py + +[KVM] +Arch=amd64 diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/main-all-amd64/install_blacklist.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/main-all-amd64/install_blacklist.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/main-all-amd64/install_blacklist.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/main-all-amd64/install_blacklist.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,29 @@ +# jaunty: endless loop with DEBIAN_FRONTEND=noninteractive +moodle +# has a funny "can not be upgraded automatically" policy +# see debian #368226 +quagga +# not installable on a regular machine (preinst error) +ltsp-client +# gwenview-i18n has some file conflicts +gwenview-i18n +# ipppd needs MAKEDEV +ipppd +# cmake has incorrect emacs dependencies +cmake +# cluster manager hangs on shutdown +cman + +# Conflicts/uninstallable packages in Oneiric +libgladeui-doc +mythes-it +amavisd-new +grub-legacy-ec2 + +# LP:#901638 +tdsodbc + +# Only useful on livecd +casper +ubiquity + diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/main-all-amd64/pkgs.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/main-all-amd64/pkgs.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/main-all-amd64/pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/main-all-amd64/pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,2 @@ +python-apt +grub-pc diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/mythbuntu/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/mythbuntu/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/mythbuntu/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/mythbuntu/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,4 @@ +[NonInteractive] +ProfileName = mythbuntu +BasePkg = mythbuntu-desktop +Components=main,restricted,universe,multiverse diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/override.cfg.d/global.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/override.cfg.d/global.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/override.cfg.d/global.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/override.cfg.d/global.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,9 @@ +# global override, this will override any configuration from the +# defaults profile directory and from the release upgrader configuration +# +# It is required to force non-interactive upgrade mode but can be used +# for more too + +[View] +View=DistUpgradeViewNonInteractive + diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/python-all/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/python-all/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/python-all/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/python-all/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,6 @@ +[NonInteractive] +ProfileName=python-all +BasePkg = ubuntu-standard +AdditionalPkgs = pkgs.cfg +PostBootstrapScript=/usr/share/pyshared/AutoUpgradeTester/install_all-python.py + diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/python-all/pkgs.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/python-all/pkgs.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/python-all/pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/python-all/pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,2 @@ +grub-pc +python-apt diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/server/demoted.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/server/demoted.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/server/demoted.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/server/demoted.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,245 @@ +# demoted packages from oneiric to precise +ajaxterm +asp.net-examples +at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu +cantor +cantor-dbg +cobbler-enlist +couchdb-bin +dcraw +defoma +defoma-doc +desktopcouch +desktopcouch-tools +desktopcouch-ubuntuone +ecosconfig-imx +evolution-couchdb +evolution-couchdb-backend +exiv2 +fortunes-ubuntu-server +g++-4.5-multilib +gamin +gbrainy +gcc-4.4-source +gcc-4.5-multilib +gir1.2-couchdb-1.0 +gir1.2-desktopcouch-1.0 +gnome-desktop-data +gnome-search-tool +jsvc +jython +jython-doc +kaffeine +kaffeine-dbg +kdevelop +kdevelop-data +kdevelop-dev +kdevplatform-dbg +kdevplatform-dev +kdewallpapers +koffice-l10n-ca +koffice-l10n-cavalencia +koffice-l10n-da +koffice-l10n-de +koffice-l10n-el +koffice-l10n-engb +koffice-l10n-es +koffice-l10n-et +koffice-l10n-fr +koffice-l10n-gl +koffice-l10n-hu +koffice-l10n-it +koffice-l10n-ja +koffice-l10n-kk +koffice-l10n-nb +koffice-l10n-nds +koffice-l10n-nl +koffice-l10n-pl +koffice-l10n-pt +koffice-l10n-ptbr +koffice-l10n-ru +koffice-l10n-sv +koffice-l10n-tr +koffice-l10n-uk +koffice-l10n-wa +koffice-l10n-zhcn +koffice-l10n-zhtw +lib32go0 +lib32go0-dbg +lib64go0 +lib64go0-dbg +libaccess-bridge-java +libaccess-bridge-java-jni +libamd2.2.0 +libatspi-dbg +libatspi-dev +libatspi1.0-0 +libbtf1.1.0 +libcamd2.2.0 +libccolamd2.7.1 +libcholmod1.7.1 +libcolamd2.7.1 +libcommons-daemon-java +libcouchdb-glib-1.0-2 +libcouchdb-glib-dev +libcouchdb-glib-doc +libcsparse2.2.3 +libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev +libdesktopcouch-glib-1.0-2 +libdesktopcouch-glib-dev +libdirectfb-1.2-9 +libdirectfb-1.2-9-dbg +libdirectfb-bin +libdirectfb-bin-dbg +libdirectfb-dev +libdirectfb-extra +libdirectfb-extra-dbg +libgamin-dev +libgamin0 +libgdata-cil-dev +libgdict-1.0-6 +libgdict-1.0-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil +libglademm-2.4-1c2a +libglademm-2.4-dbg +libglademm-2.4-dev +libglademm-2.4-doc +libgladeui-1-11 +libgladeui-1-dev +libgmm-dev +libgo0 +libgo0-dbg +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev +libgtkhtml-editor-common +libgtkhtml-editor-dev +libgtkhtml-editor0 +libgtkhtml3.14-19 +libgtkhtml3.14-dbg +libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev +libklu1.1.0 +libldl2.0.1 +libllvm-2.8-ocaml-dev +libllvm-2.9-ocaml-dev +libllvm2.8 +libllvm2.9 +liblpsolve55-dev +libmodplug-dev +libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil +libmozjs185-1.0 +libmozjs185-dev +libmusicbrainz4-dev +libmysql-java +libnotify-cil-dev +libnotify0.4-cil +libofa0 +libofa0-dev +libpg-java +libpod-plainer-perl +libqt4-declarative-shaders +librcps-dev +librcps0 +libreadline-java +libreadline-java-doc +libsac-java +libsac-java-doc +libsac-java-gcj +libsublime-dev +libsuitesparse-dbg +libsuitesparse-dev +libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil +libtextcat-data +libtextcat-dev +libtextcat0 +libts-0.0-0 +libts-0.0-0-dbg +libts-bin +libts-dev +libumfpack5.4.0 +libvala-0.12-0 +libvala-0.12-0-dbg +libxine-dev +libxine1 +libxine1-bin +libxine1-console +libxine1-dbg +libxine1-doc +libxine1-ffmpeg +libxine1-gnome +libxine1-misc-plugins +libxine1-x +linux-wlan-ng +linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime +llvm-2.9 +llvm-2.9-dev +llvm-2.9-doc +llvm-2.9-examples +llvm-2.9-runtime +lp-solve +lp-solve-doc +mono-jay +mono-xsp2 +mono-xsp2-base +myspell-tools +nova-ajax-console-proxy +oxygen-icon-theme-complete +pngquant +python-aptdaemon.gtkwidgets +python-bittorrent +python-central +python-desktopcouch +python-desktopcouch-application +python-desktopcouch-records +python-desktopcouch-recordtypes +python-fontforge +python-gamin +python-indicate +python-smartpm +python-support +python-telepathy +python-xklavier +qt3-designer +squid +squid-common +swift +tomboy +tomcat6-user +tsconf +ttf-lao +ttf-sil-padauk +ttf-unfonts-extra +unionfs-fuse +vala-0.12-doc +valac-0.12 +valac-0.12-dbg +vinagre +x-ttcidfont-conf +xserver-xephyr +zeitgeist-extension-fts diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/server/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/server/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/server/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/server/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,4 @@ +[NonInteractive] +ProfileName=server +AdditionalPkgs = pkgs.cfg + diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/server/pkgs.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/server/pkgs.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/server/pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/server/pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,2 @@ +grub-pc +python-apt diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/server-amd64/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/server-amd64/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/server-amd64/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/server-amd64/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,7 @@ +[NonInteractive] +ProfileName=server-amd64 +AdditionalPkgs = pkgs.cfg + +[KVM] +Arch=amd64 + diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/server-amd64/pkgs.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/server-amd64/pkgs.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/server-amd64/pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/server-amd64/pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,2 @@ +grub-pc +python-apt diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/server-tasks/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/server-tasks/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/server-tasks/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/server-tasks/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,3 @@ +[NonInteractive] +ProfileName=server-tasks +AdditionalPkgs = pkgs.cfg diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/server-tasks/pkgs.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/server-tasks/pkgs.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/server-tasks/pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/server-tasks/pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,10 @@ +grub-pc +python-apt +python-gnupginterface +dns-server^ +lamp-server^ +mail-server^ +openssh-server^ +postgresql-server^ +print-server^ +samba-server^ diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/server-tasks-amd64/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/server-tasks-amd64/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/server-tasks-amd64/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/server-tasks-amd64/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,6 @@ +[NonInteractive] +ProfileName=server-tasks-amd64 +AdditionalPkgs = pkgs.cfg + +[KVM] +Arch=amd64 diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/server-tasks-amd64/pkgs.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/server-tasks-amd64/pkgs.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/server-tasks-amd64/pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/server-tasks-amd64/pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,9 @@ +python-apt +python-gnupginterface +dns-server^ +lamp-server^ +mail-server^ +openssh-server^ +postgresql-server^ +print-server^ +samba-server^ \ No newline at end of file diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/ubuntu/demoted.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/ubuntu/demoted.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/ubuntu/demoted.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/ubuntu/demoted.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,245 @@ +# demoted packages from oneiric to precise +ajaxterm +asp.net-examples +at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu +cantor +cantor-dbg +cobbler-enlist +couchdb-bin +dcraw +defoma +defoma-doc +desktopcouch +desktopcouch-tools +desktopcouch-ubuntuone +ecosconfig-imx +evolution-couchdb +evolution-couchdb-backend +exiv2 +fortunes-ubuntu-server +g++-4.5-multilib +gamin +gbrainy +gcc-4.4-source +gcc-4.5-multilib +gir1.2-couchdb-1.0 +gir1.2-desktopcouch-1.0 +gnome-desktop-data +gnome-search-tool +jsvc +jython +jython-doc +kaffeine +kaffeine-dbg +kdevelop +kdevelop-data +kdevelop-dev +kdevplatform-dbg +kdevplatform-dev +kdewallpapers +koffice-l10n-ca +koffice-l10n-cavalencia +koffice-l10n-da +koffice-l10n-de +koffice-l10n-el +koffice-l10n-engb +koffice-l10n-es +koffice-l10n-et +koffice-l10n-fr +koffice-l10n-gl +koffice-l10n-hu +koffice-l10n-it +koffice-l10n-ja +koffice-l10n-kk +koffice-l10n-nb +koffice-l10n-nds +koffice-l10n-nl +koffice-l10n-pl +koffice-l10n-pt +koffice-l10n-ptbr +koffice-l10n-ru +koffice-l10n-sv +koffice-l10n-tr +koffice-l10n-uk +koffice-l10n-wa +koffice-l10n-zhcn +koffice-l10n-zhtw +lib32go0 +lib32go0-dbg +lib64go0 +lib64go0-dbg +libaccess-bridge-java +libaccess-bridge-java-jni +libamd2.2.0 +libatspi-dbg +libatspi-dev +libatspi1.0-0 +libbtf1.1.0 +libcamd2.2.0 +libccolamd2.7.1 +libcholmod1.7.1 +libcolamd2.7.1 +libcommons-daemon-java +libcouchdb-glib-1.0-2 +libcouchdb-glib-dev +libcouchdb-glib-doc +libcsparse2.2.3 +libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev +libdesktopcouch-glib-1.0-2 +libdesktopcouch-glib-dev +libdirectfb-1.2-9 +libdirectfb-1.2-9-dbg +libdirectfb-bin +libdirectfb-bin-dbg +libdirectfb-dev +libdirectfb-extra +libdirectfb-extra-dbg +libgamin-dev +libgamin0 +libgdata-cil-dev +libgdict-1.0-6 +libgdict-1.0-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil +libglademm-2.4-1c2a +libglademm-2.4-dbg +libglademm-2.4-dev +libglademm-2.4-doc +libgladeui-1-11 +libgladeui-1-dev +libgmm-dev +libgo0 +libgo0-dbg +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev +libgtkhtml-editor-common +libgtkhtml-editor-dev +libgtkhtml-editor0 +libgtkhtml3.14-19 +libgtkhtml3.14-dbg +libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev +libklu1.1.0 +libldl2.0.1 +libllvm-2.8-ocaml-dev +libllvm-2.9-ocaml-dev +libllvm2.8 +libllvm2.9 +liblpsolve55-dev +libmodplug-dev +libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil +libmozjs185-1.0 +libmozjs185-dev +libmusicbrainz4-dev +libmysql-java +libnotify-cil-dev +libnotify0.4-cil +libofa0 +libofa0-dev +libpg-java +libpod-plainer-perl +libqt4-declarative-shaders +librcps-dev +librcps0 +libreadline-java +libreadline-java-doc +libsac-java +libsac-java-doc +libsac-java-gcj +libsublime-dev +libsuitesparse-dbg +libsuitesparse-dev +libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil +libtextcat-data +libtextcat-dev +libtextcat0 +libts-0.0-0 +libts-0.0-0-dbg +libts-bin +libts-dev +libumfpack5.4.0 +libvala-0.12-0 +libvala-0.12-0-dbg +libxine-dev +libxine1 +libxine1-bin +libxine1-console +libxine1-dbg +libxine1-doc +libxine1-ffmpeg +libxine1-gnome +libxine1-misc-plugins +libxine1-x +linux-wlan-ng +linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime +llvm-2.9 +llvm-2.9-dev +llvm-2.9-doc +llvm-2.9-examples +llvm-2.9-runtime +lp-solve +lp-solve-doc +mono-jay +mono-xsp2 +mono-xsp2-base +myspell-tools +nova-ajax-console-proxy +oxygen-icon-theme-complete +pngquant +python-aptdaemon.gtkwidgets +python-bittorrent +python-central +python-desktopcouch +python-desktopcouch-application +python-desktopcouch-records +python-desktopcouch-recordtypes +python-fontforge +python-gamin +python-indicate +python-smartpm +python-support +python-telepathy +python-xklavier +qt3-designer +squid +squid-common +swift +tomboy +tomcat6-user +tsconf +ttf-lao +ttf-sil-padauk +ttf-unfonts-extra +unionfs-fuse +vala-0.12-doc +valac-0.12 +valac-0.12-dbg +vinagre +x-ttcidfont-conf +xserver-xephyr +zeitgeist-extension-fts diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/ubuntu/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/ubuntu/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/ubuntu/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/ubuntu/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,4 @@ +[NonInteractive] +ProfileName = ubuntu +BasePkg = ubuntu-desktop +AdditionalPkgs = pkgs.cfg diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/ubuntu/pkgs.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/ubuntu/pkgs.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/ubuntu/pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/ubuntu/pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1 @@ +grub-pc diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/ubuntu-amd64/demoted.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/ubuntu-amd64/demoted.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/ubuntu-amd64/demoted.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/ubuntu-amd64/demoted.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,245 @@ +# demoted packages from oneiric to precise +ajaxterm +asp.net-examples +at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu +cantor +cantor-dbg +cobbler-enlist +couchdb-bin +dcraw +defoma +defoma-doc +desktopcouch +desktopcouch-tools +desktopcouch-ubuntuone +ecosconfig-imx +evolution-couchdb +evolution-couchdb-backend +exiv2 +fortunes-ubuntu-server +g++-4.5-multilib +gamin +gbrainy +gcc-4.4-source +gcc-4.5-multilib +gir1.2-couchdb-1.0 +gir1.2-desktopcouch-1.0 +gnome-desktop-data +gnome-search-tool +jsvc +jython +jython-doc +kaffeine +kaffeine-dbg +kdevelop +kdevelop-data +kdevelop-dev +kdevplatform-dbg +kdevplatform-dev +kdewallpapers +koffice-l10n-ca +koffice-l10n-cavalencia +koffice-l10n-da +koffice-l10n-de +koffice-l10n-el +koffice-l10n-engb +koffice-l10n-es +koffice-l10n-et +koffice-l10n-fr +koffice-l10n-gl +koffice-l10n-hu +koffice-l10n-it +koffice-l10n-ja +koffice-l10n-kk +koffice-l10n-nb +koffice-l10n-nds +koffice-l10n-nl +koffice-l10n-pl +koffice-l10n-pt +koffice-l10n-ptbr +koffice-l10n-ru +koffice-l10n-sv +koffice-l10n-tr +koffice-l10n-uk +koffice-l10n-wa +koffice-l10n-zhcn +koffice-l10n-zhtw +lib32go0 +lib32go0-dbg +lib64go0 +lib64go0-dbg +libaccess-bridge-java +libaccess-bridge-java-jni +libamd2.2.0 +libatspi-dbg +libatspi-dev +libatspi1.0-0 +libbtf1.1.0 +libcamd2.2.0 +libccolamd2.7.1 +libcholmod1.7.1 +libcolamd2.7.1 +libcommons-daemon-java +libcouchdb-glib-1.0-2 +libcouchdb-glib-dev +libcouchdb-glib-doc +libcsparse2.2.3 +libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev +libdesktopcouch-glib-1.0-2 +libdesktopcouch-glib-dev +libdirectfb-1.2-9 +libdirectfb-1.2-9-dbg +libdirectfb-bin +libdirectfb-bin-dbg +libdirectfb-dev +libdirectfb-extra +libdirectfb-extra-dbg +libgamin-dev +libgamin0 +libgdata-cil-dev +libgdict-1.0-6 +libgdict-1.0-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil +libglademm-2.4-1c2a +libglademm-2.4-dbg +libglademm-2.4-dev +libglademm-2.4-doc +libgladeui-1-11 +libgladeui-1-dev +libgmm-dev +libgo0 +libgo0-dbg +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev +libgtkhtml-editor-common +libgtkhtml-editor-dev +libgtkhtml-editor0 +libgtkhtml3.14-19 +libgtkhtml3.14-dbg +libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev +libklu1.1.0 +libldl2.0.1 +libllvm-2.8-ocaml-dev +libllvm-2.9-ocaml-dev +libllvm2.8 +libllvm2.9 +liblpsolve55-dev +libmodplug-dev +libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil +libmozjs185-1.0 +libmozjs185-dev +libmusicbrainz4-dev +libmysql-java +libnotify-cil-dev +libnotify0.4-cil +libofa0 +libofa0-dev +libpg-java +libpod-plainer-perl +libqt4-declarative-shaders +librcps-dev +librcps0 +libreadline-java +libreadline-java-doc +libsac-java +libsac-java-doc +libsac-java-gcj +libsublime-dev +libsuitesparse-dbg +libsuitesparse-dev +libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil +libtextcat-data +libtextcat-dev +libtextcat0 +libts-0.0-0 +libts-0.0-0-dbg +libts-bin +libts-dev +libumfpack5.4.0 +libvala-0.12-0 +libvala-0.12-0-dbg +libxine-dev +libxine1 +libxine1-bin +libxine1-console +libxine1-dbg +libxine1-doc +libxine1-ffmpeg +libxine1-gnome +libxine1-misc-plugins +libxine1-x +linux-wlan-ng +linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime +llvm-2.9 +llvm-2.9-dev +llvm-2.9-doc +llvm-2.9-examples +llvm-2.9-runtime +lp-solve +lp-solve-doc +mono-jay +mono-xsp2 +mono-xsp2-base +myspell-tools +nova-ajax-console-proxy +oxygen-icon-theme-complete +pngquant +python-aptdaemon.gtkwidgets +python-bittorrent +python-central +python-desktopcouch +python-desktopcouch-application +python-desktopcouch-records +python-desktopcouch-recordtypes +python-fontforge +python-gamin +python-indicate +python-smartpm +python-support +python-telepathy +python-xklavier +qt3-designer +squid +squid-common +swift +tomboy +tomcat6-user +tsconf +ttf-lao +ttf-sil-padauk +ttf-unfonts-extra +unionfs-fuse +vala-0.12-doc +valac-0.12 +valac-0.12-dbg +vinagre +x-ttcidfont-conf +xserver-xephyr +zeitgeist-extension-fts diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/ubuntu-amd64/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/ubuntu-amd64/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/ubuntu-amd64/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/ubuntu-amd64/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,7 @@ +[NonInteractive] +ProfileName = ubuntu-amd64 +BasePkg = ubuntu-desktop +AdditionalPkgs = pkgs.cfg + +[KVM] +Arch=amd64 diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/ubuntu-amd64/pkgs.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/ubuntu-amd64/pkgs.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/ubuntu-amd64/pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/ubuntu-amd64/pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1 @@ +grub-pc diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/universe-amd64/demoted.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/universe-amd64/demoted.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/universe-amd64/demoted.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/universe-amd64/demoted.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,245 @@ +# demoted packages from oneiric to precise +ajaxterm +asp.net-examples +at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu +cantor +cantor-dbg +cobbler-enlist +couchdb-bin +dcraw +defoma +defoma-doc +desktopcouch +desktopcouch-tools +desktopcouch-ubuntuone +ecosconfig-imx +evolution-couchdb +evolution-couchdb-backend +exiv2 +fortunes-ubuntu-server +g++-4.5-multilib +gamin +gbrainy +gcc-4.4-source +gcc-4.5-multilib +gir1.2-couchdb-1.0 +gir1.2-desktopcouch-1.0 +gnome-desktop-data +gnome-search-tool +jsvc +jython +jython-doc +kaffeine +kaffeine-dbg +kdevelop +kdevelop-data +kdevelop-dev +kdevplatform-dbg +kdevplatform-dev +kdewallpapers +koffice-l10n-ca +koffice-l10n-cavalencia +koffice-l10n-da +koffice-l10n-de +koffice-l10n-el +koffice-l10n-engb +koffice-l10n-es +koffice-l10n-et +koffice-l10n-fr +koffice-l10n-gl +koffice-l10n-hu +koffice-l10n-it +koffice-l10n-ja +koffice-l10n-kk +koffice-l10n-nb +koffice-l10n-nds +koffice-l10n-nl +koffice-l10n-pl +koffice-l10n-pt +koffice-l10n-ptbr +koffice-l10n-ru +koffice-l10n-sv +koffice-l10n-tr +koffice-l10n-uk +koffice-l10n-wa +koffice-l10n-zhcn +koffice-l10n-zhtw +lib32go0 +lib32go0-dbg +lib64go0 +lib64go0-dbg +libaccess-bridge-java +libaccess-bridge-java-jni +libamd2.2.0 +libatspi-dbg +libatspi-dev +libatspi1.0-0 +libbtf1.1.0 +libcamd2.2.0 +libccolamd2.7.1 +libcholmod1.7.1 +libcolamd2.7.1 +libcommons-daemon-java +libcouchdb-glib-1.0-2 +libcouchdb-glib-dev +libcouchdb-glib-doc +libcsparse2.2.3 +libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev +libdesktopcouch-glib-1.0-2 +libdesktopcouch-glib-dev +libdirectfb-1.2-9 +libdirectfb-1.2-9-dbg +libdirectfb-bin +libdirectfb-bin-dbg +libdirectfb-dev +libdirectfb-extra +libdirectfb-extra-dbg +libgamin-dev +libgamin0 +libgdata-cil-dev +libgdict-1.0-6 +libgdict-1.0-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil +libglademm-2.4-1c2a +libglademm-2.4-dbg +libglademm-2.4-dev +libglademm-2.4-doc +libgladeui-1-11 +libgladeui-1-dev +libgmm-dev +libgo0 +libgo0-dbg +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev +libgtkhtml-editor-common +libgtkhtml-editor-dev +libgtkhtml-editor0 +libgtkhtml3.14-19 +libgtkhtml3.14-dbg +libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev +libklu1.1.0 +libldl2.0.1 +libllvm-2.8-ocaml-dev +libllvm-2.9-ocaml-dev +libllvm2.8 +libllvm2.9 +liblpsolve55-dev +libmodplug-dev +libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil +libmozjs185-1.0 +libmozjs185-dev +libmusicbrainz4-dev +libmysql-java +libnotify-cil-dev +libnotify0.4-cil +libofa0 +libofa0-dev +libpg-java +libpod-plainer-perl +libqt4-declarative-shaders +librcps-dev +librcps0 +libreadline-java +libreadline-java-doc +libsac-java +libsac-java-doc +libsac-java-gcj +libsublime-dev +libsuitesparse-dbg +libsuitesparse-dev +libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil +libtextcat-data +libtextcat-dev +libtextcat0 +libts-0.0-0 +libts-0.0-0-dbg +libts-bin +libts-dev +libumfpack5.4.0 +libvala-0.12-0 +libvala-0.12-0-dbg +libxine-dev +libxine1 +libxine1-bin +libxine1-console +libxine1-dbg +libxine1-doc +libxine1-ffmpeg +libxine1-gnome +libxine1-misc-plugins +libxine1-x +linux-wlan-ng +linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime +llvm-2.9 +llvm-2.9-dev +llvm-2.9-doc +llvm-2.9-examples +llvm-2.9-runtime +lp-solve +lp-solve-doc +mono-jay +mono-xsp2 +mono-xsp2-base +myspell-tools +nova-ajax-console-proxy +oxygen-icon-theme-complete +pngquant +python-aptdaemon.gtkwidgets +python-bittorrent +python-central +python-desktopcouch +python-desktopcouch-application +python-desktopcouch-records +python-desktopcouch-recordtypes +python-fontforge +python-gamin +python-indicate +python-smartpm +python-support +python-telepathy +python-xklavier +qt3-designer +squid +squid-common +swift +tomboy +tomcat6-user +tsconf +ttf-lao +ttf-sil-padauk +ttf-unfonts-extra +unionfs-fuse +vala-0.12-doc +valac-0.12 +valac-0.12-dbg +vinagre +x-ttcidfont-conf +xserver-xephyr +zeitgeist-extension-fts diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/universe-amd64/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/universe-amd64/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/universe-amd64/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/universe-amd64/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,9 @@ +[NonInteractive] +ProfileName = universe-amd64 +AdditionalPkgs = pkgs.cfg +Components=main,restricted,universe +PostBootstrapScript=/home/upgrade-tester/update-manager/AutoUpgradeTester/install_universe + +[KVM] +arch = amd64 +VirtualRam = 3072 diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/universe-amd64/install_blacklist.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/universe-amd64/install_blacklist.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/universe-amd64/install_blacklist.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/universe-amd64/install_blacklist.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,34 @@ +# jaunty: endless loop with DEBIAN_FRONTEND=noninteractive +moodle +# has a funny "can not be upgraded automatically" policy +# see debian #368226 +quagga +# not installable on a regular machine (preinst error) +ltsp-client +# gwenview-i18n has some file conflicts +gwenview-i18n +# ipppd needs MAKEDEV +ipppd +# cmake has incorrect emacs dependencies +cmake +# cluster manager hangs on shutdown +cman + +# Conflicts/uninstallable packages in Oneiric +libgladeui-doc +mythes-it +amavisd-new +grub-legacy-ec2 + +# LP:#901638 +tdsodbc + +# Only useful on livecd +casper +ubiquity + +# Breaks apache +lwat + +# Broken on collectd +kcollectd diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/universe-amd64/pkgs.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/universe-amd64/pkgs.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/universe-amd64/pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/universe-amd64/pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,3 @@ +grub-pc +python-apt +app-install-data diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/universe-i386/demoted.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/universe-i386/demoted.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/universe-i386/demoted.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/universe-i386/demoted.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,245 @@ +# demoted packages from oneiric to precise +ajaxterm +asp.net-examples +at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu +cantor +cantor-dbg +cobbler-enlist +couchdb-bin +dcraw +defoma +defoma-doc +desktopcouch +desktopcouch-tools +desktopcouch-ubuntuone +ecosconfig-imx +evolution-couchdb +evolution-couchdb-backend +exiv2 +fortunes-ubuntu-server +g++-4.5-multilib +gamin +gbrainy +gcc-4.4-source +gcc-4.5-multilib +gir1.2-couchdb-1.0 +gir1.2-desktopcouch-1.0 +gnome-desktop-data +gnome-search-tool +jsvc +jython +jython-doc +kaffeine +kaffeine-dbg +kdevelop +kdevelop-data +kdevelop-dev +kdevplatform-dbg +kdevplatform-dev +kdewallpapers +koffice-l10n-ca +koffice-l10n-cavalencia +koffice-l10n-da +koffice-l10n-de +koffice-l10n-el +koffice-l10n-engb +koffice-l10n-es +koffice-l10n-et +koffice-l10n-fr +koffice-l10n-gl +koffice-l10n-hu +koffice-l10n-it +koffice-l10n-ja +koffice-l10n-kk +koffice-l10n-nb +koffice-l10n-nds +koffice-l10n-nl +koffice-l10n-pl +koffice-l10n-pt +koffice-l10n-ptbr +koffice-l10n-ru +koffice-l10n-sv +koffice-l10n-tr +koffice-l10n-uk +koffice-l10n-wa +koffice-l10n-zhcn +koffice-l10n-zhtw +lib32go0 +lib32go0-dbg +lib64go0 +lib64go0-dbg +libaccess-bridge-java +libaccess-bridge-java-jni +libamd2.2.0 +libatspi-dbg +libatspi-dev +libatspi1.0-0 +libbtf1.1.0 +libcamd2.2.0 +libccolamd2.7.1 +libcholmod1.7.1 +libcolamd2.7.1 +libcommons-daemon-java +libcouchdb-glib-1.0-2 +libcouchdb-glib-dev +libcouchdb-glib-doc +libcsparse2.2.3 +libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev +libdesktopcouch-glib-1.0-2 +libdesktopcouch-glib-dev +libdirectfb-1.2-9 +libdirectfb-1.2-9-dbg +libdirectfb-bin +libdirectfb-bin-dbg +libdirectfb-dev +libdirectfb-extra +libdirectfb-extra-dbg +libgamin-dev +libgamin0 +libgdata-cil-dev +libgdict-1.0-6 +libgdict-1.0-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil +libglademm-2.4-1c2a +libglademm-2.4-dbg +libglademm-2.4-dev +libglademm-2.4-doc +libgladeui-1-11 +libgladeui-1-dev +libgmm-dev +libgo0 +libgo0-dbg +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev +libgtkhtml-editor-common +libgtkhtml-editor-dev +libgtkhtml-editor0 +libgtkhtml3.14-19 +libgtkhtml3.14-dbg +libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev +libklu1.1.0 +libldl2.0.1 +libllvm-2.8-ocaml-dev +libllvm-2.9-ocaml-dev +libllvm2.8 +libllvm2.9 +liblpsolve55-dev +libmodplug-dev +libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil +libmozjs185-1.0 +libmozjs185-dev +libmusicbrainz4-dev +libmysql-java +libnotify-cil-dev +libnotify0.4-cil +libofa0 +libofa0-dev +libpg-java +libpod-plainer-perl +libqt4-declarative-shaders +librcps-dev +librcps0 +libreadline-java +libreadline-java-doc +libsac-java +libsac-java-doc +libsac-java-gcj +libsublime-dev +libsuitesparse-dbg +libsuitesparse-dev +libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil +libtextcat-data +libtextcat-dev +libtextcat0 +libts-0.0-0 +libts-0.0-0-dbg +libts-bin +libts-dev +libumfpack5.4.0 +libvala-0.12-0 +libvala-0.12-0-dbg +libxine-dev +libxine1 +libxine1-bin +libxine1-console +libxine1-dbg +libxine1-doc +libxine1-ffmpeg +libxine1-gnome +libxine1-misc-plugins +libxine1-x +linux-wlan-ng +linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime +llvm-2.9 +llvm-2.9-dev +llvm-2.9-doc +llvm-2.9-examples +llvm-2.9-runtime +lp-solve +lp-solve-doc +mono-jay +mono-xsp2 +mono-xsp2-base +myspell-tools +nova-ajax-console-proxy +oxygen-icon-theme-complete +pngquant +python-aptdaemon.gtkwidgets +python-bittorrent +python-central +python-desktopcouch +python-desktopcouch-application +python-desktopcouch-records +python-desktopcouch-recordtypes +python-fontforge +python-gamin +python-indicate +python-smartpm +python-support +python-telepathy +python-xklavier +qt3-designer +squid +squid-common +swift +tomboy +tomcat6-user +tsconf +ttf-lao +ttf-sil-padauk +ttf-unfonts-extra +unionfs-fuse +vala-0.12-doc +valac-0.12 +valac-0.12-dbg +vinagre +x-ttcidfont-conf +xserver-xephyr +zeitgeist-extension-fts diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/universe-i386/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/universe-i386/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/universe-i386/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/universe-i386/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,8 @@ +[NonInteractive] +ProfileName = universe-i386 +AdditionalPkgs = pkgs.cfg +Components=main,restricted,universe +PostBootstrapScript=/home/upgrade-tester/update-manager/AutoUpgradeTester/install_universe + +[KVM] +VirtualRam = 3072 diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/universe-i386/install_blacklist.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/universe-i386/install_blacklist.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/universe-i386/install_blacklist.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/universe-i386/install_blacklist.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,34 @@ +# jaunty: endless loop with DEBIAN_FRONTEND=noninteractive +moodle +# has a funny "can not be upgraded automatically" policy +# see debian #368226 +quagga +# not installable on a regular machine (preinst error) +ltsp-client +# gwenview-i18n has some file conflicts +gwenview-i18n +# ipppd needs MAKEDEV +ipppd +# cmake has incorrect emacs dependencies +cmake +# cluster manager hangs on shutdown +cman + +# Conflicts/uninstallable packages in Oneiric +libgladeui-doc +mythes-it +amavisd-new +grub-legacy-ec2 + +# LP:#901638 +tdsodbc + +# Only useful on livecd +casper +ubiquity + +# Breaks apache +lwat + +# Broken on collectd +kcollectd diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/universe-i386/pkgs.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/universe-i386/pkgs.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/universe-i386/pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/universe-i386/pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,3 @@ +grub-pc +python-apt +app-install-data diff -Nru update-manager-17.10.11/AutoUpgradeTester/profile/xubuntu/DistUpgrade.cfg update-manager-0.156.14.15/AutoUpgradeTester/profile/xubuntu/DistUpgrade.cfg --- update-manager-17.10.11/AutoUpgradeTester/profile/xubuntu/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/profile/xubuntu/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,4 @@ +[NonInteractive] +ProfileName = xubuntu +BasePkg = xubuntu-desktop +Components=main,restricted,universe diff -Nru update-manager-17.10.11/AutoUpgradeTester/randomInst.py update-manager-0.156.14.15/AutoUpgradeTester/randomInst.py --- update-manager-17.10.11/AutoUpgradeTester/randomInst.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/randomInst.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,21 @@ +#!/usr/bin/python + +import sys +import apt +from random import choice + +cache = apt.Cache() +for i in range(int(sys.argv[1])): + while True: + pkgname = choice(cache.keys()) + if cache[pkgname].is_installed: + continue + try: + print "Trying to install: '%s'" % pkgname + cache[pkgname].mark_install() + except SystemError, e: + print "Failed to install '%s' (%s)" % (pkgname,e) + continue + break +cache.commit(apt.progress.text.AcquireProgress(), + apt.progess.base.InstallProgress()) diff -Nru update-manager-17.10.11/AutoUpgradeTester/README update-manager-0.156.14.15/AutoUpgradeTester/README --- update-manager-17.10.11/AutoUpgradeTester/README 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/README 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,8 @@ + + +This code will test a release upgrade. + +If its started and there is a dir/symlink called "DistUpgrade" this +code will be used for the upgrade (useful for testing the bzr +development version of the upgrader code). Otherwise the latest +released version of the archive is used via "do-release-upgrade". \ No newline at end of file diff -Nru update-manager-17.10.11/AutoUpgradeTester/run_and_publish_tests.sh update-manager-0.156.14.15/AutoUpgradeTester/run_and_publish_tests.sh --- update-manager-17.10.11/AutoUpgradeTester/run_and_publish_tests.sh 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/run_and_publish_tests.sh 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,92 @@ +#!/bin/sh + +# -------------------------------------------------------------- config +# link to the ssh key to publish the results +SSHKEY="-oIdentityFile=link-to-ssh-key" +PUBLISH="mvo@people.ubuntu.com" +#PUBLISH="" + +RESULTDIR=/var/cache/auto-upgrade-tester/result/ + +# output +DATE=$(date +"%F-%T") +HTML_BASEDIR=~/public_html/automatic-upgrade-testing +HTMLDIR=$HTML_BASEDIR/$DATE + +PROFILES="server server-tasks ubuntu kubuntu main-all" +#PROFILES="lts-server server" +#PROFILES="server" + +UPGRADE_TESTER_ARGS="--quiet --html-output-dir $HTMLDIR" +#UPGRADE_TESTER_ARGS="$UPGRADE_TESTER_ARGS -b UpgradeTestBackendSimulate " +#UPGRADE_TESTER_ARGS="$UPGRADE_TESTER_ARGS --tests-only" + +upload_files() { + profile=$1 + SSHKEY=$2 + PUBLISH=$3 + DATE=$4 + cat > sftp-upload </dev/null +} + +upload_index_html() { + SSHKEY=$1 + PUBLISH=$2 + DATE=$3 + # upload index + cat > sftp-upload </dev/null +} + +update_current_symlink() { + SSHKEY=$1 + PUBLISH=$2 + cat > sftp-upload </dev/null +} + +# ------------------------------------------------------------- main() + +bzr up + +FAIL="" + +PROFILES_ARG="" +for p in $PROFILES; do + # clear log dir first + rm -f $RESULTDIR/$p/* + # do it + PROFILES_ARG=" $PROFILES_ARG profile/$p" +done + +# run with the profiles we have +./auto-upgrade-tester $UPGRADE_TESTER_ARGS $PROFILES_ARG + +# update current symlink +rm -f $HTML_BASEDIR/current +ln -s $DATE $HTML_BASEDIR/current + +# FIXME: portme +#upload_index_html $SSHKEY $PUBLISH $DATE +#update_current_symlink $SSHKEY $PUBLISH + diff -Nru update-manager-17.10.11/AutoUpgradeTester/toChroot/etc/hosts update-manager-0.156.14.15/AutoUpgradeTester/toChroot/etc/hosts --- update-manager-17.10.11/AutoUpgradeTester/toChroot/etc/hosts 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/toChroot/etc/hosts 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,2 @@ +127.0.0.1 localhost.localdomain localhost + diff -Nru update-manager-17.10.11/AutoUpgradeTester/toChroot/etc/kernel-img.conf update-manager-0.156.14.15/AutoUpgradeTester/toChroot/etc/kernel-img.conf --- update-manager-17.10.11/AutoUpgradeTester/toChroot/etc/kernel-img.conf 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/toChroot/etc/kernel-img.conf 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,6 @@ +do_symlinks = yes +relative_links = yes +do_bootloader = no +do_bootfloppy = no +do_initrd = yes +link_in_boot = yes diff -Nru update-manager-17.10.11/AutoUpgradeTester/UpgradeTestBackendChroot.py update-manager-0.156.14.15/AutoUpgradeTester/UpgradeTestBackendChroot.py --- update-manager-17.10.11/AutoUpgradeTester/UpgradeTestBackendChroot.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/UpgradeTestBackendChroot.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,338 @@ + +import sys +import os +import warnings +warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning) + +from UpgradeTestBackend import UpgradeTestBackend + +import tempfile +import subprocess +import shutil +import glob +import ConfigParser + +class UpgradeTestBackendChroot(UpgradeTestBackend): + + diverts = ["/usr/sbin/mkinitrd", + "/sbin/modprobe", + "/usr/sbin/invoke-rc.d", + # install-info has a locking problem quite often + "/usr/sbin/install-info", + "/sbin/start-stop-daemon"] + + def __init__(self, profile): + UpgradeTestBackend.__init__(self, profile) + self.tarball = None + + def _umount(self, chrootdir): + umount_list = [] + for line in open("/proc/mounts"): + (dev, mnt, fs, options, d, p) = line.split() + if mnt.startswith(chrootdir): + umount_list.append(mnt) + # now sort and umount by reverse length (to ensure + # we umount /sys/fs/binfmt_misc before /sys) + umount_list.sort(key=len) + umount_list.reverse() + # do the list + for mpoint in umount_list: + print "Umount '%s'" % mpoint + os.system("umount %s" % mpoint) + + + def login(self): + d = self._unpackToTmpdir(self.tarball) + print "logging into: '%s'" % d + self._runInChroot(d, ["/bin/sh"]) + print "Cleaning up" + if d: + shutil.rmtree(d) + + def _runInChroot(self, chrootdir, command, cmd_options=[]): + print "runing: ",command + print "in: ", chrootdir + pid = os.fork() + if pid == 0: + os.chroot(chrootdir) + os.chdir("/") + os.system("mount -t devpts devpts /dev/pts") + os.system("mount -t sysfs sysfs /sys") + os.system("mount -t proc proc /proc") + os.system("mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc") + env = os.environ + env["DEBIAN_FRONTEND"] = "noninteractive" + os.execve(command[0], command, env) + else: + print "Parent: waiting for %s" % pid + (id, exitstatus) = os.waitpid(pid, 0) + self._umount(chrootdir) + return exitstatus + + def _runApt(self, tmpdir, command, cmd_options=[]): + ret = self._runInChroot(tmpdir, + ["/usr/bin/apt-get", command]+self.apt_options+cmd_options) + return ret + + + def installPackages(self, pkgs): + print "installPackages: ", pkgs + if not pkgs: + return True + res = self._runApt(self.tmpdir, "install", pkgs) + return res == 0 + + def _tryRandomPkgInstall(self, amount): + " install 'amount' packages randomly " + self._runApt(self.tmpdir,"install",["python2.4-apt", "python-apt"]) + shutil.copy("%s/randomInst.py",self.tmpdir+"/tmp") + ret = subprocess.call(["chroot",self.tmpdir,"/tmp/randomInst.py","%s" % amount]) + print ret + + def _cacheDebs(self, tmpdir): + # see if the debs should be cached + if self.cachedir: + print "Caching debs" + for f in glob.glob(tmpdir+"/var/cache/apt/archives/*.deb"): + if not os.path.exists(self.cachedir+"/"+os.path.basename(f)): + try: + shutil.copy(f,self.cachedir) + except IOError, e: + print "Can't copy '%s' (%s)" % (f,e) + + def _getTmpDir(self): + tmpdir = self.config.getWithDefault("CHROOT","Tempdir",None) + if tmpdir is None: + tmpdir = tempfile.mkdtemp() + else: + if os.path.exists(tmpdir): + self._umount(tmpdir) + shutil.rmtree(tmpdir) + os.makedirs(tmpdir) + return tmpdir + + def bootstrap(self,outfile=None): + " bootstaps a pristine fromDist tarball" + if not outfile: + outfile = os.path.dirname(self.profile) + "/dist-upgrade-%s.tar.gz" % self.fromDist + outfile = os.path.abspath(outfile) + self.tarball = outfile + + # don't bootstrap twice if this is something we can cache + try: + if (self.config.getboolean("CHROOT","CacheTarball") and + os.path.exists(self.tarball) ): + self.tmpdir = self._unpackToTmpdir(self.tarball) + if not self.tmpdir: + print "Error extracting tarball" + return False + return True + except ConfigParser.NoOptionError: + pass + + # bootstrap! + self.tmpdir = tmpdir = self._getTmpDir() + print "tmpdir is %s" % tmpdir + + print "bootstraping to %s" % outfile + ret = subprocess.call(["debootstrap", self.fromDist, tmpdir, self.config.get("NonInteractive","Mirror")]) + print "debootstrap returned: %s" % ret + if ret != 0: + return False + + print "diverting" + self._dpkgDivert(tmpdir) + + # create some minimal device node + print "Creating some devices" + os.system("(cd %s/dev ; echo $PWD; ./MAKEDEV null)" % tmpdir) + #self._runInChroot(tmpdir, ["/bin/mknod","/dev/null","c","1","3"]) + + # set a hostname + shutil.copy("/etc/hostname","%s/etc/hostanme" % tmpdir) + + # copy the stuff from toChroot/ + if os.path.exists("./toChroot/"): + os.chdir("toChroot/") + for (dirpath, dirnames, filenames) in os.walk("."): + for name in filenames: + if not os.path.exists(os.path.join(tmpdir,dirpath,name)): + shutil.copy(os.path.join(dirpath,name), os.path.join(tmpdir,dirpath,name)) + os.chdir("..") + + # write new sources.list + if (self.config.has_option("NonInteractive","Components") and + self.config.has_option("NonInteractive","Pockets")): + sourcelist=self.getSourcesListFile() + shutil.copy(sourcelist.name, tmpdir+"/etc/apt/sources.list") + print open(tmpdir+"/etc/apt/sources.list","r").read() + + # move the cache debs + self._populateWithCachedDebs(tmpdir) + + print "Updating the chroot" + ret = self._runApt(tmpdir,"update") + print "apt update returned %s" % ret + if ret != 0: + return False + # run it three times to work around network issues + for i in range(3): + ret = self._runApt(tmpdir,"dist-upgrade") + print "apt dist-upgrade returned %s" % ret + if ret != 0: + return False + + print "installing basepkg" + ret = self._runApt(tmpdir,"install", [self.config.get("NonInteractive","BasePkg")]) + print "apt returned %s" % ret + if ret != 0: + return False + + CMAX = 4000 + pkgs = self.config.getListFromFile("NonInteractive","AdditionalPkgs") + while(len(pkgs)) > 0: + print "installing additonal: %s" % pkgs[:CMAX] + ret= self._runApt(tmpdir,"install",pkgs[:CMAX]) + print "apt(2) returned: %s" % ret + if ret != 0: + self._cacheDebs(tmpdir) + return False + pkgs = pkgs[CMAX+1:] + + if self.config.has_option("NonInteractive","PostBootstrapScript"): + script = self.config.get("NonInteractive","PostBootstrapScript") + if os.path.exists(script): + shutil.copy(script, os.path.join(tmpdir,"tmp")) + self._runInChroot(tmpdir,[os.path.join("/tmp",script)]) + else: + print "WARNING: %s not found" % script + + try: + amount = self.config.get("NonInteractive","RandomPkgInstall") + self._tryRandomPkgInstall(amount) + except ConfigParser.NoOptionError: + pass + + print "Caching debs" + self._cacheDebs(tmpdir) + + print "Cleaning chroot" + ret = self._runApt(tmpdir,"clean") + if ret != 0: + return False + + print "building tarball: '%s'" % outfile + os.chdir(tmpdir) + ret = subprocess.call(["tar","czf",outfile,"."]) + print "tar returned %s" % ret + + return True + + def _populateWithCachedDebs(self, tmpdir): + # now populate with hardlinks for the debs + if self.cachedir: + print "Linking cached debs into chroot" + for f in glob.glob(self.cachedir+"/*.deb"): + try: + os.link(f, tmpdir+"/var/cache/apt/archives/%s" % os.path.basename(f)) + except OSError, e: + print "Can't link: %s (%s)" % (f,e) + return True + + def upgrade(self, tarball=None): + if not tarball: + tarball = self.tarball + assert(tarball != None) + print "runing upgrade on: %s" % tarball + tmpdir = self.tmpdir + #self._runApt(tmpdir, "install",["apache2"]) + + self._populateWithCachedDebs(tmpdir) + + # copy itself to the chroot (resolve symlinks) + targettmpdir = os.path.join(tmpdir,"tmp","dist-upgrade") + if not os.path.exists(targettmpdir): + os.makedirs(targettmpdir) + for f in glob.glob("%s/*" % self.upgradefilesdir): + if not os.path.isdir(f): + shutil.copy(f, targettmpdir) + + # copy the profile + if os.path.exists(self.profile): + print "Copying '%s' to '%s' " % (self.profile,targettmpdir) + shutil.copy(self.profile, targettmpdir) + # copy the .cfg and .list stuff from there too + for f in glob.glob("%s/*.cfg" % (os.path.dirname(self.profile))): + shutil.copy(f, targettmpdir) + for f in glob.glob("%s/*.list" % (os.path.dirname(self.profile))): + shutil.copy(f, targettmpdir) + + # run it + pid = os.fork() + if pid == 0: + os.chroot(tmpdir) + os.chdir("/tmp/dist-upgrade") + os.system("mount -t devpts devpts /dev/pts") + os.system("mount -t sysfs sysfs /sys") + os.system("mount -t proc proc /proc") + os.system("mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc") + if os.path.exists("/tmp/dist-upgrade/dist-upgrade.py"): + os.execl("/tmp/dist-upgrade/dist-upgrade.py", + "/tmp/dist-upgrade/dist-upgrade.py") + else: + os.execl("/usr/bin/do-release-upgrade", + "/usr/bin/do-release-upgrade","-d", + "-f","DistUpgradeViewNonInteractive") + else: + print "Parent: waiting for %s" % pid + (id, exitstatus) = os.waitpid(pid, 0) + print "Child exited (%s, %s): %s" % (id, exitstatus, os.WEXITSTATUS(exitstatus)) + # copy the result + for f in glob.glob(tmpdir+"/var/log/dist-upgrade/*"): + print "copying result to: ", self.resultdir + shutil.copy(f, self.resultdir) + # cache debs and cleanup + self._cacheDebs(tmpdir) + self._umount(tmpdir) + shutil.rmtree(tmpdir) + return (exitstatus == 0) + + def _unpackToTmpdir(self, baseTarBall): + # unpack the tarball + self.tmpdir = tmpdir = self._getTmpDir() + os.chdir(tmpdir) + ret = subprocess.call(["tar","xzf",baseTarBall]) + if ret != 0: + return None + return tmpdir + + def _dpkgDivert(self, tmpdir): + for d in self.diverts: + cmd = ["chroot",tmpdir, + "dpkg-divert","--add","--local", + "--divert",d+".thereal", + "--rename",d] + ret = subprocess.call(cmd) + if ret != 0: + print "dpkg-divert returned: %s" % ret + shutil.copy(tmpdir+"/bin/true",tmpdir+d) + + def test(self): + # FIXME: add some sanity testing here + return True + +if __name__ == "__main__": + if len(sys.argv) > 1: + profilename = sys.argv[1] + else: + profilename = "default" + chroot = UpgradeTestBackendChroot(profilename) + tarball = "%s/tarball/dist-upgrade-%s.tar.gz" % (os.getcwd(),profilename) + if not os.path.exists(tarball): + print "No existing tarball found, creating a new one" + chroot.bootstrap(tarball) + chroot.upgrade(tarball) + + #tmpdir = chroot._unpackToTmpdir(tarball) + #chroot._dpkgDivert(tmpdir) + #print tmpdir diff -Nru update-manager-17.10.11/AutoUpgradeTester/UpgradeTestBackendEC2.py update-manager-0.156.14.15/AutoUpgradeTester/UpgradeTestBackendEC2.py --- update-manager-17.10.11/AutoUpgradeTester/UpgradeTestBackendEC2.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/UpgradeTestBackendEC2.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,329 @@ +# ec2 backend + +from UpgradeTestBackendSSH import UpgradeTestBackendSSH +from UpgradeTestBackend import UpgradeTestBackend + +from DistUpgrade.sourceslist import SourcesList + +from boto.ec2.connection import EC2Connection + +import ConfigParser +import os +import sys +import os.path +import glob +import time +import atexit +import apt_pkg + + +# images created with EC2 +class NoCredentialsFoundException(Exception): + pass + +class OptionError(Exception): + pass + + +# Step to perform for a ec2 upgrade test +# +# 1. conn = EC2Connect() +# 2. reservation = conn.run_instances(image_id = image, security_groups = groups, key_name = key) +# 3. wait for instance.state == 'running': +# instance.update() +# 4. ssh -i root@instance.dns_name + + +# TODO +# +# Using ebs (elastic block storage) and snapshots for the test +# 1. ec2-create-volume -s 80 -z us-east-1a +# (check with ec2-describe-instance that its actually in +# the right zone) +# 2. ec2-attach-volume vol-7bd23de2 -i i-3325ad4 -d /dev/sdh +# (do not name it anything but sd*) +# 3. mount/use the thing inside the instance +# +# +# Other useful things: +# - sda1: root fs +# - sda2: free space (~140G) +# - sda3: swapspace (~1G) + +class UpgradeTestBackendEC2(UpgradeTestBackendSSH): + " EC2 backend " + + def __init__(self, profile): + UpgradeTestBackend.__init__(self, profile) + self.profiledir = os.path.abspath(os.path.dirname(profile)) + # ami base name (e.g .ami-44bb5c2d) + self.ec2ami = self.config.get("EC2","AMI") + self.ssh_key = self.config.get("EC2","SSHKey") + try: + self.access_key_id = (os.getenv("AWS_ACCESS_KEY_ID") or + self.config.get("EC2","access_key_id")) + self.secret_access_key = (os.getenv("AWS_SECRET_ACCESS_KEY") or + self.config.get("EC2","secret_access_key")) + except ConfigParser.NoOptionError: + print "Either export AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY or" + print "set access_key_id and secret_access_key in the profile config" + print "file." + sys.exit(1) + self._conn = EC2Connection(self.access_key_id, self.secret_access_key) + self.ubuntu_official_ami = False + if self.config.has_option("EC2","UbuntuOfficialAMI"): + self.ubuntu_official_ami = self.config.getboolean("EC2","UbuntuOfficialAMI") + + try: + self.security_groups = self.config.getlist("EC2","SecurityGroups") + except ConfigParser.NoOptionError: + self.security_groups = [] + + if self.ssh_key.startswith("./"): + self.ssh_key = self.profiledir + self.ssh_key[1:] + self.ssh_port = "22" + self.instance = None + + # the public name of the instance, e.g. + # ec2-174-129-152-83.compute-1.amazonaws.com + self.ssh_hostname = "" + # the instance name (e.g. i-3325ad4) + self.ec2instance = "" + if (self.config.has_option("NonInteractive","RealReboot") and + self.config.getboolean("NonInteractive","RealReboot")): + raise OptionError, "NonInteractive/RealReboot option must be set to False for the ec2 upgrader" + atexit.register(self._cleanup) + + def _cleanup(self): + print "_cleanup(): stopping running instance" + if self.instance: + self.instance.stop() + + def _enableRootLogin(self): + command = ["sudo", + "sed", "-i", "-e", "'s,\(.*\)\(ssh-rsa.*\),\\2,'", + "/root/.ssh/authorized_keys"] + ret = self._runInImageAsUser("ubuntu", command) + return (ret == 0) + + def bootstrap(self, force=False): + print "bootstrap()" + + print "Building new image based on '%s'" % self.ec2ami + + # get common vars + basepkg = self.config.get("NonInteractive","BasePkg") + + # start the VM + self.start_instance() + + # prepare the sources.list (needed because a AMI may have any + # sources.list) + sources = self.getSourcesListFile() + ret = self._copyToImage(sources.name, "/etc/apt/sources.list") + assert(ret == 0) + + # install some useful stuff + ret = self._runInImage(["apt-get","update"]) + assert(ret == 0) + # FIXME: instead of this retrying (for network errors with + # proxies) we should have a self._runAptInImage() + for i in range(3): + ret = self._runInImage(["DEBIAN_FRONTEND=noninteractive","apt-get","install", "--allow-unauthenticated", "-y",basepkg]) + assert(ret == 0) + + CMAX = 4000 + pkgs = self.config.getListFromFile("NonInteractive","AdditionalPkgs") + while(len(pkgs)) > 0: + print "installing additonal: %s" % pkgs[:CMAX] + ret= self._runInImage(["DEBIAN_FRONTEND=noninteractive","apt-get","install","--reinstall", "--allow-unauthenticated", "-y"]+pkgs[:CMAX]) + print "apt(2) returned: %s" % ret + if ret != 0: + #self._cacheDebs(tmpdir) + print "apt returned a error, stopping" + self.stop_instance() + return False + pkgs = pkgs[CMAX+1:] + + if self.config.has_option("NonInteractive","PostBootstrapScript"): + script = self.config.get("NonInteractive","PostBootstrapScript") + print "have PostBootstrapScript: %s" % script + if os.path.exists(script): + self._runInImage(["mkdir","/upgrade-tester"]) + self._copyToImage(script, "/upgrade-tester") + print "running script: %s" % os.path.join("/tmp",script) + self._runInImage([os.path.join("/upgrade-tester",script)]) + else: + print "WARNING: %s not found" % script + + if self.config.getWithDefault("NonInteractive", + "UpgradeFromDistOnBootstrap", False): + print "running apt-get upgrade in from dist (after bootstrap)" + for i in range(3): + ret = self._runInImage(["DEBIAN_FRONTEND=noninteractive","apt-get","--allow-unauthenticated", "-y","dist-upgrade"]) + assert(ret == 0) + + print "Cleaning image" + ret = self._runInImage(["apt-get","clean"]) + assert(ret == 0) + + # done with the bootstrap + + # FIXME: idealy we would reboot here, but its less important + # because we can't get a new kernel anyway in ec2 (yet) + # - the reboot thing is *not* yet reliable! + #self.reboot_instance() + + # FIXME: support for caching/snapshoting the base image here + + return True + + def start_instance(self): + print "Starting ec2 instance and wait until its availabe " + + # start the instance + reservation = self._conn.run_instances(image_id=self.ec2ami, + security_groups=self.security_groups, + key_name=self.ssh_key[:-4].split("/")[-1]) + self.instance = reservation.instances[0] + while self.instance.state == "pending": + print "Waiting for instance %s to come up..." % self.instance.id + time.sleep(10) + self.instance.update() + + print "It's up: hostname =", self.instance.dns_name + self.ssh_hostname = self.instance.dns_name + self.ec2instance = self.instance.id + + # now sping until ssh comes up in the instance + if self.ubuntu_official_ami: + user = "ubuntu" + else: + user = "root" + for i in range(900): + time.sleep(1) + if self.ping(user): + print "instance available via ssh ping" + break + else: + print "Could not connect to instance after 900s, exiting" + return False + # re-enable root login if needed + if self.ubuntu_official_ami: + print "Re-enabling root login... ", + ret = self._enableRootLogin() + if ret: + print "Done!" + else: + print "Oops, failed to enable root login..." + assert (ret == True) + # the official image seems to run a update on startup?!? + print "waiting for the official image to leave apt alone" + time.sleep(10) + return True + + def reboot_instance(self): + " reboot a ec2 instance and wait until its available again " + self.instance.reboot() + # FIMXE: find a better way to know when the instance is + # down - maybe with "-v" ? + time.sleep(5) + while True: + if self._runInImage(["/bin/true"]) == 0: + print "instance rebootet" + break + + def stop_instance(self): + " permanently stop a instance (it can never be started again " + # terminates are final - all data is lost + self.instance.stop() + # wait until its down + while True: + if self._runInImage(["/bin/true"]) != 0: + print "instance stopped" + break + + def upgrade(self): + print "upgrade()" + + # clean from any leftover pyc files + for f in glob.glob("%s/*.pyc" % self.upgradefilesdir): + os.unlink(f) + + print "Starting for upgrade" + + assert(self.ec2instance) + assert(self.ssh_hostname) + + # copy the profile + if os.path.exists(self.profile): + print "Copying '%s' to image overrides" % self.profile + self._runInImage(["mkdir","-p","/etc/update-manager/release-upgrades.d"]) + self._copyToImage(self.profile, "/etc/update-manager/release-upgrades.d/") + + # copy test repo sources.list (if needed) + test_repo = self.config.getWithDefault("NonInteractive","AddRepo","") + if test_repo: + test_repo = os.path.join(os.path.dirname(self.profile), test_repo) + self._copyToImage(test_repo, "/etc/apt/sources.list.d") + sourcelist = self.getSourcesListFile() + apt_pkg.Config.Set("Dir::Etc", os.path.dirname(sourcelist.name)) + apt_pkg.Config.Set("Dir::Etc::sourcelist", + os.path.basename(sourcelist.name)) + sources = SourcesList(matcherPath=".") + sources.load(test_repo) + # add the uri to the list of valid mirros in the image + for entry in sources.list: + if (not (entry.invalid or entry.disabled) and + entry.type == "deb"): + print "adding %s to mirrors" % entry.uri + self._runInImage(["echo '%s' >> /upgrade-tester/mirrors.cfg" % entry.uri]) + + # check if we have a bzr checkout dir to run against or + # if we should just run the normal upgrader + if (os.path.exists(self.upgradefilesdir) and + self.config.getWithDefault("NonInteractive", + "UseUpgraderFromBzr", + True)): + self._copyUpgraderFilesFromBzrCheckout() + ret = self._runBzrCheckoutUpgrade() + else: + ret = self._runInImage(["do-release-upgrade","-d", + "-f","DistUpgradeViewNonInteractive"]) + print "dist-upgrade.py returned: %i" % ret + + + # copy the result + print "coyping the result" + self._copyFromImage("/var/log/dist-upgrade/*",self.resultdir) + + # stop the machine + print "Shuting down the VM" + self.stop_instance() + + return True + + def test(self): + # FIXME: add some tests here to see if the upgrade worked + # this should include: + # - new kernel is runing (run uname -r in target) + # - did it sucessfully rebooted + # - is X runing + # - generate diff of upgrade vs fresh install + # ... + return True + + + # compatibility for the auto-install-tester + def start(self): + self.start_instance() + def stop(self): + self.stop_instance() + def saveVMSnapshot(self): + print "saveVMSnapshot not supported yet" + def restoreVMSnapshot(self): + print "restoreVMSnapshot not supported yet" + + +# vim:ts=4:sw=4:et + diff -Nru update-manager-17.10.11/AutoUpgradeTester/UpgradeTestBackend.py update-manager-0.156.14.15/AutoUpgradeTester/UpgradeTestBackend.py --- update-manager-17.10.11/AutoUpgradeTester/UpgradeTestBackend.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/UpgradeTestBackend.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,167 @@ +# TargetNonInteractive.py +# +# abstraction for non-interactive backends (like chroot, qemu) +# + +from DistUpgrade.DistUpgradeConfigParser import DistUpgradeConfig + +import ConfigParser +import os +import os.path +import tempfile +from shutil import rmtree + +# refactor the code so that we have +# UpgradeTest - the controler object +# UpgradeTestImage - abstraction for chroot/qemu/xen + +class UpgradeTestImage(object): + def runInTarget(self, command): + pass + def copyToImage(self, fromFile, toFile): + pass + def copyFromImage(self, fromFile, toFile): + pass + def bootstrap(self, force=False): + pass + def start(self): + pass + def stop(self): + pass + +class UpgradeTestBackend(object): + """ This is a abstrace interface that all backends (chroot, qemu) + should implement - very basic currently :) + """ + + apt_options = ["-y","--allow-unauthenticated"] + + def __init__(self, profiledir, resultdir=""): + " init the backend with the given profile " + # init the dirs + assert(profiledir != None) + profiledir = os.path.normpath(profiledir) + profile = os.path.join(os.path.abspath(profiledir), "DistUpgrade.cfg") + self.upgradefilesdir = "./DistUpgrade" + + if os.path.exists("./post_upgrade_tests/"): + self.post_upgrade_tests_dir = "./post_upgrade_tests/" + else: + self.post_upgrade_tests_dir = "/usr/share/auto-upgrade-tester/post_upgrade_tests/" + # init the rest + if os.path.exists(profile): + override_cfg_d = os.path.join(profiledir, "..", "override.cfg.d") + defaults_cfg_d = os.path.join(profiledir, "..", "defaults.cfg.d") + self.profile = os.path.abspath(profile) + self.config = DistUpgradeConfig(datadir=os.path.dirname(profile), + name=os.path.basename(profile), + override_dir=override_cfg_d, + defaults_dir=defaults_cfg_d) + else: + raise IOError, "Can't find profile '%s' (%s) " % (profile, os.getcwd()) + if resultdir: + base_resultdir = resultdir + else: + base_resultdir = self.config.getWithDefault( + "NonInteractive", "ResultDir", "results-upgrade-tester") + self.resultdir = os.path.abspath( + os.path.join(base_resultdir, profiledir.split("/")[-1])) + + # Cleanup result directory before new run + if os.path.exists(self.resultdir): + rmtree(self.resultdir) + os.makedirs(self.resultdir) + + self.fromDist = self.config.get("Sources","From") + if "http_proxy" in os.environ and not self.config.has_option("NonInteractive","Proxy"): + self.config.set("NonInteractive","Proxy", os.environ["http_proxy"]) + elif self.config.has_option("NonInteractive","Proxy"): + proxy=self.config.get("NonInteractive","Proxy") + os.putenv("http_proxy",proxy) + os.putenv("DEBIAN_FRONTEND","noninteractive") + self.cachedir = None + try: + self.cachedir = self.config.get("NonInteractive","CacheDebs") + except ConfigParser.NoOptionError: + pass + # init a sensible environment (to ensure proper operation if + # run from cron) + os.environ["PATH"] = "/usr/sbin:/usr/bin:/sbin:/bin" + + def installPackages(self, pkgs): + """ + install packages in the image + """ + pass + + def getSourcesListFile(self): + """ + creates a temporary sources.list file and returns it to + the caller + """ + # write new sources.list + sourceslist = tempfile.NamedTemporaryFile() + comps = self.config.getlist("NonInteractive","Components") + pockets = self.config.getlist("NonInteractive","Pockets") + mirror = self.config.get("NonInteractive","Mirror") + sourceslist.write("deb %s %s %s\n" % (mirror, self.fromDist, " ".join(comps))) + for pocket in pockets: + sourceslist.write("deb %s %s-%s %s\n" % (mirror, self.fromDist,pocket, " ".join(comps))) + sourceslist.flush() + return sourceslist + + def bootstrap(self): + " bootstaps a pristine install" + pass + + def upgrade(self): + " upgrade a given install " + pass + + def test(self): + " test if the upgrade was successful " + pass + + def resultsToJunitXML(self, results, outputfile = None): + """ + Filter results to get Junit XML output + + :param results: list of results. Each result is a dictionary of the form + name: name of the test + result: (pass, fail, error) + time: execution time of the test in seconds + message: optional message in case of failure or error + :param output: Output XML to this file instead of returning the value + """ + from xml.sax.saxutils import escape + + output = "" + testsuite_name = '' + res = [x['result'] for x in results] + fail_count = res.count('fail') + error_count = res.count('error') + total_count = len(res) + total_time = sum([x['time'] for x in results]) + + output = """\n""" % ( + error_count, fail_count, testsuite_name, total_count,total_time) + + for result in results: + output += """\n""" % ( + self.profilename + '.PostUpgradeTest', + result['name'][:-3], result['time']) + if 'fail' in result['result']: + output += """%s\n\n""" % ( + 'exception', escape(result['message'])) + elif 'error' in result['result']: + output += """%s\n\n""" % ( + 'exception', escape(result['message'])) + + output += "\n" + output += "\n" + + if outputfile: + with open(outputfile, 'w') as f: + f.write(output) + else: + return output diff -Nru update-manager-17.10.11/AutoUpgradeTester/UpgradeTestBackendQemu.py update-manager-0.156.14.15/AutoUpgradeTester/UpgradeTestBackendQemu.py --- update-manager-17.10.11/AutoUpgradeTester/UpgradeTestBackendQemu.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/UpgradeTestBackendQemu.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,585 @@ +# qemu backend + +from UpgradeTestBackendSSH import UpgradeTestBackendSSH +from DistUpgrade.sourceslist import SourcesList + +import ConfigParser +import subprocess +import os +import sys +import os.path +import shutil +import glob +import time +import tempfile +import atexit +import apt_pkg +import fcntl + +from DistUpgrade.utils import is_port_already_listening + +# images created with http://bazaar.launchpad.net/~mvo/ubuntu-jeos/mvo +# ./ubuntu-jeos-builder --vm kvm --kernel-flavor generic --suite feisty --ssh-key `pwd`/ssh-key.pub --components main,restricted --rootsize 20G +# + + +# TODO: +# - add support to boot certain images with certain parameters +# (dapper-386 needs qemu/kvm with "-no-acpi" to boot reliable) +# - add option to use pre-done base images +# the bootstrap() step is then a matter of installing the right +# packages into the image (via _runInImage()) +# +# - refactor and move common code to UpgradeTestBackend +# - convert ChrootNonInteractive +# - benchmark qemu/qemu+kqemu/kvm/chroot +# - write tests (unittest, doctest?) +# - offer "test-upgrade" feature on real system, run it +# as "qemu -hda /dev/hda -snapshot foo -append init=/upgrade-test" +# (this *should* write the stuff to the snapshot file +# - add "runInTarget()" that will write a marker file so that we can +# re-run a command if it fails the first time (or fails because +# a fsck was done and reboot needed in the VM etc) +# - start a X session with the gui-upgrader in a special +# "non-interactive" mode to see if the gui upgrade would work too + +class NoImageFoundException(Exception): + pass + +class PortInUseException(Exception): + pass +class NoPortsException(Exception): + pass + + +class UpgradeTestBackendQemu(UpgradeTestBackendSSH): + " qemu/kvm backend - need qemu >= 0.9.0" + + QEMU_DEFAULT_OPTIONS = [ + "-monitor","stdio", + "-localtime", + "-no-reboot", # exit on reboot + # "-no-kvm", # crashes sometimes with kvm HW + ] + + def __init__(self, profile): + UpgradeTestBackendSSH.__init__(self, profile) + self.qemu_options = self.QEMU_DEFAULT_OPTIONS[:] + self.qemu_pid = None + self.profiledir = profile + self.profile_override = os.path.join( + self.profiledir, "..", "override.cfg.d") + # get the kvm binary + self.qemu_binary = self.config.getWithDefault("KVM","KVM","kvm") + # setup mount dir/imagefile location + self.baseimage = self.config.get("KVM", "BaseImage") + if not os.path.exists(self.baseimage): + print "Missing '%s' base image, need to build it now" % self.baseimage + arch = self.config.getWithDefault("KVM", "Arch", "i386") + rootsize = self.config.getWithDefault("KVM", "RootSize", "80000") + destdir = "ubuntu-kvm-%s-%s" % (arch, self.fromDist) + ret = subprocess.call(["sudo", + "ubuntu-vm-builder","kvm", self.fromDist, + "--kernel-flavour", "generic", + "--ssh-key", "%s.pub" % self.ssh_key , + "--components", "main,restricted", + "--rootsize", rootsize, + "--addpkg", "openssh-server", + "--destdir", destdir, + "--arch", arch]) + # move the disk in place, ubuntu-vm-builder uses a random filename + shutil.move(glob.glob("%s/*.qcow2" % destdir)[0], + self.baseimage) + # remove old tree to ensure that subsequent runs work + shutil.rmtree(destdir) + if ret != 0: + raise NoImageFoundException + # check if we want virtio here and default to yes + try: + self.virtio = self.config.getboolean("KVM","Virtio") + except ConfigParser.NoOptionError: + self.virtio = True + if self.virtio: + self.qemu_options.extend(["-net","nic,model=virtio"]) + self.qemu_options.extend(["-net","user"]) + # swapimage + if self.config.getWithDefault("KVM","SwapImage",""): + self.qemu_options.append("-hdb") + self.qemu_options.append(self.config.get("KVM","SwapImage")) + # regular image + self.profilename = self.config.get("NonInteractive","ProfileName") + imagedir = self.config.get("KVM","ImageDir") + self.image = os.path.join(imagedir, "test-image.%s" % self.profilename) + # make ssh login possible (localhost 54321) available + ssh_port = int(self.config.getWithDefault("KVM","SshPort","54321")) + (self.ssh_lock, ssh_port) = self.getFreePort(port_base=ssh_port) + if not self.ssh_lock: + raise NoPortsException("Couldn't allocate SSH port.") + self.ssh_port = str(ssh_port) + print "using ssh port: %s" % self.ssh_port + self.ssh_hostname = "localhost" + self.qemu_options.append("-redir") + self.qemu_options.append("tcp:%s::22" % self.ssh_port) + # vnc port/display + VNC_BASE_PORT = 5900 + vncport = int(self.config.getWithDefault("KVM","VncNum", "0")) + VNC_BASE_PORT + (self.vnc_lock, vncport) = self.getFreePort(port_base=vncport) + if not self.vnc_lock: + raise NoPortsException("Couldn't allocate VNC port.") + print "using VncNum: %s" % vncport + self.qemu_options.append("-vnc") + self.qemu_options.append("localhost:%s" % str(vncport - VNC_BASE_PORT)) + + # make the memory configurable + mem = self.config.getWithDefault("KVM","VirtualRam","1536") + self.qemu_options.append("-m") + self.qemu_options.append(str(mem)) + + # check if the ssh port is in use + if subprocess.call("netstat -t -l -n |grep 0.0.0.0:%s" % self.ssh_port, + shell=True) == 0: + raise PortInUseException, "the port is already in use (another upgrade tester is running?)" + # register exit handler to ensure that we quit kvm on exit + atexit.register(self.stop) + + def __del__(self): + """ + Destructor + Clean-up lockfiles + """ + for lock in (self.ssh_lock, self.vnc_lock): + lockpath = lock.name + print "Releasing lock: %s" % lockpath + lock.close() + os.unlink(lockpath) + + def genDiff(self): + """ + generate a diff that compares a fresh install to a upgrade. + ideally that should be empty + Ensure that we always run this *after* the regular upgrade was + run (otherwise it is useless) + """ + # generate ls -R output of test-image ( + self.start() + self._runInImage(["find", "/bin", "/boot", "/etc/", "/home", + "/initrd", "/lib", "/root", "/sbin/", + "/srv", "/usr", "/var"], + stdout=open(self.resultdir+"/upgrade_install.files","w")) + self._runInImage(["dpkg","--get-selections"], + stdout=open(self.resultdir+"/upgrade_install.pkgs","w")) + self._runInImage(["tar","cvf","/tmp/etc-upgrade.tar","/etc"]) + self._copyFromImage("/tmp/etc-upgrade.tar", self.resultdir) + self.stop() + + # HACK: now build fresh toDist image - it would be best if + self.fromDist = self.config.get("Sources","To") + self.config.set("Sources","From", + self.config.get("Sources","To")) + diff_image = os.path.join(self.profiledir, "test-image.diff") + # FIXME: we need to regenerate the base image too, but there is no + # way to do this currently without running as root + # as a workaround we regenerate manually every now and then + # and use UpgradeFromDistOnBootstrap=true here + self.config.set("KVM","CacheBaseImage", "false") + self.config.set("NonInteractive","UpgradeFromDistOnBootstrap","true") + self.baseimage = "jeos/%s-i386.qcow2" % self.config.get("Sources","To") + self.image = diff_image + print "bootstraping into %s" % diff_image + self.bootstrap() + print "bootstrap finshsed" + self.start() + print "generating file diff list" + self._runInImage(["find", "/bin", "/boot", "/etc/", "/home", + "/initrd", "/lib", "/root", "/sbin/", + "/srv", "/usr", "/var"], + stdout=open(self.resultdir+"/fresh_install","w")) + self._runInImage(["dpkg","--get-selections"], + stdout=open(self.resultdir+"/fresh_install.pkgs","w")) + self._runInImage(["tar","cvf","/tmp/etc-fresh.tar","/etc"]) + self._copyFromImage("/tmp/etc-fresh.tar", self.resultdir) + self.stop() + # now compare the diffs + pass + + def bootstrap(self, force=False): + print "bootstrap()" + + # move old crash files away so that test() is not + # confused by them + for f in glob.glob(self.resultdir+"/*.crash"): + shutil.move(f, f+".old") + + # copy image into place, use baseimage as template + # we expect to be able to ssh into the baseimage to + # set it up + if (not force and + os.path.exists("%s.%s" % (self.image,self.fromDist)) and + self.config.has_option("KVM","CacheBaseImage") and + self.config.getboolean("KVM","CacheBaseImage")): + print "Not bootstraping again, we have a cached BaseImage" + shutil.copy("%s.%s" % (self.image,self.fromDist), self.image) + return True + + print "Building new image '%s' based on '%s'" % (self.image, self.baseimage) + shutil.copy(self.baseimage, self.image) + + # get common vars + basepkg = self.config.get("NonInteractive","BasePkg") + additional_base_pkgs = self.config.getlist("Distro","BaseMetaPkgs") + + # start the VM + self.start() + + # FIXME: make this part of the apt env + # otherwise we get funny debconf promtps for + # e.g. the xserver + #export DEBIAN_FRONTEND=noninteractive + #export APT_LISTCHANGES_FRONTEND=none + # + + # generate static network config (NetworkManager likes + # to reset the dhcp interface and that sucks when + # going into the VM with ssh) + nm = self.config.getWithDefault("NonInteractive","WorkaroundNetworkManager","") + if nm: + interfaces = tempfile.NamedTemporaryFile() + interfaces.write(""" +auto lo +iface lo inet loopback + +auto eth0 +iface eth0 inet static + address 10.0.2.15 + netmask 255.0.0.0 + gateway 10.0.2.2 +""") + interfaces.flush() + self._copyToImage(interfaces.name, "/etc/network/interfaces") + + # generate hosts file, the default hosts file contains + # "127.0.0.1 ubuntu. ubuntu" for some reason and the missing + # domain part after the "." makes e.g. postfix rather unhappy + etc_hosts = tempfile.NamedTemporaryFile() + etc_hosts.write('127.0.0.1 localhost\n') + etc_hosts.write('127.0.0.1 upgrade-test-vm\n') + etc_hosts.flush() + self._copyToImage(etc_hosts.name, "/etc/hosts") + + # generate apt.conf + proxy = self.config.getWithDefault("NonInteractive","Proxy","") + if proxy: + aptconf = tempfile.NamedTemporaryFile() + aptconf.write('Acquire::http::proxy "%s";' % proxy) + aptconf.flush() + self._copyToImage(aptconf.name, "/etc/apt/apt.conf") + + # tzdata is unhappy without that file + tzone = tempfile.NamedTemporaryFile() + tzone.write("Europe/Berlin") + tzone.flush() + self._copyToImage(tzone.name, "/etc/timezone") + + aptclone = self.config.getWithDefault('NonInteractive', 'AptCloneFile', '') + + if not aptclone: + # create /etc/apt/sources.list + sources = self.getSourcesListFile() + self._copyToImage(sources.name, "/etc/apt/sources.list") + + # install some useful stuff + ret = self._runInImage(["apt-get","update"]) + assert ret == 0 + # FIXME: instead of this retrying (for network errors with + # proxies) we should have a self._runAptInImage() + for i in range(3): + ret = self._runInImage(["DEBIAN_FRONTEND=noninteractive","apt-get","install", "-y",basepkg]+additional_base_pkgs) + assert ret == 0 + else: + dst_clonename = '/tmp/apt-clone.tgz' + self._copyToImage(aptclone, dst_clonename) + ret = self._runInImage(["DEBIAN_FRONTEND=noninteractive", "apt-get", + "install", "-y", "apt-clone"]) + assert ret == 0 + print "Restoring clone from %s" % aptclone + ret = self._runInImage(['DEBIAN_FRONTEND=noninteractive', + 'apt-clone', 'restore', dst_clonename]) + # FIXME: what action should be taken when a package failed + # to restore? + if ret != 0: + print "WARNING: Some packages failed to restore. Continuing anyway!" + #assert ret == 0 + + CMAX = 4000 + pkgs = self.config.getListFromFile("NonInteractive","AdditionalPkgs") + while(len(pkgs)) > 0: + print "installing additonal: %s" % pkgs[:CMAX] + ret= self._runInImage(["DEBIAN_FRONTEND=noninteractive","apt-get","install","--reinstall","-y"]+pkgs[:CMAX]) + print "apt(2) returned: %s" % ret + if ret != 0: + #self._cacheDebs(tmpdir) + self.stop() + return False + pkgs = pkgs[CMAX+1:] + + # Copy additional data to the image that can the be used by the + # post bootstrap script + # Data is copied to /upgrade-tester/data + # Value is a list of files separated by commas + datadir = '/upgrade-tester/data' + self._runInImage(["mkdir", "-p", datadir]) + if self.config.has_option("NonInteractive", "PostBootstrapData"): + data = self.config.get("NonInteractive", "PostBootstrapData") + for datafile in data.split(','): + self._copyToImage(datafile, datadir) + + if self.config.has_option("NonInteractive","PostBootstrapScript"): + script = self.config.get("NonInteractive","PostBootstrapScript") + print "have PostBootstrapScript: %s" % script + if os.path.exists(script): + self._copyToImage(script, "/upgrade-tester") + self._copyToImage(glob.glob(os.path.dirname( + self.profile)+"/*.cfg"), "/upgrade-tester") + script_name = os.path.basename(script) + self._runInImage(["chmod","755", + os.path.join("/upgrade-tester",script_name)]) + print "running script: %s" % script_name + cmd = os.path.join("/upgrade-tester",script_name) + ret = self._runInImage(["cd /upgrade-tester; %s" % cmd]) + print "PostBootstrapScript returned: %s" % ret + assert ret == 0, "PostBootstrapScript returned non-zero" + else: + print "WARNING: %s not found" % script + + if self.config.getWithDefault("NonInteractive", + "UpgradeFromDistOnBootstrap", False): + print "running apt-get upgrade in from dist (after bootstrap)" + for i in range(3): + ret = self._runInImage(["DEBIAN_FRONTEND=noninteractive","apt-get","-y","dist-upgrade"]) + assert ret == 0, "dist-upgrade returned %s" % ret + + print "Cleaning image" + ret = self._runInImage(["apt-get","clean"]) + assert ret == 0, "apt-get clean returned %s" % ret + + # done with the bootstrap + self.stop() + + # copy cache into place (if needed) + if (self.config.has_option("KVM","CacheBaseImage") and + self.config.getboolean("KVM","CacheBaseImage")): + shutil.copy(self.image, "%s.%s" % (self.image,self.fromDist)) + + return True + + def saveVMSnapshot(self,name): + # savevm + print "savevm" + self.stop() + shutil.copy(self.image, self.image+"."+name) + return + # *sigh* buggy :/ + #self.qemu_pid.stdin.write("stop\n") + #self.qemu_pid.stdin.write("savevm %s\n" % name) + #self.qemu_pid.stdin.write("cont\n") + def delVMSnapshot(self,name): + print "delvm" + self.qemu_pid.stdin.write("delvm %s\n" % name) + def restoreVMSnapshot(self,name): + print "restorevm" + self.stop() + shutil.copy(self.image+"."+name, self.image) + return + # loadvm + # *sigh* buggy :/ + #self.qemu_pid.stdin.write("stop\n") + #self.qemu_pid.stdin.write("loadvm %s\n" % name) + #self.qemu_pid.stdin.write("cont\n") + + def start(self): + if self.qemu_pid != None: + print "already runing" + return True + # mvo: disabled for now, hardy->lucid does not work well with it + # (random hangs) + #if self.virtio: + # drive = ["-drive", "file=%s,if=virtio,boot=on" % self.image] + #else: + drive = ["-hda", self.image] + # build cmd + cmd = [self.qemu_binary]+drive+self.qemu_options + print "Starting %s" % cmd + self.qemu_pid = subprocess.Popen(cmd, stdin=subprocess.PIPE) + # spin here until ssh has come up and we can login + now = time.time() + while True: + if self.qemu_pid.poll(): + res = self.qemu_pid.wait() + print "qemu stopped unexpecedtly with exit code '%s'" % res + return False + time.sleep(1) + if self._runInImage(["/bin/true"]) == 0: + break + if (time.time() - now) > 900: + print "Could not start image after 900s, exiting" + return False + return True + + def stop(self): + " we stop because we run with -no-reboot" + print "stop" + if self.qemu_pid: + print "stop pid: ", self.qemu_pid + self._runInImage(["/sbin/reboot"]) + print "waiting for qemu to shutdown" + for i in range(600): + if self.qemu_pid.poll() is not None: + print "poll() returned" + break + time.sleep(1) + else: + print "Not stopped after 600s, killing " + try: + os.kill(int(self.qemu_pid.pid), 15) + time.sleep(10) + os.kill(int(self.qemu_pid.pid), 9) + except Exception, e: + print "FAILED to kill %s '%s'" % (self.qemu_pid, e) + self.qemu_pid = None + print "qemu stopped" + + + def upgrade(self): + print "upgrade()" + + # clean from any leftover pyc files + for f in glob.glob("%s/*.pyc" % self.upgradefilesdir): + os.unlink(f) + + print "Starting for upgrade" + if not self.start(): + return False + + # copy the profile + if os.path.exists(self.profile): + print "Copying '%s' to image overrides" % self.profile + self._runInImage(["mkdir","-p","/etc/update-manager/release-upgrades.d"]) + self._copyToImage(self.profile, "/etc/update-manager/release-upgrades.d/") + for override_cfg in glob.glob( + os.path.abspath(os.path.join(self.profile_override, "*.cfg"))): + print "Copying '%s' to image overrides" % override_cfg + self._copyToImage( + override_cfg, "/etc/update-manager/release-upgrades.d/") + + # copy test repo sources.list (if needed) + test_repo = self.config.getWithDefault("NonInteractive","AddRepo","") + if test_repo: + test_repo = os.path.join(os.path.dirname(self.profile), test_repo) + self._copyToImage(test_repo, "/etc/apt/sources.list.d") + sourcelist = self.getSourcesListFile() + apt_pkg.Config.Set("Dir::Etc", os.path.dirname(sourcelist.name)) + apt_pkg.Config.Set("Dir::Etc::sourcelist", + os.path.basename(sourcelist.name)) + sources = SourcesList(matcherPath=".") + sources.load(test_repo) + # add the uri to the list of valid mirros in the image + self._runInImage(["mkdir","-p","/upgrade-tester"]) + self._runInImage(["echo -e '[Sources]\nValidMirrors=/upgrade-tester/new_mirrors.cfg' > /etc/update-manager/release-upgrades.d/new_mirrors.cfg"]) + for entry in sources.list: + if (not (entry.invalid or entry.disabled) and + entry.type == "deb"): + print "adding %s to mirrors" % entry.uri + self._runInImage(["echo '%s' >> /upgrade-tester/new_mirrors.cfg" % entry.uri]) + + # upgrade *before* the regular upgrade runs + if self.config.getWithDefault("NonInteractive", "AddRepoUpgradeImmediately", False): + self._runInImage(["apt-get", "update"]) + self._runInImage(["DEBIAN_FRONTEND=noninteractive","apt-get","-y","dist-upgrade", "--allow-unauthenticated"]) + + apt_conf = self.config.getWithDefault("NonInteractive","AddAptConf","") + if apt_conf: + apt_conf = os.path.join(os.path.dirname(self.profile), apt_conf) + self._copyToImage(apt_conf, "/etc/apt/apt.conf.d") + + # check if we have a bzr checkout dir to run against or + # if we should just run the normal upgrader + cmd_prefix=[] + debconf_log = self.config.getWithDefault( + 'NonInteractive', 'DebconfLog', '') + if debconf_log: + cmd_prefix=['export DEBIAN_FRONTEND=editor EDITOR="cat>>%s";' % debconf_log] + print "Logging debconf prompts to %s" % debconf_log + if not self.config.getWithDefault("NonInteractive","ForceOverwrite", False): + print "Disabling ForceOverwrite" + cmd_prefix += ["export RELEASE_UPGRADE_NO_FORCE_OVERWRITE=1;"] + if (os.path.exists(self.upgradefilesdir) and + self.config.getWithDefault("NonInteractive", + "UseUpgraderFromBzr", + True)): + print "Using ./DistUpgrade/* for the upgrade" + self._copyUpgraderFilesFromBzrCheckout() + ret = self._runBzrCheckoutUpgrade(cmd_prefix) + else: + print "Using do-release-upgrade for the upgrade" + ret = self._runInImage(cmd_prefix+["do-release-upgrade","-d", + "-f","DistUpgradeViewNonInteractive"]) + print "dist-upgrade.py returned: %i" % ret + + # copy the result + print "coyping the result" + self._copyFromImage("/var/log/dist-upgrade/*",self.resultdir) + + # give the ssh output extra time + time.sleep(10) + + # stop the machine + print "Shuting down the VM" + self.stop() + return (ret == 0) + + def getFreePort(self, port_base=1025, prefix='auto-upgrade-tester'): + """ Find a free port and lock it when found + :param port_base: Base port number. + :param prefix: Prefix name for the lock + :return: (lockfile, portnumber) + """ + + # allows the system to be configurable + lockdir = self.profiledir + + for port_inc in range(0, 100): + port_num = port_base + port_inc + if is_port_already_listening(port_num): + print "Port %d already in use. Skipping!" % port_num + continue + + lockfilepath = os.path.join(lockdir, '%s.%d.lock' % (prefix, port_num)) + # FIXME: we can use apt_pkg.get_lock() here instead + if not os.path.exists(lockfilepath): + open(lockfilepath, 'w').close() + lock = open(lockfilepath, 'r+') + try: + fcntl.flock(lock, fcntl.LOCK_EX|fcntl.LOCK_NB) + return (lock, port_num) + except IOError: + print "Port %d already locked. Skipping!" % port_num + lock.close() + + print "No free port found. Aborting!" + return (None, None) + +if __name__ == "__main__": + + # FIXME: very rough proof of conecpt, unify with the chroot + # and automatic-upgrade code + # see also /usr/sbin/qemu-make-debian-root + + qemu = UpgradeTestBackendQemu(sys.argv[1],".") + #qemu.bootstrap() + #qemu.start() + #qemu._runInImage(["ls","/"]) + #qemu.stop() + qemu.upgrade() + + # FIXME: now write something into rc.local again and run reboot + # and see if we come up with the new kernel diff -Nru update-manager-17.10.11/AutoUpgradeTester/UpgradeTestBackendSimulate.py update-manager-0.156.14.15/AutoUpgradeTester/UpgradeTestBackendSimulate.py --- update-manager-17.10.11/AutoUpgradeTester/UpgradeTestBackendSimulate.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/UpgradeTestBackendSimulate.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,32 @@ +# UpgradeTestBackendSimulate.py +# +# test backend +# + +import tempfile + +from UpgradeTestBackend import UpgradeTestBackend + +class UpgradeTestBackendSimulate(UpgradeTestBackend): + + def __init__(self, profiledir, resultdir=""): + tmpdir = tempfile.mkdtemp() + super(UpgradeTestBackendSimulate, self).__init__(profiledir, resultdir=tmpdir) + + def installPackages(self, pkgs): + print "simulate installing packages: %s" % ",".join(pkgs) + + def bootstrap(self): + " bootstaps a pristine install" + print "simulate running bootstrap" + return True + + def upgrade(self): + " upgrade a given install " + print "simulate running upgrade" + return True + + def test(self): + " test if the upgrade was successful " + print "running post upgrade test" + return True diff -Nru update-manager-17.10.11/AutoUpgradeTester/UpgradeTestBackendSSH.py update-manager-0.156.14.15/AutoUpgradeTester/UpgradeTestBackendSSH.py --- update-manager-17.10.11/AutoUpgradeTester/UpgradeTestBackendSSH.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/AutoUpgradeTester/UpgradeTestBackendSSH.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,218 @@ +# abstract backend that is based around ssh login + +from UpgradeTestBackend import UpgradeTestBackend + +import glob +import logging +import os +import os.path +import subprocess +import time + + +class UpgradeTestBackendSSH(UpgradeTestBackend): + " abstract backend that works with ssh " + + def __init__(self, profile): + UpgradeTestBackend.__init__(self, profile) + self.profiledir = os.path.dirname(profile) + # get ssh key name + self.ssh_key = os.path.abspath( + self.config.getWithDefault( + "NonInteractive", + "SSHKey", + "/var/cache/auto-upgrade-tester/ssh-key") + ) + if not os.path.exists(self.ssh_key): + print "Creating key: %s" % self.ssh_key + subprocess.call(["ssh-keygen","-N","","-f",self.ssh_key]) + + def login(self): + " run a shell in the image " + print "login" + self.start() + ret = self._runInImage(["/bin/sh"]) + if ret != 0: + logging.warn("_runInImage returned: %s" % ret) + self.stop() + + def ping(self, user="root"): + " check if the instance is ready " + ret = self._runInImageAsUser(user, ["/bin/true"]) + return (ret == 0) + + def _copyToImage(self, fromF, toF, recursive=False): + "copy a file (or a list of files) to the given toF image location" + cmd = ["scp", + "-P", self.ssh_port, + "-q","-q", # shut it up + "-i",self.ssh_key, + "-o", "StrictHostKeyChecking=no", + "-o", "UserKnownHostsFile=%s" % os.path.dirname( + self.profile)+"/known_hosts" + ] + if recursive: + cmd.append("-r") + # we support both single files and lists of files + if isinstance(fromF,list): + cmd += fromF + else: + cmd.append(fromF) + cmd.append("root@%s:%s" % (self.ssh_hostname, toF)) + #print cmd + ret = subprocess.call(cmd) + return ret + + def _copyFromImage(self, fromF, toF): + "copy a file from the given fromF image location" + cmd = ["scp", + "-P",self.ssh_port, + "-q","-q", # shut it up + "-i",self.ssh_key, + "-o", "StrictHostKeyChecking=no", + "-o", "UserKnownHostsFile=%s" % os.path.dirname(self.profile)+"/known_hosts", + "root@%s:%s" % (self.ssh_hostname, fromF), + toF + ] + #print cmd + ret = subprocess.call(cmd) + return ret + + + def _runInImage(self, command, **kwargs): + ret = self._runInImageAsUser("root", command, **kwargs) + return ret + + def _runInImageAsUser(self, user, command, **kwargs): + "run a given command in the image" + # ssh -l root -p 54321 localhost -i profile/server/ssh_key + # -o StrictHostKeyChecking=no + ret = subprocess.call(["ssh", + "-tt", + "-l", user, + "-p",self.ssh_port, + self.ssh_hostname, + "-q","-q", # shut it up + "-i",self.ssh_key, + "-o", "StrictHostKeyChecking=no", + "-o", "BatchMode=yes", + "-o", "UserKnownHostsFile=%s" % os.path.dirname(self.profile)+"/known_hosts", + ]+command, **kwargs) + return ret + + + def installPackages(self, pkgs): + " install additional pkgs (list) into the vm before the upgrade " + if not pkgs: + return True + self.start() + self._runInImage(["apt-get","update"]) + ret = self._runInImage(["DEBIAN_FRONTEND=noninteractive","apt-get","install", "--reinstall", "-y"]+pkgs) + self.stop() + return (ret == 0) + + + def _copyUpgraderFilesFromBzrCheckout(self): + " copy upgrader files from a bzr checkout " + print "copy upgrader into image" + # copy the upgrade into target+/upgrader-tester/ + files = [] + self._runInImage(["mkdir","-p","/upgrade-tester","/etc/update-manager/release-upgrades.d"]) + for f in glob.glob("%s/*" % self.upgradefilesdir): + if not os.path.isdir(f): + files.append(f) + elif os.path.islink(f): + print "Copying link '%s' to image " % f + self._copyToImage(f, "/upgrade-tester", recursive=True) + self._copyToImage(files, "/upgrade-tester") + # and any other cfg files + for f in glob.glob(os.path.dirname(self.profile)+"/*.cfg"): + if (os.path.isfile(f) and + not os.path.basename(f).startswith("DistUpgrade.cfg")): + print "Copying '%s' to image " % f + self._copyToImage(f, "/upgrade-tester") + # base-installer + bi="%s/base-installer" % self.upgradefilesdir + print "Copying '%s' to image" % bi + self._copyToImage(bi, "/upgrade-tester/", recursive=True) + # copy the patches + pd="%s/patches" % self.upgradefilesdir + print "Copying '%s' to image" % pd + self._copyToImage(pd, "/upgrade-tester/", recursive=True) + # and prereq lists + prereq = self.config.getWithDefault("PreRequists","SourcesList",None) + if prereq is not None: + prereq = os.path.join(os.path.dirname(self.profile),prereq) + print "Copying '%s' to image" % prereq + self._copyToImage(prereq, "/upgrade-tester") + + def _runBzrCheckoutUpgrade(self, cmd_prefix): + # start the upgrader + print "running the upgrader now" + + # this is to support direct copying of backport udebs into the + # qemu image - useful for testing backports without having to + # push them into the archive + upgrader_args = "" + upgrader_env = "" + + backports = self.config.getlist("NonInteractive", "PreRequistsFiles") + if backports: + self._runInImage(["mkdir -p /upgrade-tester/backports"]) + for f in backports: + print "Copying %s" % os.path.basename(f) + self._copyToImage(f, "/upgrade-tester/backports/") + self._runInImage(["(cd /upgrade-tester/backports ; dpkg-deb -x %s . )" % os.path.basename(f)]) + upgrader_args = " --have-prerequists" + upgrader_env = "LD_LIBRARY_PATH=/upgrade-tester/backports/usr/lib PATH=/upgrade-tester/backports/usr/bin:$PATH PYTHONPATH=/upgrade-tester/backports//usr/lib/python$(python -c 'import sys; print \"%s.%s\" % (sys.version_info[0], sys.version_info[1])')/site-packages/ " + + ret = self._runInImage(cmd_prefix+["(cd /upgrade-tester/ ; " + "%s./dist-upgrade.py %s)" % (upgrader_env, + upgrader_args)]) + return ret + + def test(self): + # - generate diff of upgrade vs fresh install + # ... + #self.genDiff() + self.start() + # check for crashes + self._copyFromImage("/var/crash/*.crash", self.resultdir) + crashfiles = glob.glob(self.resultdir+"/*.crash") + # run stuff in post_upgrade_tests dir + ok = True + results = [] + for script in glob.glob(self.post_upgrade_tests_dir+"*"): + if not os.access(script, os.X_OK): + continue + result = {'name':os.path.basename(script), + 'result':'pass', + 'time':0, + 'message':'' + } + start_time = time.time() + logging.info("running '%s' post_upgrade_test" % script) + self._copyToImage(script, "/tmp/") + ret = self._runInImage(["/tmp/%s" % os.path.basename(script)]) + if ret != 0: + print "WARNING: post_upgrade_test '%s' failed" % script + ok = False + log=open(self.resultdir+"/test-%s.FAIL" % os.path.basename(script), "w") + log.write("FAIL") + result['result'] = 'fail' + result['message'] = "post_upgrade_test '%s' failed" % script + result['time'] = time.time() - start_time + results.append(result) + + # check for conffiles (the copy is done via a post upgrade script) + self._copyFromImage("/tmp/*.dpkg-dist", self.resultdir) + # Collect debconf prompts generated by debconf_test.py script + self._copyFromImage("/tmp/debconf_*.log", self.resultdir) + self.resultsToJunitXML(results, os.path.join(self.resultdir, 'results.xml')) + + self.stop() + if len(crashfiles) > 0: + print "WARNING: crash files detected on the upgrade" + print crashfiles + return False + return ok diff -Nru update-manager-17.10.11/.bzr-builddeb/default.conf update-manager-0.156.14.15/.bzr-builddeb/default.conf --- update-manager-17.10.11/.bzr-builddeb/default.conf 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/.bzr-builddeb/default.conf 2017-12-23 05:00:38.000000000 +0000 @@ -1,2 +1,5 @@ [BUILDDEB] native = true + +[HOOKS] +pre-build = ./pre-build.sh diff -Nru update-manager-17.10.11/check-new-release-gtk update-manager-0.156.14.15/check-new-release-gtk --- update-manager-17.10.11/check-new-release-gtk 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/check-new-release-gtk 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,202 @@ +#!/usr/bin/python +# check-new-release-gtk - this is called periodically in the background +# (currently by update-notifier every 48h) to +# gather information about new releases of Ubuntu +# or to nag about no longer supported versions +# +# Copyright (c) 2010,2011 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +from gi.repository import Gio +from gi.repository import GObject +from gi.repository import Gtk +import locale +import logging +import sys +import time + +import UpdateManager.GtkProgress + +import gettext +from optparse import OptionParser + +from DistUpgrade.utils import init_proxy + +from UpdateManager.DistUpgradeFetcher import DistUpgradeFetcherGtk +from UpdateManager.MetaReleaseGObject import MetaRelease +from UpdateManager.SimpleGtk3builderApp import SimpleGtkbuilderApp + +from gettext import gettext as _ + +GObject.threads_init() + +# overwrite default upgrade fetcher and make it not show the +# release notes by default +class DistUpgradeFetcher(DistUpgradeFetcherGtk): + def showReleaseNotes(self): + # nothing to do + return True + + +class CheckNewReleaseGtk(SimpleGtkbuilderApp): + """ Gtk verson of the release notes check/download """ + + # the timeout until we give up + FETCH_TIMEOUT = 20 + + def __init__(self, options): + SimpleGtkbuilderApp.__init__(self, options.datadir+"/gtkbuilder/UpgradePromptDialog.ui", "update-manager") + self.new_dist = None + logging.debug("running with devel=%s proposed=%s" % ( + options.devel_release, options.proposed_release)) + m = MetaRelease(useDevelopmentRelease=options.devel_release, + useProposed=options.proposed_release) + m.connect("new-dist-available", self.new_dist_available) + # useful for testing + if options.test_uri: + self.build_ui() + self.show_uri(options.test_uri) + else: + GObject.timeout_add_seconds(self.FETCH_TIMEOUT, self.timeout, None) + + def new_dist_available(self, meta_release, new_dist): + logging.debug("new_dist_available: %s" % new_dist) + self.new_dist = new_dist + client = Gio.Settings("com.ubuntu.update-manager") + ignore_dist = client.get_string("check-new-release-ignore") + # only honor the ignore list if the distro is still supported, otherwise + # go into nag mode + if (ignore_dist == new_dist.name and + meta_release.no_longer_supported is None): + logging.warn("found new dist '%s' but it is on the ignore list" % new_dist.name) + Gtk.main_quit() + self.build_ui() + self.window_main.set_title(_("Ubuntu %(version)s Upgrade Available") % {'version': new_dist.version}) + self.linkbutton_release_notes.set_uri(new_dist.releaseNotesURI) + html_uri = new_dist.releaseNotesHtmlUri + if not html_uri: + logging.warn("no ReleaseNotesHtmlUri found") + return + self.show_uri(html_uri) + # show alert on unsupported distros + if meta_release.no_longer_supported is not None: + from UpdateManager.UpdateManager import show_dist_no_longer_supported_dialog + self.window_main.realize() + show_dist_no_longer_supported_dialog(self.window_main) + + def build_ui(self): + from gi.repository import WebKit + self.webkit_view = WebKit.WebView() + self.webkit_view.show() + settings = self.webkit_view.get_settings() + settings.set_property("enable-plugins", False) + # FIXME: do we want to have it in a Gtk.ScrolledWindow ? + #self.alignment_webkit_view.add(self.webkit_view) + self.scrolledwindow_webkit_view.add(self.webkit_view) + + def on_button_upgrade_now_clicked(self, button): + logging.debug("upgrade now") + progress=UpdateManager.GtkProgress.GtkFetchProgress(self, _("Downloading the release upgrade tool")) + fetcher = DistUpgradeFetcher(new_dist=self.new_dist, + parent=self, + progress=progress) + res = fetcher.run() + res # pyflakes + + def on_button_ask_me_later_clicked(self, button): + logging.debug("ask me later") + # check again in a week + next_check = time.time() + 7*24*60*60 + client = Gio.Settings("com.ubuntu.update-notifier") + client.set_int("release-check-time", int(next_check)) + Gtk.main_quit() + + def on_button_dont_upgrade_clicked(self, button): + #print "don't upgrade" + s = _("You have declined the upgrade to Ubuntu %s") % self.new_dist.version + self.dialog_really_do_not_upgrade.set_markup("%s" % s) + if self.dialog_really_do_not_upgrade.run() == Gtk.ResponseType.OK: + client = Gio.Settings("com.ubuntu.update-manager") + client.set_string("check-new-release-ignore", self.new_dist.name) + Gtk.main_quit() + + def on_linkbutton_release_notes_clicked(self, linkbutton): + # gtk will do the right thing if uri is set + pass + + def window_delete_event_cb(self, window, event): + Gtk.main_quit() + + def show_uri(self, uri): + logging.debug("using uri '%s'" % uri) + self.webkit_view.open(uri) + self.webkit_view.connect("load-finished", self._on_load_finished) + + def _on_load_finished(self, view, frame): + self.window_main.show_all() + # hide redundant release notes button + self.linkbutton_release_notes.hide() + + def timeout(self, user_data): + if self.new_dist is None: + logging.warn("timeout reached, exiting") + Gtk.main_quit() + +if __name__ == "__main__": + + Gtk.init_check(sys.argv) + + gettext.bindtextdomain("update-manager", "/usr/share/locale") + gettext.textdomain("update-manager") + + try: + locale.setlocale(locale.LC_ALL, "") + except: + pass + + init_proxy() + + parser = OptionParser() + #FIXME: Workaround a bug in optparser which doesn't handle unicode/str + # correctly, see http://bugs.python.org/issue4391 + # Shoudl be resolved by Python3 + enc = locale.getpreferredencoding() + parser.add_option ("-d", "--devel-release", action="store_true", + dest="devel_release", default=False, + help=_("Check if upgrading to the latest devel release " + "is possible").decode(enc)) + parser.add_option ("-p", "--proposed", action="store_true", + dest="proposed_release", default=False, + help=_("Try upgrading to the latest release using " + "the upgrader from $distro-proposed").decode(enc)) + # mostly useful for development + parser.add_option ("", "--datadir", default="/usr/share/update-manager") + parser.add_option ("", "--test-uri") + parser.add_option ("", "--debug", action="store_true", default=False, + help=_("Add debug output").decode(enc)) + (options, args) = parser.parse_args() + + if options.debug: + logging.basicConfig(level=logging.DEBUG) + + # create object + cnr = CheckNewReleaseGtk(options) + + Gtk.main() + diff -Nru update-manager-17.10.11/check_new_release_gtk.py update-manager-0.156.14.15/check_new_release_gtk.py --- update-manager-17.10.11/check_new_release_gtk.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/check_new_release_gtk.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,202 @@ +#!/usr/bin/python +# check-new-release-gtk - this is called periodically in the background +# (currently by update-notifier every 48h) to +# gather information about new releases of Ubuntu +# or to nag about no longer supported versions +# +# Copyright (c) 2010,2011 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +from gi.repository import Gio +from gi.repository import GObject +from gi.repository import Gtk +import locale +import logging +import sys +import time + +import UpdateManager.GtkProgress + +import gettext +from optparse import OptionParser + +from DistUpgrade.utils import init_proxy + +from UpdateManager.DistUpgradeFetcher import DistUpgradeFetcherGtk +from UpdateManager.MetaReleaseGObject import MetaRelease +from UpdateManager.SimpleGtk3builderApp import SimpleGtkbuilderApp + +from gettext import gettext as _ + +GObject.threads_init() + +# overwrite default upgrade fetcher and make it not show the +# release notes by default +class DistUpgradeFetcher(DistUpgradeFetcherGtk): + def showReleaseNotes(self): + # nothing to do + return True + + +class CheckNewReleaseGtk(SimpleGtkbuilderApp): + """ Gtk verson of the release notes check/download """ + + # the timeout until we give up + FETCH_TIMEOUT = 20 + + def __init__(self, options): + SimpleGtkbuilderApp.__init__(self, options.datadir+"/gtkbuilder/UpgradePromptDialog.ui", "update-manager") + self.new_dist = None + logging.debug("running with devel=%s proposed=%s" % ( + options.devel_release, options.proposed_release)) + m = MetaRelease(useDevelopmentRelease=options.devel_release, + useProposed=options.proposed_release) + m.connect("new-dist-available", self.new_dist_available) + # useful for testing + if options.test_uri: + self.build_ui() + self.show_uri(options.test_uri) + else: + GObject.timeout_add_seconds(self.FETCH_TIMEOUT, self.timeout, None) + + def new_dist_available(self, meta_release, new_dist): + logging.debug("new_dist_available: %s" % new_dist) + self.new_dist = new_dist + client = Gio.Settings("com.ubuntu.update-manager") + ignore_dist = client.get_string("check-new-release-ignore") + # only honor the ignore list if the distro is still supported, otherwise + # go into nag mode + if (ignore_dist == new_dist.name and + meta_release.no_longer_supported is None): + logging.warn("found new dist '%s' but it is on the ignore list" % new_dist.name) + Gtk.main_quit() + self.build_ui() + self.window_main.set_title(_("Ubuntu %(version)s Upgrade Available") % {'version': new_dist.version}) + self.linkbutton_release_notes.set_uri(new_dist.releaseNotesURI) + html_uri = new_dist.releaseNotesHtmlUri + if not html_uri: + logging.warn("no ReleaseNotesHtmlUri found") + return + self.show_uri(html_uri) + # show alert on unsupported distros + if meta_release.no_longer_supported is not None: + from UpdateManager.UpdateManager import show_dist_no_longer_supported_dialog + self.window_main.realize() + show_dist_no_longer_supported_dialog(self.window_main) + + def build_ui(self): + from gi.repository import WebKit + self.webkit_view = WebKit.WebView() + self.webkit_view.show() + settings = self.webkit_view.get_settings() + settings.set_property("enable-plugins", False) + # FIXME: do we want to have it in a Gtk.ScrolledWindow ? + #self.alignment_webkit_view.add(self.webkit_view) + self.scrolledwindow_webkit_view.add(self.webkit_view) + + def on_button_upgrade_now_clicked(self, button): + logging.debug("upgrade now") + progress=UpdateManager.GtkProgress.GtkFetchProgress(self, _("Downloading the release upgrade tool")) + fetcher = DistUpgradeFetcher(new_dist=self.new_dist, + parent=self, + progress=progress) + res = fetcher.run() + res # pyflakes + + def on_button_ask_me_later_clicked(self, button): + logging.debug("ask me later") + # check again in a week + next_check = time.time() + 7*24*60*60 + client = Gio.Settings("com.ubuntu.update-notifier") + client.set_int("release-check-time", int(next_check)) + Gtk.main_quit() + + def on_button_dont_upgrade_clicked(self, button): + #print "don't upgrade" + s = _("You have declined the upgrade to Ubuntu %s") % self.new_dist.version + self.dialog_really_do_not_upgrade.set_markup("%s" % s) + if self.dialog_really_do_not_upgrade.run() == Gtk.ResponseType.OK: + client = Gio.Settings("com.ubuntu.update-manager") + client.set_string("check-new-release-ignore", self.new_dist.name) + Gtk.main_quit() + + def on_linkbutton_release_notes_clicked(self, linkbutton): + # gtk will do the right thing if uri is set + pass + + def window_delete_event_cb(self, window, event): + Gtk.main_quit() + + def show_uri(self, uri): + logging.debug("using uri '%s'" % uri) + self.webkit_view.open(uri) + self.webkit_view.connect("load-finished", self._on_load_finished) + + def _on_load_finished(self, view, frame): + self.window_main.show_all() + # hide redundant release notes button + self.linkbutton_release_notes.hide() + + def timeout(self, user_data): + if self.new_dist is None: + logging.warn("timeout reached, exiting") + Gtk.main_quit() + +if __name__ == "__main__": + + Gtk.init_check(sys.argv) + + gettext.bindtextdomain("update-manager", "/usr/share/locale") + gettext.textdomain("update-manager") + + try: + locale.setlocale(locale.LC_ALL, "") + except: + pass + + init_proxy() + + parser = OptionParser() + #FIXME: Workaround a bug in optparser which doesn't handle unicode/str + # correctly, see http://bugs.python.org/issue4391 + # Shoudl be resolved by Python3 + enc = locale.getpreferredencoding() + parser.add_option ("-d", "--devel-release", action="store_true", + dest="devel_release", default=False, + help=_("Check if upgrading to the latest devel release " + "is possible").decode(enc)) + parser.add_option ("-p", "--proposed", action="store_true", + dest="proposed_release", default=False, + help=_("Try upgrading to the latest release using " + "the upgrader from $distro-proposed").decode(enc)) + # mostly useful for development + parser.add_option ("", "--datadir", default="/usr/share/update-manager") + parser.add_option ("", "--test-uri") + parser.add_option ("", "--debug", action="store_true", default=False, + help=_("Add debug output").decode(enc)) + (options, args) = parser.parse_args() + + if options.debug: + logging.basicConfig(level=logging.DEBUG) + + # create object + cnr = CheckNewReleaseGtk(options) + + Gtk.main() + diff -Nru update-manager-17.10.11/data/com.ubuntu.update-manager.gschema.xml.in update-manager-0.156.14.15/data/com.ubuntu.update-manager.gschema.xml.in --- update-manager-17.10.11/data/com.ubuntu.update-manager.gschema.xml.in 2017-03-08 21:15:08.000000000 +0000 +++ update-manager-0.156.14.15/data/com.ubuntu.update-manager.gschema.xml.in 2017-12-23 05:00:38.000000000 +0000 @@ -1,17 +1,22 @@ + + true + Remind to reload the channel list + If automatic checking for updates is disabled, you have to reload the channel list manually. This option allows to hide the reminder shown in this case. + false Show details of an update Stores the state of the expander that contains the list of changes and the description - 1 + 0 The window width Stores the width of the update-manager dialog - 400 + 0 The window height Stores the height of the update-manager dialog @@ -45,7 +50,7 @@ make check-new-release-gtk ignore a given new release This will permanently hide the new release prompt from check-new-release-gtk. Note that the small button in the main update-manager UI will still be there. - + 0 Time when update-manager got launched last The last time update-manager was run. diff -Nru update-manager-17.10.11/data/do-release-upgrade.8 update-manager-0.156.14.15/data/do-release-upgrade.8 --- update-manager-17.10.11/data/do-release-upgrade.8 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/data/do-release-upgrade.8 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,35 @@ +.\" Generated by help2man 1.36 and edited by Willem Bogaerts. +.TH "DO-RELEASE-UPGRADE" "8" "October 2009" "" "" +.SH "NAME" +do\-release\-upgrade \- manual page for do\-release\-upgrade +.SH "SYNOPSIS" +.B do\-release\-upgrade +[\fIoptions\fR] +.SH "DESCRIPTION" +Upgrade the operating system to the latest release from the command\-line. +This is the preferred command if the machine has no graphic environment or if the machine is to be upgraded over a remote connection. +.SH "OPTIONS" +.TP +\fB\-h\fR, \fB\-\-help\fR +show help message and exit +.TP +\fB\-d\fR, \fB\-\-devel\-release\fR +Check if upgrading to the latest devel release is +possible +.TP +\fB\-p\fR, \fB\-\-proposed\fR +Try upgrading to the latest release using the upgrader +from Ubuntu\-proposed +.TP +\fB\-m\fR MODE, \fB\-\-mode\fR=\fIMODE\fR +Run in a special upgrade mode. Currently "desktop" for +regular upgrades of a desktop system and "server" for +server systems are supported. +.TP +\fB\-f\fR FRONTEND, \fB\-\-frontend\fR=\fIFRONTEND\fR +Run the specified frontend +.TP +\fB\-s\fR, \fB\-\-sandbox\fR +Test upgrade with a sandbox aufs overlay +.SH "SEE ALSO" +\fBupdate\-manager\fR(8), \fBapt\-get\fR(8) diff -Nru update-manager-17.10.11/data/gtkbuilder/Dialog.ui update-manager-0.156.14.15/data/gtkbuilder/Dialog.ui --- update-manager-17.10.11/data/gtkbuilder/Dialog.ui 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/data/gtkbuilder/Dialog.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,124 +0,0 @@ - - - - - False - - - True - False - True - True - 12 - vertical - - - True - False - 12 - True - 2 - 12 - - - - 0 - 0 - 1 - 2 - - - - - False - True - 6 - True - 0 - 0 - True - 20 - - - - - - 1 - 0 - 1 - 1 - - - - - False - True - True - 0 - 0 - True - 20 - - - 1 - 1 - 1 - 1 - - - - - False - True - 0 - - - - - False - True - 12 - True - True - vertical - - - - - - True - True - 4 - 1 - - - - - True - False - end - True - 6 - True - end - - - - - - False - True - end - 2 - - - - - - diff -Nru update-manager-17.10.11/data/gtkbuilder/UpdateManager.ui update-manager-0.156.14.15/data/gtkbuilder/UpdateManager.ui --- update-manager-17.10.11/data/gtkbuilder/UpdateManager.ui 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/data/gtkbuilder/UpdateManager.ui 2017-12-23 05:00:38.000000000 +0000 @@ -1,226 +1,165 @@ - - - True + + False - 12 + 6 + False + True + center-on-parent + dialog + True + True - + True - True - 6 - True + False + 6 + 12 + + + True + False + 0 + 0 + <big><b>Starting Update Manager</b></big> + True + + + False + False + 0 + + + + + False + 0 + Software updates correct errors, eliminate security vulnerabilities and provide new features. + True + True + + + False + False + 1 + + - + True False - True 6 - + True - True - in - 100 - - - True - True - False - False - True - - - updates - - - - - - - - - + False + 0.10000000149 - True - True + False + False 0 - + True - True - - - True - True - False - - - True - False - 6 - 6 - - - True - True - in - - - - - - True - True - 0 - - - - - - - True - False - Changes - - - False - - - - - True - True - 6 - in - 80 - - - True - True - 6 - False - word - 6 - 6 - False - False - - - Description - - - - - - - 1 - - - - - True - False - Description - - - Description - - - - - 1 - False - - - - - - - True - False - Technical description - - + False + 0 + end False - True + False 1 - - - - True - False - Details of updates - True - + + False + False + 2 + - - True - True - 2 - - - + + + False + 6 + False + True + center-on-parent + dialog + True + True + True + + + True False - 3 - - + 12 + + + True False - 12 + end - + + _Partial Upgrade True - False - aptdaemon-download + True + True + False + False + True False - True + False 0 - + + gtk-close True - False - 0 - - - True + True + True + True + False + False + True - True - True + False + False 1 False - False + True + end 0 - + + True False + 6 12 - + True False - gtk-refresh + 0 + 0 + gtk-dialog-warning + 6 False @@ -229,12 +168,45 @@ - + True False - 0 - The computer will need to restart. - True + 12 + + + True + True + 0 + <big><b>Not all updates can be installed</b></big> + True + True + + + False + False + 0 + + + + + True + False + 0 + Run a partial upgrade, to install as many updates as possible. + +This can be caused by: + * A previous upgrade which didn't complete + * Problems with some of the installed software + * Unofficial software packages not provided by Ubuntu + * Normal changes of a pre-release version of Ubuntu + True + + + False + False + 1 + + True @@ -244,57 +216,92 @@ - False - False + True + True 1 - - + + + + cancelbutton2 + okbutton3 + + + + False + 6 + False + True + center-on-parent + dialog + True + True + + + True + False + 12 + + + True False - 12 + end - + + Chec_k True - False - dialog-warning + True + True + False + False + image-refresh + True False - True + False 0 - + + gtk-close True - False - 0 - You are connected via roaming and may be charged for the data consumed by this update. - True + True + True + False + False + True - True - True + False + False 1 False - False - 2 + True + end + 0 - + + True False - 12 + 6 + 11 - + True False - modem + 0 + 0 + gtk-dialog-info + 6 False @@ -303,72 +310,142 @@ - + True False - 0 - You may want to wait until you’re not using a mobile broadband connection. - True + 12 + + + True + True + 0 + 0 + <b><big>You must check for updates manually</big></b> + +Your system does not check for updates automatically. You can configure this behavior in <i>Software Sources</i> on the <i>Updates</i> tab. + True + True + True + + + False + False + 0 + + + + + _Hide this information in the future + True + True + False + False + True + True + + + + False + False + 1 + + - True - True + False + False 1 - False - False - 3 + True + True + 1 - - + + + + cancelbutton1 + okbutton2 + + + + False + 6 + False + True + center-on-parent + dialog + True + True + True + + + True + False + 12 + + + True False - 12 + end - + + gtk-cancel True - False - battery + True + True + True + True + False + True False - True + False 0 - + + Co_ntinue True - False - 0 - It’s safer to connect the computer to AC power before updating. - True + True + True + True + False + True - True - True + False + False 1 False - False - 4 + True + end + 0 - + + True False + 6 12 - + True False - network-offline + 0 + 0 + gtk-dialog-warning + 6 False @@ -377,11 +454,39 @@ - + True False - 0 - True + 12 + + + True + True + 0 + <big><b>Running on battery</b></big> + True + True + + + False + False + 0 + + + + + True + False + 0 + Your system is running on battery. Are you sure you want to continue? + True + + + False + False + 1 + + True @@ -391,17 +496,1031 @@ - False - False - 5 + True + True + 1 + + + + + + button_on_battery_close + button_on_battery_continue + + + + False + 6 + Release Notes + True + center-on-parent + 600 + 500 + dialog + + + True + False + 6 + + + True + False + end + + + gtk-cancel + True + True + True + False + False + True + + + False + False + 0 + + + + + _Upgrade + True + True + True + True + True + False + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + True + 6 + in + + + + + + True + True + 1 + + + + + + okbutton1 + button2 + + + + True + False + gtk-apply + + + True + False + gtk-refresh + + + False + 6 + True + center-on-parent + 400 + dialog + True + True + + + True + False + 6 + + + True + False + 6 + 12 + + + True + False + 0 + True + True + + + False + False + 0 + + + + + True + False + 6 + + + True + False + 0.10000000149 + + + True + False + 0 + + + + + True + False + 0 + + + False + False + 1 + + + + + False + False + 1 + + + + + True + 6 + + + True + False + 6 + + + 200 + True + True + in + + + True + True + False + + + + + + + + True + True + 0 + + + + + + + True + False + Show progress of individual files + + + + + True + True + 2 + + + + + True + True + 0 + + + + + True + False + end + + + gtk-cancel + True + True + False + 5 + False + True + + + False + False + 0 + + + + + False + True + 1 + + + + + + + False + Update Manager + center + 600 + 500 + + + True + False + 6 + 6 + + + True + False + 6 + 12 + + + True + False + 12 + + + + False + False + 0 + + + + + True + False + 6 + + + True + False + 0 + 0 + Starting Update Manager + True + True + + + + + + + False + False + 0 + + + + + True + False + 0 + True + + + False + False + 1 + + + + + True + True + 1 + + + + + False + True + 0 + + + + + False + 0 + in + + + True + False + + + True + False + 6 + 6 + + + True + False + 0 + True + + + True + True + 0 + + + + + U_pgrade + True + True + True + False + True + + + + False + False + 1 + + + + + + + + + False + True + 1 + + + + + False + 0 + in + + + True + False + + + True + False + 6 + 6 + + + True + False + 0 + True + + + True + True + 0 + + + + + I_nstall + True + True + True + False + True + + + + False + False + 1 + + + + + + + + + False + True + 2 + + + + + False + 0 + in + + + True + False + + + True + False + 6 + 6 + + + True + False + 0 + True + True + True + + + True + True + 0 + + + + + _Restart Now + True + True + True + False + True + + + + False + False + 1 + + + + + + + + + False + True + 3 + + + + + True + False + + + True + True + in + + + True + True + False + True + + + updates + + + + + + + + + + + + True + True + 0 + + + + + False + 3 + + + False + 12 + + + True + False + aptdaemon-download + + + False + True + 0 + + + + + True + False + 0 + + + True + + + True + True + 1 + + + + + False + False + 0 + + + + + False + 12 + + + True + False + dialog-warning + + + False + True + 0 + + + + + True + False + 0 + You are connected via roaming and may be charged for the data consumed by this update. + True + + + True + True + 1 + + + + + False + False + 1 + + + + + False + 12 + + + True + False + modem + + + False + True + 0 + + + + + True + False + 0 + You are connected via a wireless modem. + True + + + True + True + 1 + + + + + False + False + 2 + + + + + False + 12 + + + True + False + battery + + + False + True + 0 + + + + + True + False + 0 + It’s safer to connect the computer to AC power before updating. + True + + + True + True + 1 + + + + + False + False + 3 + + + + + False + 12 + + + True + False + network-offline + + + False + True + 0 + + + + + True + False + 0 + True + + + True + True + 1 + + + + + False + False + 4 + + + + + False + False + 1 + + + + + True + False + 12 + + + True + False + + + True + True + 0 + + + + + True + False + 6 + True + + + Chec_k + True + True + True + False + image-refresh + True + + + + False + True + 0 + + + + + _Install Updates + True + True + True + True + True + False + image-apply + True + + + + False + True + 1 + + + + + False + True + 1 + + + + + False + True + 2 + + + + + True + True + 6 + 4 + + + + + True + True + True + 6 + + + True + False + 6 + + + True + True + False + + + True + False + 6 + 6 + + + True + True + in + + + + + + True + True + 0 + + + + + + + True + False + Changes + + + False + + + + + True + True + 6 + in + + + True + True + 6 + False + word + 6 + 6 + False + False + + + Description + + + + + + + 1 + + + + + True + False + Description + + + Description + + + + + 1 + False + + + + + True + True + 0 + + + + + + + True + False + Description of update + True + + + + + False + True + 5 + + + + + False + + + False + False + 5 + + + + + True + True + 0 + + + + + True + False + 6 + 12 + + + _Settings... + True + True + True + False + True + + + + False + False + 0 + + + + + True + False + 6 + end + + + + + + gtk-close + True + True + True + True + False + True + + + + + False + False + 1 + + + + + True + True + 1 + + + + + False + False + 1 - - False - True - 3 - diff -Nru update-manager-17.10.11/data/gtkbuilder/UpdateProgress.ui update-manager-0.156.14.15/data/gtkbuilder/UpdateProgress.ui --- update-manager-17.10.11/data/gtkbuilder/UpdateProgress.ui 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/data/gtkbuilder/UpdateProgress.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,96 +0,0 @@ - - - - - False - - - True - False - 12 - 6 - 6 - - - True - False - 0 - - - 0 - 0 - 2 - 1 - - - - - True - False - 0 - end - 20 - - - - - - 0 - 2 - 2 - 1 - - - - - 350 - True - False - True - 0.5 - - - - - - 0 - 1 - 1 - 1 - - - - - True - False - - - - - - 1 - 1 - 1 - 1 - - - - - False - True - True - - - - - - 0 - 3 - 2 - 1 - - - - - - diff -Nru update-manager-17.10.11/data/gtkbuilder/UpgradePromptDialog.ui update-manager-0.156.14.15/data/gtkbuilder/UpgradePromptDialog.ui --- update-manager-17.10.11/data/gtkbuilder/UpgradePromptDialog.ui 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/data/gtkbuilder/UpgradePromptDialog.ui 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,343 @@ + + + + + + False + center + + + + True + vertical + + + True + 20 + 20 + 20 + 20 + + + True + 0 + <b>A new version of Ubuntu is available. Would you like to upgrade?</b> + True + + + + + 0 + + + + + True + 20 + 20 + + + 600 + 340 + True + True + automatic + automatic + + + + + + + + 1 + + + + + True + 20 + 20 + 20 + 20 + + + True + + + Release Notes + True + True + True + none + + + + False + False + 0 + + + + + True + 8 + end + + + Don't Upgrade + True + True + True + + + + False + False + 0 + + + + + Ask Me Later + True + True + True + + + + False + False + 1 + + + + + Yes, Upgrade Now + True + True + True + True + True + True + False + + + + False + False + 2 + + + + + 1 + + + + + + + 2 + + + + + + + 5 + center + normal + True + You have declined to upgrade to the new Ubuntu + You can upgrade at a later time by opening Update Manager and click on "Upgrade". + + + True + vertical + 2 + + + True + end + + + gtk-cancel + True + True + True + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + button2 + button1 + + + + 6 + True + center-on-parent + 400 + dialog + True + True + + + True + vertical + 6 + + + True + 6 + vertical + 12 + + + True + 0 + True + True + + + False + False + 0 + + + + + True + vertical + 6 + + + True + 0.10000000149 + + + False + 0 + + + + + True + 0 + + + False + False + 1 + + + + + False + False + 1 + + + + + True + 6 + + + True + vertical + 6 + + + 200 + True + True + in + + + True + True + False + + + + + 0 + + + + + + + True + Show progress of individual files + + + + + 2 + + + + + 0 + + + + + True + end + + + gtk-cancel + True + True + True + 5 + True + + + False + False + 0 + + + + + False + 1 + + + + + + Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/data/icons/16x16/apps/system-software-update.png and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/data/icons/16x16/apps/system-software-update.png differ Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/data/icons/22x22/apps/system-software-update.png and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/data/icons/22x22/apps/system-software-update.png differ Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/data/icons/24x24/apps/system-software-update.png and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/data/icons/24x24/apps/system-software-update.png differ diff -Nru update-manager-17.10.11/data/icons/scalable/apps/system-software-update.svg update-manager-0.156.14.15/data/icons/scalable/apps/system-software-update.svg --- update-manager-17.10.11/data/icons/scalable/apps/system-software-update.svg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/data/icons/scalable/apps/system-software-update.svg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,1519 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Software Update + + + Jakub Steiner + + + + + + + + + http://jimmac.musichall.cz + + + network update + software + synchronize + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru update-manager-17.10.11/data/meta-release update-manager-0.156.14.15/data/meta-release --- update-manager-17.10.11/data/meta-release 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/data/meta-release 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,7 @@ +# default location for the meta-release file + +[METARELEASE] +URI = http://changelogs.ubuntu.com/meta-release +URI_LTS = http://changelogs.ubuntu.com/meta-release-lts +URI_UNSTABLE_POSTFIX = -development +URI_PROPOSED_POSTFIX = -proposed diff -Nru update-manager-17.10.11/data/release-upgrades update-manager-0.156.14.15/data/release-upgrades --- update-manager-17.10.11/data/release-upgrades 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/data/release-upgrades 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,17 @@ +# Default behavior for the release upgrader. + +[DEFAULT] +# Default prompting behavior, valid options: +# +# never - Never check for a new release. +# normal - Check to see if a new release is available. If more than one new +# release is found, the release upgrader will attempt to upgrade to +# the release that immediately succeeds the currently-running +# release. +# lts - Check to see if a new LTS release is available. The upgrader +# will attempt to upgrade to the first LTS release available after +# the currently-running one. Note that this option should not be +# used if the currently-running release is not itself an LTS +# release, since in that case the upgrader won't be able to +# determine if a newer release is available. +Prompt=lts diff -Nru update-manager-17.10.11/data/update-manager.8 update-manager-0.156.14.15/data/update-manager.8 --- update-manager-17.10.11/data/update-manager.8 2017-07-12 22:00:36.000000000 +0000 +++ update-manager-0.156.14.15/data/update-manager.8 2017-12-23 05:00:38.000000000 +0000 @@ -37,13 +37,19 @@ Check if a new distribution release is available .TP \fB-d\fR, \fB\-\-devel-release\fR -If using the latest supported release, upgrade to the development release +Check if upgrading to the latest devel release is possible .TP \fB-p\fR, \fB\-\-proposed\fR Upgrade using the latest proposed version of the release upgrader .TP \fB-\-no-focus-on-map\fR Do not focus on map when starting +.TP +\fB-\-dist-upgrade\fR +Try to run a dist-upgrade +.TP +\fB-s\fR, \fB\-\-sandbox\fR +Test the upgrade with a sandbox aufs overlay, without changing the filesystem. .SH ACTIONS PERFORMED DURING AN UPGRADE TO A NEW VERSION * eventually reinstall the package ubuntu-desktop diff -Nru update-manager-17.10.11/data/update-manager.convert update-manager-0.156.14.15/data/update-manager.convert --- update-manager-17.10.11/data/update-manager.convert 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/data/update-manager.convert 2017-12-23 05:00:38.000000000 +0000 @@ -1,4 +1,5 @@ [com.ubuntu.update-manager] +remind-reload = /apps/update-manager/remind_reload show-details = /apps/update-manager/show_details check-dist-upgrades = /apps/update-manager/check_dist_upgrades autoclose-install-window = /apps/update-manager/autoclose_install_window @@ -6,4 +7,4 @@ summary-before-name = /apps/update-manager/summary_before_name first-run = /apps/update-manager/first_run check-new-release-ignore = /apps/update-manager/check_new_release_ignore -launch-time = /apps/update-manager/launch_time +launch-time = /apps/update-manager/launch_time \ No newline at end of file diff -Nru update-manager-17.10.11/data/update-manager.desktop.in update-manager-0.156.14.15/data/update-manager.desktop.in --- update-manager-17.10.11/data/update-manager.desktop.in 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/data/update-manager.desktop.in 2017-12-23 05:00:38.000000000 +0000 @@ -1,5 +1,5 @@ [Desktop Entry] -_Name=Software Updater +_Name=Update Manager _GenericName=Software Updates _Comment=Show and install available updates Exec=/usr/bin/update-manager @@ -8,4 +8,3 @@ Type=Application Categories=System;Settings; X-Ubuntu-Gettext-Domain=update-manager -X-Unity-IconBackgroundColor=#4c9e39 diff -Nru update-manager-17.10.11/debian/91-release-upgrade update-manager-0.156.14.15/debian/91-release-upgrade --- update-manager-17.10.11/debian/91-release-upgrade 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/debian/91-release-upgrade 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,5 @@ +#!/bin/sh + +if [ -x /usr/lib/update-manager/release-upgrade-motd ]; then + exec /usr/lib/update-manager/release-upgrade-motd +fi diff -Nru update-manager-17.10.11/debian/auto-upgrade-tester.dirs update-manager-0.156.14.15/debian/auto-upgrade-tester.dirs --- update-manager-17.10.11/debian/auto-upgrade-tester.dirs 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/debian/auto-upgrade-tester.dirs 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,4 @@ +var/cache/auto-upgrade-tester +usr/bin +etc/default +etc/init \ No newline at end of file diff -Nru update-manager-17.10.11/debian/auto-upgrade-tester.install update-manager-0.156.14.15/debian/auto-upgrade-tester.install --- update-manager-17.10.11/debian/auto-upgrade-tester.install 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/debian/auto-upgrade-tester.install 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,8 @@ +# normal binaries et all +debian/tmp/usr/lib/python*/*-packages/AutoUpgradeTester +debian/tmp/usr/bin/auto-upgrade-tester +debian/tmp/usr/share/auto-upgrade-tester +# the jenkins stuff +AutoUpgradeTester/auto-upgrade-tester-jenkins-slave usr/bin +AutoUpgradeTester/jenkins/auto-upgrade-tester-jenkins-slave etc/default +AutoUpgradeTester/jenkins/auto-upgrade-tester-jenkins-slave.conf etc/init/ \ No newline at end of file diff -Nru update-manager-17.10.11/debian/bzr-builder.manifest update-manager-0.156.14.15/debian/bzr-builder.manifest --- update-manager-17.10.11/debian/bzr-builder.manifest 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/debian/bzr-builder.manifest 2017-12-23 05:00:41.000000000 +0000 @@ -0,0 +1,2 @@ +# bzr-builder format 0.3 deb-version {debupstream}-0~2435 +lp:~mvo/update-manager/hwe-support-status-ui revid:michael.vogt@ubuntu.com-20140624145036-xncjcfr5zj63oxsm diff -Nru update-manager-17.10.11/debian/changelog update-manager-0.156.14.15/debian/changelog --- update-manager-17.10.11/debian/changelog 2017-10-05 23:03:26.000000000 +0000 +++ update-manager-0.156.14.15/debian/changelog 2017-12-23 05:00:41.000000000 +0000 @@ -1,1087 +1,106 @@ -update-manager (1:17.10.11) artful; urgency=medium +update-manager (0.156.14.15-0~2435~ubuntu17.10.1) artful; urgency=low - * UpdateManager/UpdatesAvailable.py: Also mention using COMPRESS=xz in - intramfs.conf to free more space in /boot. + * Auto build. - -- Brian Murray Thu, 05 Oct 2017 16:03:26 -0700 + -- tom Sat, 23 Dec 2017 05:00:41 +0000 -update-manager (1:17.10.10) artful; urgency=medium +update-manager (1:0.156.14.15) precise-proposed; urgency=low - * UpdateManager/UpdatesAvailable.py: Provide instructions when mount points - have insufficient free space for the upgrade to complete. (LP: #1477455) + * support HardwareEnablement End-of-Life transition + (LP: #1333728) - -- Brian Murray Wed, 20 Sep 2017 12:28:03 -0700 + -- Michael Vogt Tue, 24 Jun 2014 16:32:25 +0200 -update-manager (1:17.10.9) artful; urgency=medium +update-manager (1:0.156.14.14) precise-proposed; urgency=medium - [ Łukasz 'sil2100' Zemczak ] - * test_update_origin.py: fix the extended origin matcher test as it was - making wrong assumptions, not checking if packages actually had ANY package - in -security. This should fix the current autopkgtest failures. + * Fix translations (ja, id, eo, ug) of check-new-release-gtk dialog + which cause a crash and users not to be notified of the new version. + (LP: #1311396) - [ Brian Murray ] - * test_update_origin.py: fix some typos. + -- Brian Murray Wed, 23 Apr 2014 11:58:26 -0700 - -- Łukasz 'sil2100' Zemczak Mon, 11 Sep 2017 12:32:29 +0200 +update-manager (1:0.156.14.13) precise-proposed; urgency=medium -update-manager (1:17.10.8) artful; urgency=medium + * debian/source_update-manager.py: use root_command_output so that we can + collect apt-clone_system_state.tar.gz. (LP: #1274704) - * UpdateManager/Dialogs.py: use a variable instead of hard coding 1 to - allow the translation of the message, thanks to Andrea Azzarone. - (LP: #1714489) + -- Brian Murray Fri, 11 Apr 2014 14:42:25 -0700 - -- Brian Murray Tue, 05 Sep 2017 14:17:16 -0700 +update-manager (1:0.156.14.12) precise-proposed; urgency=medium -update-manager (1:17.10.7) artful; urgency=medium + * debian/source_update-manager.py: create a DuplicateSignature by + replacing the tmpdir name in the Traceback (LP: #1289580) - * Show status of Canonical's Livepatch service in update-manager dialog - window, thanks to Andrea Azzarone. (LP: #1712591) + -- Brian Murray Mon, 10 Mar 2014 10:40:57 -0700 - -- Brian Murray Thu, 31 Aug 2017 09:25:37 -0700 +update-manager (1:0.156.14.11) precise-proposed; urgency=low -update-manager (1:17.10.6) artful; urgency=medium + * DistUpgradeApport.py: don't use a '/' as a key name in the apport report + as this will cause an assertion error and prevent any attachments from + being included (LP: #1060353) - * UpdateManager.py: Workaround a crash when calling software-properties-gtk - by not using --toplevel under wayland (LP: #1703365) + -- Brian Murray Mon, 08 Oct 2012 16:02:53 -0700 - -- Jean-Baptiste Lallement Mon, 21 Aug 2017 13:00:27 +0200 +update-manager (1:0.156.14.10) precise-proposed; urgency=low -update-manager (1:17.10.5) artful; urgency=medium - - * test_update_origin.py: This does not need to be architecture specific so - just set the arch to amd64 like test_update_list.py. - * test_utils.py: mock /proc/net/tcp and processes in proc so that we are - testing the code and not the system under test. - - -- Brian Murray Wed, 09 Aug 2017 16:44:44 -0700 - -update-manager (1:17.10.4) artful; urgency=medium - - * UpdateManager/Core/UpdateList.py: Instead of trying to print an error - when trying to find the desktop file log it. (LP: #1428297) - - -- Brian Murray Mon, 07 Aug 2017 16:19:53 -0700 - -update-manager (1:17.10.3) artful; urgency=medium - - * Resolve a multitude of test failures, pep8 and pyflakes issues. - - -- Brian Murray Mon, 07 Aug 2017 14:30:59 -0700 - -update-manager (1:17.10.2) artful; urgency=medium - - * Recommend libgtk2-perl be installed so we have a working debconf frontend. - (LP: #1607929) - - -- Brian Murray Tue, 18 Jul 2017 15:32:54 -0700 - -update-manager (1:17.10.1) artful; urgency=medium - - [ Steve Langasek ] - * ubuntu-support-status: instead of checking the Release timestamp in - the releases file for every single package on the system, get the - release date from distro-info-data because it will always be the same. - This speeds up the script by > 50% in testing. - - [ Brian Murray ] - * update-manager: Clarify that the "-d" switch is only for upgrading from - the latest supported release to the development release, not any release. - (LP: #1700829) - * Remove --sandbox (aufs support) as it has been broken for some time and - was rather unused. (LP: #1605259) - - -- Brian Murray Wed, 12 Jul 2017 15:03:18 -0700 - -update-manager (1:17.04.3) zesty; urgency=medium - - * Use a 64 bit integer for launch-time instead of a 32 bit one which won't - work someday. (LP: #1654008) - - -- Brian Murray Tue, 14 Mar 2017 14:51:04 -0700 - -update-manager (1:17.04.2) zesty; urgency=medium - - [ Jeremy Bicha ] - * Update alternate dependencies for policykit-1-gnome: - - Add virtual polkit-1-auth-agent - - Replace non-existant policykit-1-kde with polkit-kde-agent-1 - - Replace razorqt-policykit-agent with lxqt-policykit - (since lxqt is the replacement for razorqt) - - [ Manzur Mukhitdinov ] - * UpdateManager/Core/MetaRelease.py: - - Add a clearer error message when a network failure occurs - - [ Brian Murray ] - * UpdateManager/Dialogs.py: - - Remove misleading ellipsis in “Restart Now” action button. Thanks to - Adolfo Jayme for the change. (LP: #1568368) - - [ Steve Langasek ] - * Drop estimate_kernel_size_in_boot() from UpdateManager/Core/utils.py; this - was only used in ubuntu-release-upgrader so the code has now moved there - (with code fixes). Ensure upgrade ordering with Breaks: on older - python3-distupgrade. LP: #1646222. - - -- Steve Langasek Wed, 08 Mar 2017 10:01:30 -0800 - -update-manager (1:17.04.1) zesty; urgency=medium - - * tests/test_hwe_support_status.py: Resolve issues with the test. - * data/gtkbuilder/UpdateManager.ui: Set a minimum content height of 80px for - the technical description scrolled window. This was the default height - gtk3widgets used in GTK versions prior to 3.20. Thanks to Martin Wimpress - for the fix. (LP: #1623856) - - -- Brian Murray Wed, 02 Nov 2016 12:05:25 -0700 - -update-manager (1:16.10.7) yakkety; urgency=medium - - * UpdateManager/Core/MyCache.py: Gracefully handle absence of Launchpadlib - module. - * Lower python3-launchpadlib Depends: to a Suggests:, to avoid pulling it - into "standard" priority. Retrieving PPA changelogs is more of a niche - feature which is relevant for desktops, but shoud not drag the entire - python3-launchpadlib stack into small installations. Add it as Recommends - to the GUI frontends instead, to retain current behaviour on desktops. - - -- Martin Pitt Tue, 11 Oct 2016 12:13:46 +0200 - -update-manager (1:16.10.6) yakkety; urgency=medium - - * UpdateManager/UnitySupport.py: Handle ValueError traceback when checking - for Unity and Dbusmenu support. Thanks to Launchpad user flocculant for - the patch. (LP: #1629900) - - -- Brian Murray Mon, 03 Oct 2016 15:18:31 -0700 - -update-manager (1:16.10.5) yakkety; urgency=medium - - [ Brian Murray ] - * UpdateManager/UpdateManager.py: when marking HWE packages for install pass - on a SystemError and let the problem resolver sort it out. - * HweSupportStatus/consts.py: Improve wording of the messages. - * hwe-support-status: - - decode output when checking for foreign architectures so that the result - is unicode not bytes. - - add libwayland-egl1-mesa to the list of metapackages. - - utilize a virtualbox metapackage set. - - Do not show replacements that are already installed on - the system. (LP: #1607983) - * source_update-manager.py: collect information about the state of HWE - support on the system. (LP: #1617080) - * source_update-manager.py: only collect HWE information if it exists. - - [ Jeremy Bicha ] - * Add gi.require_version in a few more places to reduce the annoying - warnings. (LP: #1573177) - - -- Brian Murray Thu, 08 Sep 2016 16:01:13 -0700 - -update-manager (1:16.10.4) yakkety; urgency=medium - - * ChangelogViewer: Fix an API call to work with GTK < and ≥ 3.20. Upstream - gave gtk_text_view_get_iter_at_location a gboolean return type, which - makes gobject-introspection return (return value, out parameter). (LP: - #1548425) - * ChangelogViewer: Set vexpand so that the changelog TextView takes up all - the remaining vertical space. - - -- Iain Lane Fri, 29 Jul 2016 11:15:54 +0100 - -update-manager (1:16.10.3) yakkety; urgency=medium - - [Nicolas Delvaux] - * Attempt to retrieve Changelogs from PPA sources (LP: #253119) - * Correctly detect the usage of a username in changelog URIs - - -- Brian Murray Wed, 27 Jul 2016 11:14:53 -0700 - -update-manager (1:16.10.2) yakkety; urgency=medium - - * Include HWE support tools and information. (LP: #1498059) - - -- Brian Murray Thu, 21 Jul 2016 14:29:10 -0700 - -update-manager (1:16.10.1) yakkety; urgency=medium - - * Correctly calculate the end of support, and return correctly when support - has ended. Patch from Andrew Gaul, with thanks. - - -- Iain Lane Tue, 10 May 2016 15:32:40 +0100 - -update-manager (1:16.04.3) xenial; urgency=medium - - * Quote URL parameters for the Release Announcement. (LP: #1561215) - - -- Brian Murray Mon, 11 Apr 2016 18:49:09 -0700 - -update-manager (1:16.04.2) xenial; urgency=medium - - [ Tim Lunn ] - * UpdateManage/Core/utils.py: Update to use logind inhibitors (LP: #1566141) - - -- Brian Murray Thu, 07 Apr 2016 11:06:40 -0700 - -update-manager (1:16.04.1) xenial; urgency=medium - - * Update Build-Depends to resolve ftbfs in xenial. - - -- Brian Murray Wed, 06 Apr 2016 15:39:00 -0700 - -update-manager (1:15.10.3) wily; urgency=medium - - * Pass a '#auto' suffix to aptdaemon for packages that are autoinstalled, - so that we have enough information to autoremove them later. Thanks to - Michael Vogt for the patch. LP: #1439769. - * Add versioned dependency on aptdaemon (>= 1.1.1+bzr982-0ubuntu13) for the - above. - - -- Steve Langasek Tue, 06 Oct 2015 21:26:35 -0700 - -update-manager (1:15.10.2) wily; urgency=medium - - * UpdateManager/Core/UpdateList.py: update the binary packages made by the - linux-meta source package. (LP: #1215114) - - -- Brian Murray Mon, 05 Oct 2015 14:51:25 -0700 - -update-manager (1:15.10.1) wily; urgency=medium - - * UpdateManager/Core/MetaRelease.py: When not running in development mode, - if the next release is unsupported do not offer to upgrade to that, but - the release after it. When running in development mode continue to offer - upgrading to unsupported release. (LP: #1497024) - - -- Brian Murray Thu, 17 Sep 2015 15:10:19 -0700 - -update-manager (1:15.04.7) vivid; urgency=medium - - * debian/tests/control: pyflakes3 is provided by pyflakes - - -- Brian Murray Thu, 16 Apr 2015 11:31:00 -0700 - -update-manager (1:15.04.6) vivid; urgency=medium - - * debian/tests/control: switch to using pyflakes3 instead of pyflakes. - - -- Brian Murray Wed, 15 Apr 2015 06:42:10 -0700 - -update-manager (1:15.04.5) vivid; urgency=medium - - * tests/test_pyflakes.py: switch to using pyflakes3 instead of pyflakes. - - -- Brian Murray Tue, 14 Apr 2015 13:21:54 -0700 - -update-manager (1:15.04.4) vivid; urgency=medium - - * Properly check for FileNotFoundError when looking for /etc/machine-id. - (LP: #1443929) - - -- Brian Murray Tue, 14 Apr 2015 07:59:33 -0700 - -update-manager (1:15.04.3) vivid; urgency=medium - - * Allow being a child of 'systemd' as well as 'init' .If we're booted with - e.g. init=/lib/systemd/systemd then the parent will be systemd. - * Use the systemd /etc/machine-id file if available for our unique ID. - - -- Iain Lane Mon, 09 Mar 2015 13:12:13 +0000 - -update-manager (1:15.04.2) vivid; urgency=medium - - * UpdateManager/Core/utils.py: use rpartition in case the process name - contains the right parenthesis character. Thanks to Roman Odaisky for the - patch. (LP: #1399916) - * UpdateManager/Dialogs.py: set the focus to "Restart Later" instead of - "Restart Now", so people don't accidentally reboot. (LP: #1421044) - - -- Brian Murray Wed, 18 Feb 2015 11:38:56 -0800 - -update-manager (1:15.04.1) vivid; urgency=medium - - * debian/control: Don't depend on gir1.2-vte-2.90, we don't use it - (directly) any more. - - -- Iain Lane Mon, 10 Nov 2014 11:44:40 +0000 - -update-manager (1:14.10.6) utopic; urgency=medium - - * UpdateManager/ChangelogViewer.py: update URL for CVEs (LP: #1374715) - - -- Brian Murray Tue, 30 Sep 2014 10:17:13 -0700 - -update-manager (1:14.10.5) utopic; urgency=medium - - [ Yu-Cheng Chou ] - * UpdateManager/UpdateManager.py: _on_close() should return the value to make - close button work properly (LP: #1363580) - - -- Michael Vogt Tue, 02 Sep 2014 17:43:02 +0200 - -update-manager (1:14.10.4) utopic; urgency=medium - - * Fix test_url_downloadable() with proxis: ensure that $no_proxy doesn't - prevent us from accessing localhost through proxy. - - -- Martin Pitt Thu, 28 Aug 2014 14:49:40 +0200 - -update-manager (1:14.10.3) utopic; urgency=low - - [ Mitsuya Shibata ] - * lp:~cosmos-door/ubuntu/trusty/update-manager/fix1358229: - - ensure all scripts are treated as python by gettext - LP: #1358229 - - -- Michael Vogt Mon, 18 Aug 2014 13:36:51 +0200 - -update-manager (1:14.10.2) utopic; urgency=low - - * pep8 fixes to fix autopkgtest failure with the latest pep8 - - -- Michael Vogt Thu, 26 Jun 2014 09:04:25 +0200 - -update-manager (1:14.10.1) utopic; urgency=low - - * fix ADT failure - - -- Michael Vogt Fri, 16 May 2014 15:42:20 +0200 - -update-manager (1:14.10.0) utopic; urgency=low - - * make meta-release parser stricter to avoid storing the data - that e.g. intercepting proxies send (LP: #1310891) - - -- Michael Vogt Fri, 16 May 2014 14:34:45 +0200 - -update-manager (1:0.196.12) trusty-proposed; urgency=low - - * use Gtk.init() to ensure update-manager fails with a - runtime error message instead of crashing if the display - can not be opened (LP: #1269397) - - -- Michael Vogt Thu, 24 April 2014 14:58:38 +0200 - -update-manager (1:0.196.11) trusty; urgency=low - - * lp:~mvo/update-manager/lp1202754: - - do nt crash if the user clicks "cancel" in the polkit dialog - (LP: #1202754) - - -- Michael Vogt Thu, 10 Apr 2014 14:29:00 +0200 - -update-manager (1:0.196.10) trusty; urgency=low - - * debian/control: - - add dependencies to the various policykit agents to ensure - that update-manager is not run without policykit agent support - in the session (LP: #1164558) - * tests/test_update_list.py: - - test improvements from Barry Warsaw (many thanks!) - - -- Michael Vogt Mon, 07 Apr 2014 15:23:05 +0200 - -update-manager (1:0.196.9) trusty; urgency=medium - - [ Sebastien Bacher ] - * UpdateManager/UpdatesAvailable.py: - - use the correct icon theme (lp: #1283554) - - [ Marc Deslauriers ] - * UpdateManager/Dialogs.py: close window after requesting reboot. - (LP: #1297361) - - [ Michael Vogt ] - * tests/aptroot-update-list-test: - - fix test failure caused by not-installable depends (lp: #1295392) - - -- Michael Vogt Wed, 26 Mar 2014 12:52:13 +0100 - -update-manager (1:0.196.8) trusty; urgency=medium - - * source_update_manager.py: set response to None if the problem type is not - a bug - * UpdateManager/Core/utils.py: do not perform DNS lookups with iptables, - thanks to John Edwards for the patch. (LP: #1290825) - - -- Brian Murray Mon, 17 Mar 2014 09:38:09 -0700 - -update-manager (1:0.196.7) trusty; urgency=medium - - * Fix PEP-8 style error to fix tests. - - -- Martin Pitt Thu, 16 Jan 2014 12:58:07 +0100 - -update-manager (1:0.196.6) trusty; urgency=low - - * Allow user to close the restart required dialog (LP: #1033226) - - Add a settings button - - Add a "Restart Later" button - - Rename existing button to "Restart Now..." - - Add secondary text to updates dialog when a restart is still pending - from last updates - - -- Marc Deslauriers Sat, 11 Jan 2014 09:53:15 -0500 - -update-manager (1:0.196.5) trusty; urgency=medium - - * Stop using deprecated GObject constructors with positional arguments - (see https://wiki.gnome.org/PyGObject/InitializerDeprecations). - - -- Martin Pitt Fri, 10 Jan 2014 12:29:35 +0100 - -update-manager (1:0.196.4) trusty; urgency=low - - * lp:~mterry/update-manager/requires-restart: - - warn if a update requires a reboot (LP: #255443) - - This requires that the packages that need a reboot set - "XB-Restart-Required: system" in the package record - - -- Michael Vogt Tue, 07 Jan 2014 19:51:50 +0100 - -update-manager (1:0.196.3) trusty; urgency=low - - [ Sebastien Bacher ] - * lp:~seb128/update-manager/check-none-controller - - Check for controller being None before using it (this was - accidentally dropped in a previous refactoring). - - LP: #1203919 - - -- Barry Warsaw Tue, 10 Dec 2013 17:15:04 -0500 - -update-manager (1:0.196.2) trusty; urgency=low - - [ Brian Murray ] - * UpdateManager/Core/MetaRelease.py: speed up the check for a new release of - Ubuntu. Thanks to Anders Kaseorg for the patch. - - [ Sebastien Bacher ] - * lp:~seb128/update-manager/box-use-vertical-space: - - Use the vertical space, GTK 3.10 displays the box shrinked otherwise - - -- Michael Vogt Thu, 28 Nov 2013 18:30:26 +0100 - -update-manager (1:0.196.1) trusty; urgency=low - - * debian/source_update_manager.py: Fix too long line (pep8 error). - - -- Brian Murray Thu, 24 Oct 2013 13:31:42 -0700 - -update-manager (1:0.196) trusty; urgency=low - - * In the apport hook ask if the bug is about upgrading from one release to - another and send bug to ubuntu-release-upgrader. (LP: #1071057) - - -- Brian Murray Thu, 24 Oct 2013 10:03:28 -0700 - -update-manager (1:0.195) trusty; urgency=low - - * Add support for logind to the restart dialog. Thanks to Thaddaus - Tintenfisch for the patch. (LP: #1232363) - - -- Brian Murray Tue, 22 Oct 2013 15:58:47 -0700 - -update-manager (1:0.194) saucy; urgency=low - - * Fix a bug introduced in the dialog refactor from version 1:0.189 that - causes update-manager to crash instead of showing a dialog when there are - no updates to apply but the system needs rebooted. LP: #1219414. - - -- Steve Langasek Thu, 03 Oct 2013 13:31:18 -0700 - -update-manager (1:0.193) saucy; urgency=low - - * Fix PEP-8 errors. - - -- Brian Murray Fri, 30 Aug 2013 16:13:02 -0700 - -update-manager (1:0.192) saucy; urgency=low - - * Core/UpdateList.py: if a package is an ignored phased update mark it for - keeping (LP: #1211511) - - -- Brian Murray Fri, 30 Aug 2013 14:50:01 -0700 - -update-manager (1:0.191) saucy; urgency=low - - * Fix update-manager crashing when trying to raise - window. on_button_install_clicked takes only one positional argument, - not two. (LP: #1202959) - - -- Dmitrijs Ledkovs Sun, 25 Aug 2013 01:49:08 +0100 - -update-manager (1:0.190) saucy; urgency=low - - * Update for python-distutils-extra 2.38 (yelp-tools style help) - - -- Jeremy Bicha Tue, 23 Jul 2013 11:01:19 +0200 - -update-manager (1:0.189) saucy; urgency=low - - [ Jeremy Bicha ] - * Drop unused system-software-update icons since it is a - standard theme icon - - [ Robert Roth ] - * Remove dist-upgrade option description from manpage (LP: #1079136) - - [ Dylan McCall ] - * Refactor dialogs to have a common base. - * tests/test_update_error.py: Fix test regression from the above. - - [ Martin Pitt ] - * Drop obsolete GObject.threads_init() calls to avoid warnings at startup. - Bump python-gi dependency accordingly. - * Drop unused imports and assignments to fix pyflakes errors. - * Fix PEP-8 errors. - * tests/test_update_error.py: Adjust test_error_no_updates() to current - string. - - -- Martin Pitt Fri, 12 Jul 2013 08:02:21 +0200 - -update-manager (1:0.188) saucy; urgency=low - - * Core/UpdateList.py: Drop unused "src_name" variable (pyflakes error). - * tests/test_update_list.py: Fix too long line (pep8 error). - - -- Martin Pitt Thu, 06 Jun 2013 08:00:33 +0200 - -update-manager (1:0.187) saucy; urgency=low - - [ Sami Jaktholm ] - * Greatly speed up update calculation (LP: #1167277) - - [ Martin Pitt ] - * Drop unnecessary ubuntu-drivers-common build dependency, to ease - backporting. - - [ Brian Murray ] - * Modify phased update percentage to use source packages and not binary - packages, additionally add a test for this. - * Remove check for update-notifier auto-launch gsettings key - - -- Brian Murray Wed, 05 Jun 2013 10:02:51 -0700 - -update-manager (1:0.186) raring; urgency=low - - [ Sebastien Bacher ] - * Use correct variable in error message, fixing a crash (LP: #1142151) - - -- Michael Terry Tue, 16 Apr 2013 13:46:41 -0400 - -update-manager (1:0.185) raring; urgency=low - - [ Sebastien Bacher ] - * Specify a background color for the unity launcher icon (lp: #1081691) - - [ Michael Terry ] - * Look for to-be-updated application icons in app-install-data - (LP: #1145157) - - -- Michael Terry Fri, 15 Mar 2013 10:16:44 -0400 - -update-manager (1:0.184) raring; urgency=low - - [ Michael Terry ] - * Don't temporarily freeze when calculating which updates are available. - LP: #1137996 - - [ Colin Watson ] - * Allow removals with only Conflicts+Replaces; while policy 7.6.2 quotes - Provides in an example, it's clear that Conflicts+Replaces alone should - be sufficient to indicate that the target package may be removed. - - -- Colin Watson Wed, 06 Mar 2013 12:36:41 +0000 - -update-manager (1:0.183) raring; urgency=low - - [ Mike Terry ] - * Fix toggling items after doing a deselect-all. (LP: #1129191) - - [ Colin Watson ] - * Fix PEP-8 failures. - * Fix pyflakes failures. - * Depend on pep8 and pyflakes for the autopkgtest suite. - * Use logging.warning rather than deprecated logging.warn. - * Fix test_meta_release_core.SillyProxyRequestHandler to write bytes - rather than text to its output file object. - * Make test_meta_release_core pick a new proxy port for each test. - * Use EnvironmentVarGuard in test_meta_release_core to reduce the risk of - test isolation bugs. - * MetaReleaseCore: Plug some open file object leaks. - * Make test_meta_release_core call install_opener(None) every time it - changes proxy settings, to avoid stale ones being left around from - previous tests. - * Reopen cache in GroupingTestCase.setUp, TestCache.setUp, and - TestChangelogs.setUp to avoid test isolation bugs. - * Remove unnecessary cache update in PhasedTestCase.setUp; reopening the - cache is sufficient. - * Allow saveDistUpgrade to remove packages provided that upgrade - candidates declare Conflicts+Replaces+Provides on them (LP: #1038113). - - [ Steve Langasek ] - * Build-depend on python3-all (>= 3.3.0-2) for pybuild support and drop - the now-extraneous overrides from debian/rules; this incidentally works - around an issue I don't understand where the package was now failing to - build locally from trying to invoke python setup.py instead of python3. - - -- Colin Watson Mon, 25 Feb 2013 17:31:29 +0000 - -update-manager (1:0.182) raring; urgency=low - - * MetaReleaseCore: Create ~/.cache if it does not exist. - - -- Colin Watson Mon, 18 Feb 2013 15:06:57 +0000 - -update-manager (1:0.181) raring; urgency=low - - * Use the gnome debconf frontend, accidentally dropped in update-manager - 1:0.165 (LP: #1110585). - - -- Michael Terry Thu, 07 Feb 2013 09:22:59 +0000 - -update-manager (1:0.180) raring; urgency=low - - [ Dylan McCall ] - * Make sure text in Install column properly uses ellipses. (LP: #1105363) - * Refactor CellAreaPackage class for ease of future changes. - - -- Barry Warsaw Tue, 29 Jan 2013 16:15:57 -0500 - -update-manager (1:0.179) raring; urgency=low - - * Properly xml-escape application names too, not just package labels - * Make sure dialog buttons are actually at the bottom of the dialog - - -- Michael Terry Fri, 25 Jan 2013 10:41:00 -0500 - -update-manager (1:0.178) raring; urgency=low - - * Implement the "available updates" details pane from the SoftwareUpdates - spec. Specifically, this adds grouping of related updates, adds an - "Ubuntu base" group for core packages, and shows only the description - summary in the main view. - * Show a restart icon next to packages that declare they will need a - system restart via XB-Restart-Required: system - - -- Michael Terry Thu, 24 Jan 2013 14:20:22 -0500 - -update-manager (1:0.177) raring; urgency=low - - * Fix missing import in tests/test_upgrade.py. - * Make tests/test_update_list.py more robust against other tests being run - before it. - * Depend on aptdaemon for DEP-8 tests. - * Fix typo in test dpkg status file for test_update_list. - * Add Update-Manager::Never-Include-Phased-Updates, the converse of - Update-Manager::Always-Include-Phased-Updates; this opts out of - upgrading to any package with a Phased-Update-Percentage set. - - -- Colin Watson Wed, 16 Jan 2013 12:46:00 +0000 - -update-manager (1:0.176) raring; urgency=low - - * Use GLib.timeout_add_seconds instead of deprecated GObject.timeout_add - * Keep dialogs 33em wide - * Pass update-manager arguments on to do-release-upgrade (LP: #1097907) + * fix crash in UpdateManager.Core.utils.error(), thanks to + Christian Parrino (LP: #964674) - -- Michael Terry Wed, 09 Jan 2013 16:03:52 -0500 + -- Brian Murray Fri, 05 Oct 2012 11:34:26 -0700 -update-manager (1:0.175) raring; urgency=low +update-manager (1:0.156.14.9) precise-proposed; urgency=low - [ Eric Williams ] - * German translation fix (LP: #1070289) + * No change rebuild to pick up the fixed apt_clone.py - [ Stephen Kraemer ] - * UpdateManager/Dialogs.py: made Settings... button open software-properties - non-modally. (LP: #1058070) + -- Stéphane Graber Thu, 09 Aug 2012 17:05:37 -0400 - [ Robert Roth ] - * Remove package count badge from the unity launcher (LP: #1036891) - * Added 6px border to the button box to align the buttons with the contents - above (LP: #1081099) +update-manager (1:0.156.14.8) precise-proposed; urgency=low - [ Michael Vogt ] - * debian/rules: - - do not call dh_auto_build as as it call py2 even when its not - supposed to (LP: #1089808), thanks to Jean-Baptiste Lallement - * fix missing "Architecture" when writing out the fake dpkg-status - file in the tests (LP: #1089793) + * Fix removal_blacklist to blacklist "^screen$" instead of "screen". + This fixes cases where the upgrade would fail because of a package + containing "screen" being removed. (LP: #1029531) - -- Michael Vogt Tue, 30 Oct 2012 09:09:13 +0100 + -- Stéphane Graber Wed, 08 Aug 2012 17:52:47 -0400 -update-manager (1:0.174.3) quantal; urgency=low +update-manager (1:0.156.14.7) precise-proposed; urgency=low - * UpdateManager/UpdatesAvailable.py: - - never pass "None" to xml.sax.saxutils.escape (LP: #1044080) + * DistUpgrade/DistUpgradeMain.py: call clone.save_state with + scrub_sources set so that VarLogDistUpgradeAptclonesystemstate will be + included in bug reports again (LP: #1029046) + * DistUpgrade/DistUpgradeApport.py: check errormsg for the English version of + the dependency problems error first (LP: #999890) + - add apt-clone_system_state.tar.gz to white list of files to upload + * In the apport source package hook collect apt-clone information if the bug + report is about a distribution upgrade (LP: #1029046) + * Don't throw exception on socket timeout when downloading metarelease file + (LP: #818760) - -- Michael Vogt Wed, 10 Oct 2012 10:21:50 +0200 + -- Brian Murray Thu, 26 Jul 2012 11:58:16 -0700 -update-manager (1:0.174.2) quantal; urgency=low +update-manager (1:0.156.14.6) precise-proposed; urgency=low - [ Michael Vogt ] - * fix crash in UpdateManager.Core.utils.error(), thanks to - Christian Parrino (LP: #964674) - - [ Michael Terry ] - * Stop showing Install All Available Updates quicklist item when it isn't - appropriate (LP: #1031307). - - -- Brian Murray Thu, 04 Oct 2012 08:20:44 -0700 - -update-manager (1:0.174.1) quantal; urgency=low - - * po/POTFILES.in: - - add missing InstallBackendAptdaemon.py, thanks to Igor Zubarev - (LP: #1055594) - - -- Michael Vogt Tue, 25 Sep 2012 09:35:54 +0200 - -update-manager (1:0.174) quantal; urgency=low - - * UpdateManager/ChangelogViewer.py: improve url parsing of changelog files - so that more links are created. Thanks to sampo555 for the patch - (LP: #1011093). - * Add a dependency to update-manager on update-notifier (LP: #1043725) - - -- Brian Murray Wed, 19 Sep 2012 09:56:12 -0700 - -update-manager (1:0.173) quantal; urgency=low - - * Make update-manager-core depend on ubuntu-release-upgrader-core and - update-manager-kde depend on ubuntu-release-upgrader-qt, so that - functionality isn't lost on upgrade (LP: #1049062). - - -- Colin Watson Tue, 11 Sep 2012 12:45:50 +0100 - -update-manager (1:0.172) quantal; urgency=low - - * Remove dependency on update-notifier as it added many dependencies to - cloud-images. - - -- Brian Murray Fri, 07 Sep 2012 07:54:26 -0700 - -update-manager (1:0.171) quantal; urgency=low - - [ Michael Terry ] - * Fix test suite to pass when run on non-amd64 machine - - [ Brian Murray ] - * Add a dependency on update-notifier (LP: #1043725) - - -- Brian Murray Wed, 05 Sep 2012 12:20:31 -0700 - -update-manager (1:0.170) quantal; urgency=low - - * When user cancels/stops the apt cache update, still let them - view available updates from a previous cache update. LP: #1024909 - - -- Michael Terry Fri, 24 Aug 2012 19:05:38 -0400 - -update-manager (1:0.169) quantal; urgency=low - - [ Michael Terry ] - * Drop Unity-support gir Recommends down to Suggests. LP: #1029764 - - [ sampo555 ] - * lp:~sampo555/update-manager/fix-for-1031280: - - Convert SystemError into string in order to avoid TypeError in - UpdateManager.refresh_cache SystemError handles. Fixes LP: #1031280 - - [ Robert Park ] - * Allow test suite to not need to be run as root - - [ Michael Vogt ] - * lp:~mvo/update-manager/phased-updates: - - Implement the client part of the "foundations-q-phased-updates". - This allows to deploy updates in phases where only a subset of - the users will get a update, controlled via the - Phased-Updates-Percentage tag in the Packages file. - - -- Michael Vogt Tue, 21 Aug 2012 09:21:32 +0200 - -update-manager (1:0.168) quantal; urgency=low - - * Run tests under xvfb and don't try to use non-existant python3-coverage - * Don't throw exception on socket timeout when downloading metarelease - file. LP: #818760 - - -- Michael Terry Mon, 23 Jul 2012 07:17:00 +0200 - -update-manager (1:0.167) quantal; urgency=low - - * Rebuild to get python3 wrapper script (LP: #1023474) - - -- Michael Terry Wed, 11 Jul 2012 09:28:45 -0400 - -update-manager (1:0.166) quantal; urgency=low - - [ Colin Watson ] - * Write metarelease file as UTF-8 (LP: #1020526) - - [ Michael Terry ] - * Use a wrapper script of /bin/sh when calling pkexec, to workaround its - requirement that the ppid not be 1. (LP: #1020115) - * Update Unity badge count before showing "please restart" dialog - * Don't allow closing the "please restart" dialog via window manager - * Show "please restart" dialog on startup if needed, instead of only - after installing some updates - - -- Colin Watson Tue, 10 Jul 2012 11:39:44 +0100 - -update-manager (1:0.165) quantal-proposed; urgency=low - - * Implementation of "update on start" feature from spec - https://wiki.ubuntu.com/SoftwareUpdates - * Use a single main window that changes instead of having modal dialogs - * Implement several special-purpose dialogs like "No updates" or - "Dist upgrade needed" accordingn to the above spec - * Split out release upgrader code and DistUpgrade module into a separate - source package - * Drop python-update-manager, as it is unused - * debian/tests: - - Add dep8 tests - - -- Michael Terry Fri, 29 Jun 2012 10:59:30 -0400 - -update-manager (1:0.164) quantal; urgency=low - - [ Brian Murray ] - * DistUpgrade/DistUpgradeApport.py: ensure package install failures are - tagged dist-upgrade - - [ Robert Roth ] - * UpdateManager/UpdateManager.py: check for None type from - get_last_update_minutes (LP: #1013325) - - [ Colin Watson ] - * DistUpgrade/NvidiaDetector, debian/control: Update symlink to Python 3 - version, available as of ubuntu-drivers-common 1:0.2.55. - * debian/rules: Make sure to run setup.py with the default python3 last, - so that scripts get correct #! lines. - - [ Barry Warsaw ] - * pre-build.sh: - - Add python-gi as an explicit dependency. - - python3-mock is required. - * setup.py: - - Fix the installation of the janitor.plugincore package for Python 3. - (LP: #1013490) - - Calculate the setup() version number from debian/changelog. - - Remove package_dir since it's not actually needed. - - Whitespace normalization. - * tests/Makefile - - Add sleep between Python 2 and Python 3 invocation of tests under - xvfb-run, otherwise I get crashes where xvfb doesn't come up. - - -- Barry Warsaw Thu, 21 Jun 2012 20:42:23 -0400 - -update-manager (1:0.163) quantal; urgency=low - - [ Colin Watson ] - * Isolate tests from local configuration in - /etc/update-manager/release-upgrades.d/. - * Use Python attributes rather than GObject.get_data and GObject.set_data, - which have been removed upstream (LP: #1009859). - * Switch default view class to Gtk3 and replace python-gobject dependency - with python-gi. - * Port away from old-style apt.Package candidateFoo and installedFoo - properties, preferring candidate.foo and installed.foo. In a number of - cases we have to check whether candidate/installed is non-None first. - * Use apt_pkg.version_compare rather than apt_pkg.VersionCompare. - * Use apt_pkg.uri_to_filename rather than apt_pkg.URItoFileName. - * Use apt_pkg.TagFile (and related new-style API) rather than - apt_pkg.ParseTagFile. - * Use apt_pkg.PackageManager rather than apt_pkg.GetPackageManager. - * Use apt_pkg.Acquire rather than apt_pkg.GetAcquire. - * Use mark_foo/marked_foo rather than markFoo/markedFoo. - * Use apt_pkg.ActionGroup rather than apt_pkg.GetPkgActionGroup. - * Use apt_pkg.ProblemResolver rather than apt_pkg.GetPkgProblemResolver. - * Use apt_pkg.read_config_file rather than apt_pkg.ReadConfigFile. - * Use new spelling of apt_pkg.DepCache methods. - * Rename several local cache methods to PEP-8 style to avoid showing up in - the output of /usr/share/python-apt/migrate-0.8.py. - * Use apt_pkg.size_to_str rather than apt_pkg.SizeToStr. - * Use apt_pkg.PackageManager.get_archives rather than - apt_pkg.PackageManager.GetArchives. - * Use apt_pkg.Acquire.fetch_needed rather than - apt_pkg.Acquire.FetchNeeded. - * Use new spelling of apt_pkg.Package/Version/Dependency methods. - * Use apt_pkg.pkgsystem_lock rather than apt_pkg.PkgSystemLock. - * Use new spelling of apt_pkg dependency parsing methods. - * Use new spelling of apt_pkg.SourceList methods. - * Bump python-apt (build-)dependency to >= 0.8.0. - * Add a scheme for excluding false positives from the pyflakes test, and - enable it by default. - * Rearrange the OptionParser workaround from 1:0.154.5 to work with Python - 3, using gettext or ugettext as appropriate. - * Always pass bytes to hashlib.md5.update. - * Fix DistUpgradeAptCdrom to account for gzip files being opened in binary - mode. - * Convert the last use of os.popen to subprocess.check_output, which makes - it easier to read str rather than bytes. (This requires Python 2.7.) - * Decode bytes read from urlopened file objects. - * UpdateManager/backend/InstallBackendSynaptic.py - - Keep a reference to the data tuple passed to GObject.child_watch_add - to avoid attempts to destroy it without a thread context - (LP: #724687). - - Open temporary synaptic selections file in text mode. - * Define __bool__ rather than __nonzero__ method in Python 3. - * sort(cmp=) and sorted(cmp=) no longer work in Python 3. Use appropriate - key= arguments instead. - * Fix ResourceWarning while reading /proc/mounts. - * Make update-manager-kde depend on psmisc, for killall. - * DistUpgrade/DistUpgradeView.py: - - Use floor division in FuzzyTimeToStr. - * DistUpgrade/DistUpgradeViewText.py: - - Flush stdout after printing confirmation message, since it doesn't - have a trailing newline. - * Use the appropriate Unicode gettext methods in both Python 2 and 3, and - drop lots of Python-3-unfriendly Unicode mangling as a result. - * DistUpgrade/DistUpgradeViewKDE.py: - - Open the terminal log in binary mode. - * data/do-release-upgrade.8: - - Provide a more useful NAME section. + * lp:~ember/update-manager/ubuntu.bug1002956: + - fix missing ReleaseNotesViewerWebkit.py support, thanks to + Pedro Fragoso (LP: #1002956) * DistUpgrade/DistUpgradeCache.py: - - Tolerate SyntaxError from attempting to import NvidiaDetector, until - such time as a complete ubuntu-drivers-common Python 3 port is in the - archive. - * Switch #! lines over to python3, apart from dist-upgrader which needs to - stay as Python 2 for a while longer (and have some special arrangement - for running with Python 3 for upgrades from >= quantal). - * Run tests under both Python 2 and 3. - - [ Adam Conrad ] - * Merge branch from Michael Terry to drop auto-upgrade-tester - from update-manager and move it into its own source package - - [ Barry Warsaw ] - * Begin refactoring of Computer Janitor code by renaming and - re-situating all of it to janitor/plugincore. This will eventually be - removed from here into its own separate branch. - * Merge the temporary Python 3 sprint branch back into trunk, and close - the py3 sprint branch. - * Moved UpdateManager/backend and UpdateManager/UnitySupport.py to the - python*-update-manager packages for apturl. - - [ Michael Vogt ] - * UpdateManager/GtkProgress.py: - - fix python-apt 0.8 API crash - - [ Stéphane Graber ] - * Drop fdsend as it's not used and doesn't build with python3. - * Make update-manager-core a binary all packages (everything is python). - * Split update-manager-core into python-update-manager, - python3-update-manager and update-manager-core. - * Build-depend and depend on python-apt >= 0.8.5~ as we need proper - python3 support. - - [ Steve Langasek ] - * tests/test_country_mirror.py: the test suite shouldn't fail if $LANG - isn't set in the environment. - * update-manager is now using python3 as an interpreter, so fix these up - to actually be python3 packages. - - -- Colin Watson Thu, 14 Jun 2012 00:57:42 +0100 - -update-manager (1:0.162) quantal; urgency=low - - * DistUpgrade/build-tarball.sh: - - include "DistUpgrade" symlink in tarball to ensure relative - imports keep working - - -- Michael Vogt Mon, 04 Jun 2012 14:27:50 +0200 - -update-manager (1:0.161) quantal; urgency=low - - * /usr/share/nvidia-common/obsolete was renamed to - /usr/share/ubuntu-drivers-common/obsolete and moved packages. Cope with - this. - - -- Colin Watson Fri, 01 Jun 2012 20:53:46 +0100 - -update-manager (1:0.160) quantal; urgency=low - - [ Colin Watson ] - * Use Python 3-style print functions. - * Use "except Exception as e" syntax rather than the old-style "except - Exception, e". - * Fix a few assorted pyflakes warnings. - * Use string methods rather than functions from the string module. - * Replace most uses of filter and map with list comprehensions or for - loops. - * Use open() rather than file(). - * Use Python 3 renaming of ConfigParser if available. - * Use "raise Exception(value)" syntax rather than the old-style "raise - Exception, value". - * Remove duplicate imports of os.path; 'import os' is enough. - * Use Python 3 renamings of urllib, urllib2, and urlparse if available. - * Remove all hard tabs from Python code. Python 3 no longer tolerates - mixing tabs and spaces for indentation. - * Use Python 3 renaming of httplib if available. - * Use email.utils.parsedate (with a DST handling correction) rather than - the long-deprecated rfc822.parsedate. - * Use the threading module instead of thread (renamed to _thread in Python - 3). - * Tell Python to use absolute imports by default, and annotate cases where - we need relative imports. - * Update test_proxy to use gsettings and the python-apt 0.8 API. - * Use new-style octal literals. - * Drop use of deprecated statvfs module. - * Use Python 3 renamings of BaseHTTPServer and SocketServer if available. - * Modernise use of unittest methods. - * Use python-apt 0.8 API spellings of apt_pkg.config methods. - * Fix several ResourceWarnings with Python 3. - * Port to python-apt 0.8 progress classes. - * Since python-gnupginterface is not likely to be ported to Python 3, and - since it's almost just as easy to call gpg directly via subprocess, do - so. - * Use gettext if ugettext does not exist (as in Python 3). - * Ignore __pycache__ directories, and exclude them from dist-upgrader - tarballs. - * Fix up module path when running AutoUpgradeTester/auto-install-tester.py - from the build tree. - * Add a DistUpgrade -> . symlink in DistUpgrade/, to make it possible to - have compatible imports both in update-manager proper and in - dist-upgrader tarballs. - * Use only absolute imports in AutoUpgradeTester/auto-install-tester.py - and DistUpgrade/dist-upgrade.py; these have no __package__ and so cannot - use relative imports. - * Open subprocesses with universal_newlines=True when expecting to read - text from them. On Python 2, this only enables \r\n conversion and the - like, but on Python 3 this also causes subprocess-related file objects - to read str rather than bytes. - * Use "key in dict" rather than "dict.has_key(key)". - * Pass globals() to __import__ so that relative imports work. - - [ Michael Vogt ] - * DistUpgrade/*.py: - - update for the 12.04 -> 12.10 upgrade - * AutoUpgradeTester/profile/defaults.cfg.d/defaults.cfg: - - update for precise->quantal - * fix some remaining python-apt 0.8+ API issues - - [ Brian Murray ] - * DistUpgrade/DistUpgradeApport.py - - check errormsg for the English version of the dependency problems error - first (LP: #999890) - - [ Michael Terry ] - * Rename to Software Updater and fix some other strings to match mpt's - spec. - * lp:~mterry/update-manager/move-changelogs: - - implement new app layout + - increase estimated kernel size slightly to match the precise + kernels + * fix automatic expand of the terminal if no activity happend + for >300s (LP: #979661) + * DistUpgrade/ReleaseAnnouncement: + - add "LTS" to the version - -- Michael Vogt Fri, 01 Jun 2012 17:48:54 +0200 + -- Michael Vogt Wed, 20 Jun 2012 19:52:49 +0200 -update-manager (1:0.156.14.5) UNRELEASED; urgency=low +update-manager (1:0.156.14.5) precise-security; urgency=low - * lp:~ember/update-manager/ubuntu.bug1002956: - - fix missing ReleaseNotesViewerWebkit.py support, thanks to - Pedro Fragoso (LP: #1002956) + * SECURITY UPDATE: Incomplete fix for CVE-2012-0949 (LP: #1004503) + - DistUpgrade/DistUpgradeApport.py: use a whitelist of files so we + don't upload system_state archives. + - tests/test_apport_crash.py: add test. + - CVE-2012-0950 - -- Michael Vogt Wed, 23 May 2012 11:26:59 +0200 + -- Marc Deslauriers Thu, 31 May 2012 13:05:04 -0400 update-manager (1:0.156.14.4) precise-security; urgency=low @@ -1103,7 +122,7 @@ update-manager (1:0.156.14.2) precise-proposed; urgency=low * fix automatic expand of the terminal if no activity happend - for >300s (LP: #979661) + for >300s (LP: #993190) -- Michael Vogt Fri, 04 May 2012 11:46:09 -0700 diff -Nru update-manager-17.10.11/debian/compat update-manager-0.156.14.15/debian/compat --- update-manager-17.10.11/debian/compat 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/debian/compat 2017-12-23 05:00:38.000000000 +0000 @@ -1 +1 @@ -9 +5 diff -Nru update-manager-17.10.11/debian/control update-manager-0.156.14.15/debian/control --- update-manager-17.10.11/debian/control 2017-08-31 16:17:31.000000000 +0000 +++ update-manager-0.156.14.15/debian/control 2017-12-23 05:00:38.000000000 +0000 @@ -1,33 +1,28 @@ Source: update-manager Section: gnome Priority: optional -Maintainer: Ubuntu Developers -Build-Depends: debhelper (>= 9), - python3-all (>= 3.3.0-2), - python3-distutils-extra (>= 2.38), - python3-dbus, - python3-gi (>= 3.8), - python3-yaml, - gir1.2-gtk-3.0, +Maintainer: Michael Vogt +Build-Depends: debhelper (>= 7.0.50~), + python-all-dev, + python-distutils-extra (>= 1.90), + python-apt (>= 0.7.5), lsb-release, - apt-clone (>= 0.2.3~ubuntu1) + nvidia-common (>= 0.2.11) [i386 amd64], + apt-clone (>= 0.2.2ubuntu1) Build-Depends-Indep: libxml-parser-perl, + scrollkeeper, intltool Standards-Version: 3.8.0 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/update-manager/main -XS-Testsuite: autopkgtest -X-Python3-Version: >= 3.2 Package: update-manager-core -Architecture: all +Architecture: any Section: admin -Depends: ${python3:Depends}, +Depends: ${python:Depends}, ${misc:Depends}, - python3-update-manager (= ${source:Version}), - python3-distro-info, - distro-info-data, - lsb-release, - ubuntu-release-upgrader-core + python-apt (>= 0.7.13.4ubuntu3), + lsb-release, + python-gnupginterface Recommends: libpam-modules (>= 1.0.1-9ubuntu3) Replaces: update-manager (<< 1:0.146.2) Breaks: update-manager (<< 1:0.146.2), @@ -35,42 +30,20 @@ Description: manage release upgrades This is the core of update-manager and the release upgrader -Package: python3-update-manager -Architecture: all -Section: python -Replaces: update-manager-core (<< 1:0.163) -Breaks: update-manager-core (<< 1:0.163), - python3-distupgrade (<< 1:16.10.10) -Depends: ${python3:Depends}, - ${misc:Depends}, - python3-apt (>= 0.8.5~), - python3-distupgrade, - lsb-release, -Suggests: python3-launchpadlib, -Description: python 3.x module for update-manager - Python module for update-manager (UpdateManager). - . - This package contains the python 3.x version of this module. - Package: update-manager Architecture: all -Depends: ${python3:Depends}, ${misc:Depends}, +Depends: ${python:Depends}, ${misc:Depends}, update-manager-core (= ${source:Version}), - python3-aptdaemon.gtk3widgets (>= 1.1.1+bzr982-0ubuntu13) | synaptic, - policykit-1, - python3-dbus, - python3-gi (>= 3.8), - python3-yaml, + python-aptdaemon.gtk3widgets (>= 0.40) | synaptic, + gksu, + python-dbus, + python-gobject (>= 2.28.6-2), + gir1.2-vte-2.90, gir1.2-gtk-3.0, - ubuntu-release-upgrader-gtk, - update-notifier, - policykit-1-gnome | polkit-kde-agent-1 | lxpolkit | lxqt-policykit | mate-polkit | polkit-1-auth-agent -Breaks: update-notifier (<< 3.177) Recommends: software-properties-gtk (>= 0.71.2), - python3-launchpadlib, - libgtk2-perl -Suggests: gir1.2-dbusmenu-glib-0.4, - gir1.2-unity-5.0, + gir1.2-dbusmenu-gtk-0.4, + gir1.2-unity-5.0, + gir1.2-webkit-3.0 Description: GNOME application that manages apt updates This is the GNOME apt update manager. It checks for updates and lets the user choose which to install. @@ -78,10 +51,10 @@ Package: update-manager-text Architecture: all Section: admin -Depends: ${python3:Depends}, +Depends: ${python:Depends}, ${misc:Depends}, update-manager-core, - python3-newt + python-newt Description: Text application that manages apt updates This is the newt apt update manager. It checks for updates and lets the user choose which to install. @@ -89,14 +62,24 @@ Package: update-manager-kde Architecture: all Section: kde -Depends: ${python3:Depends}, +Depends: ${python:Depends}, ${misc:Depends}, update-manager-core, - python3-pykde4, - kdesudo, - psmisc, - ubuntu-release-upgrader-qt -Recommends: python3-launchpadlib + python-kde4, + kdesudo Description: Support modules for Muon Notifier and Apper Support modules for Muon Notifier and Apper to check for new distro releases and download the dist-upgrade tool. + +Package: auto-upgrade-tester +Architecture: all +Section: devel +Depends: ${python:Depends}, ${misc:Depends} +Recommends: qemu-kvm|kvm, + ubuntu-vm-builder +Suggests: default-jre-headless | java2-runtime-headless +Description: Test release upgrades in a virtual environment + A tool to do QA for release upgrades in ubuntu that performs upgrades + in a virtual environment. Supported backends are "chroot", "kvm" and + "EC2". It will also install a hudson/jenkins slave (disabled by + default). diff -Nru update-manager-17.10.11/debian/python3-update-manager.install update-manager-0.156.14.15/debian/python3-update-manager.install --- update-manager-17.10.11/debian/python3-update-manager.install 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/debian/python3-update-manager.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/Core -debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/UpdateManagerVersion.py -debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/UnitySupport.py -debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/__init__.py -debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/backend -debian/tmp/usr/lib/python3*/dist-packages/HweSupportStatus -debian/tmp/usr/lib/python3*/dist-packages/janitor diff -Nru update-manager-17.10.11/debian/release-upgrade-motd update-manager-0.156.14.15/debian/release-upgrade-motd --- update-manager-17.10.11/debian/release-upgrade-motd 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/debian/release-upgrade-motd 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,40 @@ +#!/bin/sh -e +# +# 91-release-upgrade - display upgrade message or update the cache +# in the background +# +# Copyright (C) 2010 Canonical Ltd. +# +# Authors: Dustin Kirkland +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +stamp=/var/lib/update-notifier/release-upgrade-available +if [ -s "$stamp" ]; then + # Stamp exists and is populated, so display + cat "$stamp" + echo +elif [ -f "$stamp" ]; then + # Stamp exists, but is empty, see if it's expired + now=$(date +%s) + lastrun=$(stat -c %Y "$stamp") 2>/dev/null || lastrun=0 + expiration=$(expr $lastrun + 86400) + if [ $now -ge $expiration ]; then + # But is older than 1 day old, so update in the background + /usr/lib/update-manager/check-new-release -q > "$stamp" & + fi +else + # No cache at all, so update in the background + /usr/lib/update-manager/check-new-release -q > "$stamp" & +fi diff -Nru update-manager-17.10.11/debian/rules update-manager-0.156.14.15/debian/rules --- update-manager-17.10.11/debian/rules 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/debian/rules 2017-12-23 05:00:38.000000000 +0000 @@ -1,6 +1,28 @@ #!/usr/bin/make -f -export PYBUILD_INTERPRETERS=python3 - +ARCH=all +DIST=$(shell lsb_release -c -s) +DEBVER=$(shell LC_ALL=C dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p' | sed s/.*://) +TARNAME=dist-upgrader_$(DEBVER)_$(ARCH).tar.gz +DH_ARGS=--with=python2 %: - dh $@ --with=python3 --buildsystem=pybuild + dh $@ $(DH_ARGS) + +override_dh_auto_clean: + dh_auto_clean + rm -rf ./build ./DistUpgrade/$(DEBVER) ./DistUpgrade/mo \ + ./DistUpgrade/$(DIST) ./DistUpgrade/$(DIST).tar.gz \ + ./DistUpgrade/nvidia-obsolete.pkgs ./po/mo + +binary: binary-arch binary-indep +binary-indep: + dh $@ $(DH_ARGS) + # now the dist-upgrader special tarball + (cd DistUpgrade/ && \ + ./build-tarball.sh && \ + mkdir -p $(DEBVER) && \ + cp $(DIST).tar.gz ./*ReleaseAnnouncement* $(DEBVER) && \ + tar czvf ../../$(TARNAME) \ + $(DEBVER)/*ReleaseAnnouncement* \ + $(DEBVER)/$(DIST).tar.gz ) + dpkg-distaddfile $(TARNAME) raw-dist-upgrader - diff -Nru update-manager-17.10.11/debian/source_update-manager.py update-manager-0.156.14.15/debian/source_update-manager.py --- update-manager-17.10.11/debian/source_update-manager.py 2017-08-07 20:21:54.000000000 +0000 +++ update-manager-0.156.14.15/debian/source_update-manager.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,5 +1,3 @@ -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- - '''apport package hook for update-manager (c) 2011 Canonical Ltd. @@ -8,57 +6,55 @@ import os import re -import subprocess from apport.hookutils import ( attach_gsettings_package, attach_root_command_outputs, - attach_file_if_exists, command_available, - recent_syslog) - - -def run_hwe_command(option): - command = ['hwe-support-status', option] - sp = subprocess.Popen(command, stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - stdin=None) - out = sp.communicate()[0] - if sp.returncode == 0: - res = out.strip() - # exit code is 10 on unsupported HWE - elif sp.returncode == 10: - res = out.strip() - else: - res = (b'Error: command ' + str(command).encode() + - b' failed with exit code ' + - str(sp.returncode).encode() + b': ' + out) - return res + attach_file_if_exists, recent_syslog, + root_command_output) def add_info(report, ui): problem_type = report.get("ProblemType", None) - if problem_type == "Bug": - response = ui.yesno("Is the issue you are reporting one you \ -encountered when upgrading Ubuntu from one release to another?") - else: - response = None - if response: - os.execlp('apport-bug', 'apport-bug', 'ubuntu-release-upgrader') - else: + if problem_type == 'Crash': + tmpdir = re.compile('update-manager-\w+') + tb = report.get("Traceback", None) + if tb: + dupe_sig = '' + for line in tb.splitlines(): + scrub_line = tmpdir.sub('update-manager-tmpdir', line) + dupe_sig += scrub_line + '\n' + report["DuplicateSignature"] = dupe_sig + try: attach_gsettings_package(report, 'update-manager') + except: + pass + response = ui.yesno("Is the issue you are reporting one you encountered when upgrading Ubuntu from one release to another?") + if response: + report.setdefault('Tags', 'dist-upgrade') + report['Tags'] += ' dist-upgrade' + clone_file = '/var/log/dist-upgrade/apt-clone_system_state.tar.gz' + if os.path.exists(clone_file): + report['VarLogDistupgradeAptclonesystemstate.tar.gz'] = \ + root_command_output(["cat", clone_file]) + attach_file_if_exists(report, '/var/log/dist-upgrade/apt.log', + 'VarLogDistupgradeAptlog') + attach_file_if_exists(report, '/var/log/dist-upgrade/apt-term.log', + 'VarLogDistupgradeApttermlog') + attach_file_if_exists(report, '/var/log/dist-upgrade/history.log', + 'VarLogDistupgradeAptHistorylog') + attach_file_if_exists(report, '/var/log/dist-upgrade/lspci.txt', + 'VarLogDistupgradeLspcitxt') + attach_file_if_exists(report, '/var/log/dist-upgrade/main.log', + 'VarLogDistupgradeMainlog') + attach_file_if_exists(report, '/var/log/dist-upgrade/term.log', + 'VarLogDistupgradeTermlog') + attach_file_if_exists(report, '/var/log/dist-upgrade/screenlog.0', + 'VarLogDistupgradeScreenlog') + elif response is None or response is False: attach_file_if_exists(report, '/var/log/apt/history.log', - 'DpkgHistoryLog.txt') + 'DpkgHistoryLog.txt') attach_file_if_exists(report, '/var/log/apt/term.log', - 'DpkgTerminalLog.txt') - attach_root_command_outputs( - report, - {'CurrentDmesg.txt': - 'dmesg | comm -13 --nocheck-order /var/log/dmesg -'}) - if command_available('hwe-support-status'): - # not using apport's command_output because it doesn't expect a - # return code of 10 - unsupported = run_hwe_command('--show-all-unsupported') - if unsupported: - report['HWEunsupported'] = unsupported - report['HWEreplacements'] = \ - run_hwe_command('--show-replacements') + 'DpkgTerminalLog.txt') + attach_root_command_outputs(report, + {'CurrentDmesg.txt': 'dmesg | comm -13 --nocheck-order /var/log/dmesg -'}) report["Aptdaemon"] = recent_syslog(re.compile("AptDaemon")) diff -Nru update-manager-17.10.11/debian/tests/control update-manager-0.156.14.15/debian/tests/control --- update-manager-17.10.11/debian/tests/control 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -Tests: nose-tests -Depends: @, aptdaemon, pep8, pyflakes, python3-mock, python3-nose, xvfb diff -Nru update-manager-17.10.11/debian/tests/nose-tests update-manager-0.156.14.15/debian/tests/nose-tests --- update-manager-17.10.11/debian/tests/nose-tests 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/debian/tests/nose-tests 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -#!/bin/sh -xvfb-run nosetests3 diff -Nru update-manager-17.10.11/debian/update-manager-core.dirs update-manager-0.156.14.15/debian/update-manager-core.dirs --- update-manager-17.10.11/debian/update-manager-core.dirs 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/debian/update-manager-core.dirs 2017-12-23 05:00:38.000000000 +0000 @@ -1,3 +1,7 @@ var/lib/update-manager var/lib/update-notifier +var/log/dist-upgrade +etc/update-motd.d +etc/update-manager/release-upgrades.d usr/bin +usr/share/computerjanitor/plugins diff -Nru update-manager-17.10.11/debian/update-manager-core.install update-manager-0.156.14.15/debian/update-manager-core.install --- update-manager-17.10.11/debian/update-manager-core.install 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/debian/update-manager-core.install 2017-12-23 05:00:38.000000000 +0000 @@ -1,4 +1,16 @@ +debian/tmp/usr/bin/do-release-upgrade debian/tmp/usr/bin/ubuntu-support-status debian/tmp/usr/bin/hwe-support-status +debian/tmp/etc/update-manager/* debian/tmp/usr/share/locale +debian/tmp/usr/share/update-manager/*.cfg +debian/tmp/usr/lib/python*/dist-packages/UpdateManager/Core +debian/tmp/usr/lib/python*/dist-packages/UpdateManager/fdsend.so +debian/tmp/usr/lib/python*/dist-packages/UpdateManager/__init__.py +debian/tmp/usr/lib/python*/dist-packages/DistUpgrade +debian/tmp/usr/lib/python*/dist-packages/computerjanitor +debian/tmp/usr/lib/python*/dist-packages/HweSupportStatus +debian/tmp/usr/share/computerjanitor +debian/release-upgrade-motd usr/lib/update-manager +debian/91-release-upgrade etc/update-motd.d/ debian/source_update-manager.py /usr/share/apport/package-hooks/ diff -Nru update-manager-17.10.11/debian/update-manager-core.links update-manager-0.156.14.15/debian/update-manager-core.links --- update-manager-17.10.11/debian/update-manager-core.links 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/debian/update-manager-core.links 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1 @@ +usr/bin/do-release-upgrade usr/lib/update-manager/check-new-release diff -Nru update-manager-17.10.11/debian/update-manager-core.manpages update-manager-0.156.14.15/debian/update-manager-core.manpages --- update-manager-17.10.11/debian/update-manager-core.manpages 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/debian/update-manager-core.manpages 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man8/do-release-upgrade.8 diff -Nru update-manager-17.10.11/debian/update-manager-core.postinst update-manager-0.156.14.15/debian/update-manager-core.postinst --- update-manager-17.10.11/debian/update-manager-core.postinst 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/debian/update-manager-core.postinst 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,44 @@ +#!/bin/sh +# postinst script for update-manager-core +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + configure) + if dpkg --compare-versions "$2" lt-nl 1:0.156.14.4; then + # ensure permissions are right + chmod -f 0600 /var/log/dist-upgrade/apt-clone_system_state.tar.gz || true + chmod -f 0600 /var/log/dist-upgrade/system_state.tar.gz || true + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff -Nru update-manager-17.10.11/debian/update-manager-core.preinst update-manager-0.156.14.15/debian/update-manager-core.preinst --- update-manager-17.10.11/debian/update-manager-core.preinst 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/debian/update-manager-core.preinst 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,41 @@ +#!/bin/sh +# preinst script for update-manager-core +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `install' +# * `install' +# * `upgrade' +# * `abort-upgrade' +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + install|upgrade) + # this is replaced to be a real file an not a symlink in version + # 0.134.2, dpkg will not remove the symlink and put the new + # file as .dpkg-new (can be removed post-lucid) + if [ -L /etc/update-motd.d/91-release-upgrade ]; then + rm -f /etc/update-motd.d/91-release-upgrade + fi + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff -Nru update-manager-17.10.11/debian/update-manager.install update-manager-0.156.14.15/debian/update-manager.install --- update-manager-17.10.11/debian/update-manager.install 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/debian/update-manager.install 2017-12-23 05:00:38.000000000 +0000 @@ -1,12 +1,21 @@ +debian/tmp/usr/bin/check-new-release-gtk usr/lib/update-manager debian/tmp/usr/bin/update-manager debian/tmp/usr/share/update-manager/gtkbuilder -debian/tmp/usr/share/help +debian/tmp/usr/share/gnome +debian/tmp/usr/share/omf +debian/tmp/usr/share/icons debian/tmp/usr/share/glib-2.0/schemas debian/tmp/usr/share/GConf/gsettings debian/tmp/usr/share/applications/update-manager.desktop -debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/ChangelogViewer.py -debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/Dialogs.py -debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/MetaReleaseGObject.py -debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/UpdateManager.py -debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/UpdatesAvailable.py -debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/HelpViewer.py +debian/tmp/usr/lib/python*/dist-packages/UpdateManager/backend +debian/tmp/usr/lib/python*/dist-packages/UpdateManager/ChangelogViewer.py +debian/tmp/usr/lib/python*/dist-packages/UpdateManager/DistUpgradeFetcher.py +debian/tmp/usr/lib/python*/dist-packages/UpdateManager/GtkProgress.py +debian/tmp/usr/lib/python*/dist-packages/UpdateManager/MetaReleaseGObject.py +debian/tmp/usr/lib/python*/dist-packages/UpdateManager/ReleaseNotesViewer.py +debian/tmp/usr/lib/python*/dist-packages/UpdateManager/ReleaseNotesViewerWebkit.py +debian/tmp/usr/lib/python*/dist-packages/UpdateManager/UpdateManager.py +debian/tmp/usr/lib/python*/dist-packages/UpdateManager/SimpleGtkbuilderApp.py +debian/tmp/usr/lib/python*/dist-packages/UpdateManager/SimpleGtk3builderApp.py +debian/tmp/usr/lib/python*/dist-packages/UpdateManager/HelpViewer.py +debian/tmp/usr/lib/python*/dist-packages/UpdateManager/UnitySupport.py diff -Nru update-manager-17.10.11/debian/update-manager-kde.install update-manager-0.156.14.15/debian/update-manager-kde.install --- update-manager-17.10.11/debian/update-manager-kde.install 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/debian/update-manager-kde.install 2017-12-23 05:00:38.000000000 +0000 @@ -1 +1,4 @@ -debian/tmp/usr/lib/python3*/dist-packages/UpdateManager/check-meta-release.py +debian/tmp/usr/lib/python*/dist-packages/UpdateManager/DistUpgradeFetcherKDE.py +debian/tmp/usr/lib/python*/dist-packages/UpdateManager/check-meta-release.py +debian/tmp/usr/share/update-manager/*ui +debian/tmp/usr/bin/kubuntu-devel-release-upgrade diff -Nru update-manager-17.10.11/debian/update-manager-text.install update-manager-0.156.14.15/debian/update-manager-text.install --- update-manager-17.10.11/debian/update-manager-text.install 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/debian/update-manager-text.install 2017-12-23 05:00:38.000000000 +0000 @@ -1,2 +1,2 @@ debian/tmp/usr/bin/update-manager-text -debian/tmp/usr/lib/python3*/dist-packages/UpdateManagerText +debian/tmp/usr/lib/python*/dist-packages/UpdateManagerText diff -Nru update-manager-17.10.11/DistUpgrade/additional_pkgs.cfg update-manager-0.156.14.15/DistUpgrade/additional_pkgs.cfg --- update-manager-17.10.11/DistUpgrade/additional_pkgs.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/additional_pkgs.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,2 @@ +build-essential +devscripts \ No newline at end of file diff -Nru update-manager-17.10.11/DistUpgrade/apt-autoinst-fixup.py update-manager-0.156.14.15/DistUpgrade/apt-autoinst-fixup.py --- update-manager-17.10.11/DistUpgrade/apt-autoinst-fixup.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/apt-autoinst-fixup.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,71 @@ +#!/usr/bin/python + +import sys +import os + +import warnings +warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning) +import apt +import apt_pkg +import logging + +logging.basicConfig(level=logging.DEBUG, + filename="/var/log/dist-upgrade/apt-autoinst-fixup.log", + format='%(asctime)s %(levelname)s %(message)s', + filemode='w') + +cache = apt.Cache() + +min_version = "0.6.20ubuntu13" +if apt_pkg.VersionCompare(cache["python-apt"].installedVersion, min_version) < 0: + logging.error("Need at least python-apt version %s " % min_version) + sys.exit(1) + + +# figure out what needs fixup +logging.debug("Starting to check for auto-install states that need fixup") +need_fixup = set() + +# work around #105663 +need_fixup.add("mdadm") + +for pkg in cache: + if pkg.is_installed and pkg.section == "metapackages": + logging.debug("Found installed meta-pkg: '%s' " % pkg.name) + dependsList = pkg._pkg.CurrentVer.DependsList + for t in ["Depends","PreDepends","Recommends"]: + if dependsList.has_key(t): + for depOr in dependsList[t]: + for dep in depOr: + depname = dep.TargetPkg.Name + if (cache[depname].is_installed and + cache._depcache.is_auto_installed(cache[depname]._pkg)): + logging.info("Removed auto-flag from package '%s'" % depname) + need_fixup.add(depname) + +# now go through the tagfile and actually fix it up +if len(need_fixup) > 0: + # action is set to zero (reset the auto-flag) + action = 0 + STATE_FILE = apt_pkg.Config.FindDir("Dir::State") + "extended_states" + # open the statefile + if os.path.exists(STATE_FILE): + tagfile = apt_pkg.ParseTagFile(open(STATE_FILE)) + outfile = open(STATE_FILE+".tmp","w") + while tagfile.Step(): + pkgname = tagfile.Section.get("Package") + autoInst = tagfile.Section.get("Auto-Installed") + if pkgname in need_fixup: + newsec = apt_pkg.RewriteSection(tagfile.Section, + [], + [ ("Auto-Installed",str(action)) ] + ) + outfile.write(newsec+"\n") + else: + outfile.write(str(tagfile.Section)+"\n") + os.rename(STATE_FILE, STATE_FILE+".fixup-save") + os.rename(outfile.name, STATE_FILE) + os.chmod(STATE_FILE, 0644) + + + diff -Nru update-manager-17.10.11/DistUpgrade/build-dist.sh update-manager-0.156.14.15/DistUpgrade/build-dist.sh --- update-manager-17.10.11/DistUpgrade/build-dist.sh 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/build-dist.sh 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,53 @@ +#!/bin/sh + +# build a tarball that is ready for the upload. the format is +# simple, it contans: +# $version/$dist.tar.gz +# $version/ReleaseNotes +# this put into a file called "$dist-upgrader_$version.tar.gz" + + +TARGETDIR=../dist-upgrade-build +SOURCEDIR=`pwd` +DIST=feisty +MAINTAINER="Michael Vogt " +NOTES=ReleaseAnnouncement +version=$(cd ..;LC_ALL=C dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p' | sed s/.*://) + +# create targetdir +if [ ! -d $TARGETDIR/$version ]; then + mkdir -p $TARGETDIR/$version +fi + +#build the actual dist-upgrader tarball +./build-tarball.sh + +# how move it into a container including the targetdir (with version) +# and ReleaeNotes +cd $TARGETDIR/$version +cp $SOURCEDIR/$NOTES . +cp $SOURCEDIR/$DIST.tar.gz . +cd .. + +# build it +TARBALL="dist-upgrader_"$version"_all.tar.gz" +tar czvf $TARBALL $version + +# now create a changes file +CHANGES="dist-upgrader_"$version"_all.changes" +echo > $CHANGES +echo "Origin: Ubuntu/$DIST" >> $CHANGES +echo "Format: 1.7" >> $CHANGES +echo "Date: `date -R`" >> $CHANGES +echo "Architecture: all">>$CHANGES +echo "Version: $version" >>$CHANGES +echo "Distribution: $DIST" >>$CHANGES +echo "Source: dist-upgrader" >> $CHANGES +echo "Binary: dist-upgrader" >> $CHANGES +echo "Urgency: low" >> $CHANGES +echo "Maintainer: $MAINTAINER" >> $CHANGES +echo "Changed-By: $MAINTAINER" >> $CHANGES +echo "Changes: " >> $CHANGES +echo " * new upstream version" >> $CHANGES +echo "Files: " >> $CHANGES +echo " `md5sum $TARBALL | awk '{print $1}'` `stat --format=%s $TARBALL` raw-dist-upgrader - $TARBALL" >> $CHANGES diff -Nru update-manager-17.10.11/DistUpgrade/build-exclude.txt update-manager-0.156.14.15/DistUpgrade/build-exclude.txt --- update-manager-17.10.11/DistUpgrade/build-exclude.txt 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/build-exclude.txt 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,9 @@ +./backports +./profile +./result +./tarball +./toChroot +./automatic-upgrade-testing +./build-exclude.txt +./ChrootNonInteractive.py +./install_all.py \ No newline at end of file diff -Nru update-manager-17.10.11/DistUpgrade/build-tarball.sh update-manager-0.156.14.15/DistUpgrade/build-tarball.sh --- update-manager-17.10.11/DistUpgrade/build-tarball.sh 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/build-tarball.sh 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,35 @@ +#!/bin/sh + +set -e + +DIST=$(lsb_release -c -s) + +# cleanup +echo "Cleaning up" + +for d in ./ plugins/ computerjanitor/; do + rm -f $d/*~ $d/*.bak $d/*.pyc $d/*.moved $d/'#'* $d/*.rej $d/*.orig +done + +#sudo rm -rf backports/ profile/ result/ tarball/ *.deb + +# automatically generate codename for the distro in the +# cdromupgrade script +sed -i s/^CODENAME=.*/CODENAME=$DIST/ cdromupgrade + +# update po and copy the mo files +(cd ../po; make update-po) +cp -r ../po/mo . + +# make symlink +if [ ! -h $DIST ]; then + ln -s dist-upgrade.py $DIST +fi + +# copy nvidia obsoleted drivers data +cp /usr/share/nvidia-common/obsolete nvidia-obsolete.pkgs + +# create the tarball, copy links in place +tar -c -h -z -v --exclude=$DIST.tar.gz --exclude=$0 -X build-exclude.txt -f $DIST.tar.gz ./* + + diff -Nru update-manager-17.10.11/DistUpgrade/cdromupgrade update-manager-0.156.14.15/DistUpgrade/cdromupgrade --- update-manager-17.10.11/DistUpgrade/cdromupgrade 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/cdromupgrade 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,40 @@ +#!/bin/sh +# +# "cdromupgrade" is a shell script wrapper around the dist-upgrader +# to make it possible to put it onto the top-level dir of a CD and +# run it from there +# +# Not that useful unfortunately when the CD is mounted "noexec". +# + +# the codename is AUTO-GENERATED from the build-host relase codename +CODENAME=precise +UPGRADER_DIR=dists/$CODENAME/main/dist-upgrader/binary-all/ + +# this script can be called in three ways: +# sh /cdrom/cdromugprade +# sh ./cdromupgrade +# sh cdromupgrade +# the sh below is needed to figure out the cdromdirname +case "$0" in +/*) cddirname="${0%\/*}" ;; +*/*) cddirname="$(pwd)/${0%\/*}" ;; +*) cddirname="$(pwd)/" ;; +esac + +fullpath="$cddirname/$UPGRADER_DIR" + +# extract the tar to a TMPDIR and run it from there +if [ ! -f "$fullpath/$CODENAME.tar.gz" ]; then + echo "Could not find the upgrade application archive, exiting" + exit 1 +fi + +TMPDIR=$(mktemp -d) +cd $TMPDIR +tar xzf "$fullpath/$CODENAME.tar.gz" +if [ ! -x $TMPDIR/$CODENAME ]; then + echo "Could not find the upgrade application in the archive, exiting" + exit 1 +fi +$TMPDIR/$CODENAME --cdrom "$cddirname" $@ diff -Nru update-manager-17.10.11/DistUpgrade/Changelog update-manager-0.156.14.15/DistUpgrade/Changelog --- update-manager-17.10.11/DistUpgrade/Changelog 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/Changelog 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,188 @@ +2007-02-14: + - automatically generate the .py file from the .ui files +2007-02-14: + - fix the $dist-proposed handling + - fix in $dist-commercial handling (LP#66783) + - updated demotions +2007-02-13: + - fix in the reboot code (lp: #84538) + - make some string more distro neutral +2007-02-07: + - add support for the cdrom upgrader to update itself +2007-02-05: + - use the new python-apt aptsources api + - server mode has magic to deal with runing under ssh +2007-02-02: + - merged the KDE frontend (thanks Riddell) + - added tasks support + - add dist-upgrade --mode=server +2007-02-01: + - fix apport integration +2007-01-29: + - fixes in the InstallProgress.error() method + - DistUpgrade/DistUpgradeView.py: fix InstallProgress refactoring + - updated obsoletes + - auto-generate the codename for the upgrade based on the build-system coden (lp: #77620) + - various bugfixes + - apport support +2006-12-12: + - rewrote the _checkFreeSpace() and add better checking + for /boot (#70683) +2006-11-28: + - add quirks rule to install ndiswrapper-utils-1.9 if 1.8 is + installed +2006-11-27: + - fix caption in main glade file + - use "Dpkg::StopOnError","False" option +2006-11-23: + - initial feisty upload +2006-10-28: + - catch errors when load_icon() does not work +2006-10-27: + - reset self.read so that we do not loop endlessly when dpkg + sends unexpected data (lp: #68553) +2006-10-26: + - make sure that xserver-xorg-video-all get installed if + xserver-xorg-driver-all was installed before (lp: #58424) +2006-10-21: + - comment out old cdrom sources + - demotions updated +2006-10-21: + - fix incorrect arguments in fixup logging (lp: #67311) + - more error logging + - fix upgrade problems for people with unofficial compiz + repositories (lp: #58424) + - rosetta i18n updates + - uploaded +2006-10-17: + - ensure bzr, tomboy and xserver-xorg-input-* are properly + upgraded + - don't fail if dpkg sents unexpected status lines (lp: #66013) +2006-10-16: + - remove leftover references to ubuntu-base and + use ubuntu-minimal and ubuntu-standard instead + - updated translations from rosetta +2006-10-13: + - log held-back as well +2006-10-12: + - check if cdrom.lst actually exists before copying it +2006-10-11: + - keep pixbuf loader reference around so that we + have one after the upgrade when the old + /usr/lib/gtk-2.0/loader/2.4.0/ loader is gone. + This fixes the problem of missing stock-icons + after the upgrade. Also revalidate the theme + in each step. +2006-10-10: + - fix time calculation + - fix kubuntu upgrade case +2006-10-06: + - fix source.list rewrite corner case bug (#64159) +2006-10-04: + - improve the space checking/logging +2006-09-29: + - typo fix (thanks to Jane Silber) (lp: #62946) +2006-09-28: + - bugfix in the cdromupgrade script +2006-09-27: + - uploaded a version that only reverts the backport fetching + but no other changes compared to 2006-09-23 +2006-09-27: + - embarrassing bug cdromupgrade.sh +2006-09-26: + - comment out the getRequiredBackport code because we will + not use Breaks for the dapper->edgy upgrade yet + (see #54234 for the rationale) + - updated demotions.cfg for dapper->edgy + - special case the packages affected by the Breaks changes + - make sure that no translations get lost during the upgrade + (thanks to mdz for pointing this out) + - bugfixes +2006-09-23: + - support fetching backports of selected packages first and + use them for the upgrade (needed to support Breaks) + - fetch/use apt/dpkg/python-apt backports for the upgrade +2006-09-06: + - increased the "free-space-savety-buffer" to 100MB +2006-09-05: + - added "RemoveEssentialOk" option and put "sysvinit" into it +2006-09-04: + - set Debug::pkgDepCache::AutoInstall as debug option too + - be more robust against failure from the locales + - remove libgl1-mesa (no longer needed on edgy) +2006-09-03: + - fix in the cdromupgrade script path detection +2006-09-01: + - make the cdromupgrade wrapper work with the compressed version + of the upgrader as put onto the CD + - uploaded +2006-08-30: + - fixes to the cdromupgrade wrapper +2006-08-29: + - always enable the "main" component to make sure it is available + - add download estimated time + - add --cdrom switch to make cdrom based dist-upgrades possible + - better error reporting + - moved the logging into the /var/log/dist-upgrade/ dir + - change the obsoletes calculation when run without network and + consider demotions as obsoletes then (because we can't really + use the "pkg.downloadable" hint without network) + - uploaded +2006-08-18: + - sort the demoted software list +2006-07-31: + - updated to edgy + - uploadedd +2006-05-31: + - fix bug in the free space calculation (#47092) + - updated ReleaseAnnouncement + - updated translations + - fix a missing bindtextdomain + - fix a incorrect ngettext usage + - added quirks handler to fix nvidia-glx issue (#47017) + Thanks to the amazing Kiko for helping improve this! +2006-05-24: + - if the initial "update()" fails, just exit, don't try + to restore the old sources.list (nothing was modified yet) + Ubuntu: #46712 + - fix a bug in the sourcesList rewriting (ubuntu: #46245) + - expand the terminal when no libgnome2-perl is installed + because debconf might want to ask questions (ubuntu: #46214) + - disable the breezy cdrom source to make removal of demoted + packages work properly (ubuntu: #46336) + - translations updated from rosetta + - fixed a bug in the demotions calculation (ubuntu: #46245) + - typos fixed and translations unfuzzied (ubuntu: #46792,#46464) + - upload +2006-05-12: + - space checking improved (ubuntu: #43948) + - show software that was demoted from main -> universe + - improve the remaining time reporting + - translation updates + - upload +2006-05-09: + - upload +2006-05-08: + - fix error when asking for media-change (ubuntu: 43442,43728) +2006-05-02: + - upload +2006-04-28: + - add more sanity checking, if no valid mirror is found in the + sources.list ask for "dumb" rewrite + - if nothing valid was found after a dumb rewrite, add official + sources + - don't report install TIMEOUT over and over in the log + - report what package caused a install TIMEOUT +2006-04-27: + - add a additonal sanity check after the rewriting of the sources.list + (check for BaseMetaPkgs still in the cache) + - on abort reopen() the cache to force writing a new + /var/cache/apt/pkgcache.bin + - use a much more compelte mirror list (based on the information + from https://wiki.ubuntu.com/Archive) +2006-04-25: + - make sure that DistUpgradeView.getTerminal().call() actually + waits until the command has finished (dpkg --configure -a) +2006-04-18: + - add logging to the sources.list modification code + - general logging improvements (thanks to Xavier Poinsard) diff -Nru update-manager-17.10.11/DistUpgrade/computerjanitor/cruft.py update-manager-0.156.14.15/DistUpgrade/computerjanitor/cruft.py --- update-manager-17.10.11/DistUpgrade/computerjanitor/cruft.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/computerjanitor/cruft.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,138 @@ +# cruft.py - base class for different kinds of cruft +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import computerjanitor + + +class Cruft(object): + + """One piece of cruft to be cleaned out. + + A piece of cruft can be a file, a package, a configuration tweak + that is missing, or something else. + + This is a base class, which does nothing. Subclasses do the + actual work. + + """ + + def get_prefix(self): + """Return the unique prefix used to group this type of cruft. + + For example, the .deb package called 'foo' would have a prefix + of 'deb'. This way, the package foo is not confused with the + file foo, or the username foo. + + Subclasses SHOULD define this. The default implementation + returns the name of the class, which is rarely useful to + the user. + + """ + + return self.__class__.__name__ + + def get_prefix_description(self): + """Return human-readable description of class of cruft.""" + return self.get_description() + + def get_shortname(self): + """Return the name of this piece of cruft. + + The name should be something that the user will understand. + For example, it might be the name of a package, or the full + path to a file. + + The name should be unique within the unique prefix returned + by get_prefix. The prefix MUST NOT be included by this method, + the get_name() method does that instead. The intent is that + get_shortname() will be used by the user interface in contexts + where the prefix is shown separately from the short name, + and get_name() when a single string is used. + + Subclasses MUST define this. The default implementation + raises an exception. + + """ + + raise computerjanitor.UnimplementedMethod(self.get_shortname) + + def get_name(self): + """Return prefix plus name. + + See get_prefix() and get_shortname() for a discussion of + the prefix and the short name. This method will return + the prefix, a colon, and the short name. + + The long name will used to store state/configuration data: + _this_ package should not be removed. + + """ + + return "%s:%s" % (self.get_prefix(), self.get_shortname()) + + def get_description(self): + """Return a description of this piece of cruft. + + This may be arbitrarily long. The user interface will take + care of breaking it into lines or otherwise presenting it to + the user in a nice manner. The description should be plain + text, in UTF-8. + + The default implementation returns the empty string. Subclasses + MAY override this as they wish. + + """ + + return "" + + def get_disk_usage(self): + """Return amount of disk space reserved by this piece of cruft. + + The unit is bytes. + + The disk space in question should be the amount that will be + freed if the cruft is cleaned up. The amount may be an estimate + (read: guess). It is intended to be shown to the user to help + them decide what to remove and what to keep. + + This will also be used by the user interface to better + estimate how much remaining time there is when cleaning + up a lot of cruft. + + For some types of cruft, this is not applicable and they should + return None. The base class implementation does that, so + subclasses MUST define this method if it is useful for them to + return something else. + + The user interface will distinguish between None (not + applicable) and 0 (no disk space being used). + + """ + + return None + + def cleanup(self): + """Clean up this piece of cruft. + + Depending on the type of cruft, this may mean removing files, + packages, modifying configuration files, or something else. + + The default implementation raises an exception. Subclasses + MUST override this. + + """ + + raise computerjanitor.UnimplementedMethod(self.cleanup) diff -Nru update-manager-17.10.11/DistUpgrade/computerjanitor/cruft_tests.py update-manager-0.156.14.15/DistUpgrade/computerjanitor/cruft_tests.py --- update-manager-17.10.11/DistUpgrade/computerjanitor/cruft_tests.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/computerjanitor/cruft_tests.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,56 @@ +# cruft_tests.py - unit tests for cruft.py +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import unittest + +import computerjanitor + + +class CruftTests(unittest.TestCase): + + def setUp(self): + self.cruft = computerjanitor.Cruft() + + def testReturnsClassNameAsDefaultPrefix(self): + class Mockup(computerjanitor.Cruft): + pass + self.assertEqual(Mockup().get_prefix(), "Mockup") + + def testReturnsEmptyStringAsDefaultPrefixDescription(self): + self.assertEqual(self.cruft.get_prefix_description(), "") + + def testReturnsDescriptionAsDefaultPrefixDescription(self): + self.cruft.get_description = lambda: "foo" + self.assertEqual(self.cruft.get_prefix_description(), "foo") + + def testRaisesErrorForDefaultGetShortname(self): + self.assertRaises(computerjanitor.UnimplementedMethod, + self.cruft.get_shortname) + + def testReturnsCorrectStringForFullName(self): + self.cruft.get_prefix = lambda *args: "foo" + self.cruft.get_shortname = lambda *args: "bar" + self.assertEqual(self.cruft.get_name(), "foo:bar") + + def testReturnsEmptyStringAsDefaultDescription(self): + self.assertEqual(self.cruft.get_description(), "") + + def testReturnsNoneForDiskUsage(self): + self.assertEqual(self.cruft.get_disk_usage(), None) + + def testRaisesErrorForDefaultCleanup(self): + self.assertRaises(computerjanitor.UnimplementedMethod, + self.cruft.cleanup) diff -Nru update-manager-17.10.11/DistUpgrade/computerjanitor/exc.py update-manager-0.156.14.15/DistUpgrade/computerjanitor/exc.py --- update-manager-17.10.11/DistUpgrade/computerjanitor/exc.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/computerjanitor/exc.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,30 @@ +# exc.py - exceptions for computerjanitor +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import computerjanitor +_ = computerjanitor.setup_gettext() + + +class ComputerJanitorException(Exception): + + def __str__(self): + return self._str + + +class UnimplementedMethod(ComputerJanitorException): + + def __init__(self, method): + self._str = _("Unimplemented method: %s") % str(method) diff -Nru update-manager-17.10.11/DistUpgrade/computerjanitor/exc_tests.py update-manager-0.156.14.15/DistUpgrade/computerjanitor/exc_tests.py --- update-manager-17.10.11/DistUpgrade/computerjanitor/exc_tests.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/computerjanitor/exc_tests.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,34 @@ +# exc_tests.py - unit tests for exc.py +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import unittest + +import computerjanitor + + +class ComputerJanitorExceptionTests(unittest.TestCase): + + def testReturnsStrCorrectly(self): + e = computerjanitor.Exception() + e._str = "pink" + self.assertEqual(str(e), "pink") + + +class UnimplementedMethodTests(unittest.TestCase): + + def testErrorMessageContainsMethodName(self): + e = computerjanitor.UnimplementedMethod(self.__init__) + self.assert_("__init__" in str(e)) \ No newline at end of file diff -Nru update-manager-17.10.11/DistUpgrade/computerjanitor/file_cruft.py update-manager-0.156.14.15/DistUpgrade/computerjanitor/file_cruft.py --- update-manager-17.10.11/DistUpgrade/computerjanitor/file_cruft.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/computerjanitor/file_cruft.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,58 @@ +# file_cruft.py - implementation of file cruft +# Copyright (C) 2008, 2009 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import os + +import computerjanitor +_ = computerjanitor.setup_gettext() + + +class FileCruft(computerjanitor.Cruft): + + """Cruft that is individual files. + + This type of cruft consists of individual files that should be + removed. Various plugins may decide that various files are cruft; + they can all use objects of FileCruft type to mark such files, + regardless of the reason the files are considered cruft. + + When FileCruft instantiated, the file is identified by a pathname. + + """ + + def __init__(self, pathname, description): + self.pathname = pathname + st = os.stat(pathname) + self.disk_usage = st.st_blocks * 512 + self.description = description + + def get_prefix(self): + return "file" + + def get_prefix_description(self): + return _("A file on disk") + + def get_shortname(self): + return self.pathname + + def get_description(self): + return "%s\n" % self.description + + def get_disk_usage(self): + return self.disk_usage + + def cleanup(self): + os.remove(self.pathname) diff -Nru update-manager-17.10.11/DistUpgrade/computerjanitor/file_cruft_tests.py update-manager-0.156.14.15/DistUpgrade/computerjanitor/file_cruft_tests.py --- update-manager-17.10.11/DistUpgrade/computerjanitor/file_cruft_tests.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/computerjanitor/file_cruft_tests.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,63 @@ +# file_cruft_tests.py - unit tests for file_cruft.py +# Copyright (C) 2008, 2009 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import os +import subprocess +import tempfile + +import unittest + +import computerjanitor + + +class FileCruftTests(unittest.TestCase): + + def setUp(self): + fd, self.pathname = tempfile.mkstemp() + os.write(fd, "x" * 1024) + os.close(fd) + self.cruft = computerjanitor.FileCruft(self.pathname, "description") + + def tearDown(self): + if False and os.path.exists(self.pathname): + os.remove(self.pathname) + + def testReturnsCorrectPrefix(self): + self.assertEqual(self.cruft.get_prefix(), "file") + + def testReturnsCorrectPrefixDescription(self): + self.assertEqual(self.cruft.get_prefix_description(), "A file on disk") + + def testReturnsCorrectShortname(self): + self.assertEqual(self.cruft.get_shortname(), self.pathname) + + def testReturnsCorrectName(self): + self.assertEqual(self.cruft.get_name(), "file:%s" % self.pathname) + + def testReturnsCorrectDescription(self): + self.assertEqual(self.cruft.get_description(), "description\n") + + def testReturnsCorrectDiskUsage(self): + p = subprocess.Popen(["du", "-s", "-B", "1", self.pathname], + stdout=subprocess.PIPE) + stdout, stderr = p.communicate() + du = int(stdout.splitlines()[0].split("\t")[0]) + self.assertEqual(self.cruft.get_disk_usage(), du) + + def testDeletesPackage(self): + self.assert_(os.path.exists(self.pathname)) + self.cruft.cleanup() + self.assertFalse(os.path.exists(self.pathname)) diff -Nru update-manager-17.10.11/DistUpgrade/computerjanitor/__init__.py update-manager-0.156.14.15/DistUpgrade/computerjanitor/__init__.py --- update-manager-17.10.11/DistUpgrade/computerjanitor/__init__.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/computerjanitor/__init__.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,60 @@ +# __init__.py for computerjanitor +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +VERSION = "1.11" + + +# Set up gettext. This needs to be before the import statements below +# so that if any modules call it right after importing, they find +# setup_gettext. + +def setup_gettext(): + """Set up gettext for a module. + + Return a method to be used for looking up translations. Usage: + + import computerjanitor + _ = computerjanitor.setup_gettext() + + """ + + import gettext + import os + + domain = 'update-manager' + localedir = os.environ.get('LOCPATH', None) + t = gettext.translation(domain, localedir=localedir, fallback=True) + return t.ugettext + + +from cruft import Cruft +from file_cruft import FileCruft +from package_cruft import PackageCruft +from missing_package_cruft import MissingPackageCruft +from exc import ComputerJanitorException as Exception, UnimplementedMethod +from plugin import Plugin, PluginManager + +# reference it here to make pyflakes happy +Cruft +FileCruft +PackageCruft +Exception +UnimplementedMethod +MissingPackageCruft +Plugin +PluginManager + + diff -Nru update-manager-17.10.11/DistUpgrade/computerjanitor/missing_package_cruft.py update-manager-0.156.14.15/DistUpgrade/computerjanitor/missing_package_cruft.py --- update-manager-17.10.11/DistUpgrade/computerjanitor/missing_package_cruft.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/computerjanitor/missing_package_cruft.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,45 @@ +# missing_package_cruft.py - install a missing package +# Copyright (C) 2009 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import computerjanitor +_ = computerjanitor.setup_gettext() + + +class MissingPackageCruft(computerjanitor.Cruft): + + """Install a missing package.""" + + def __init__(self, package, description=None): + self.package = package + self.description = description + + def get_prefix(self): + return "install-deb" + + def get_prefix_description(self): + return _("Install missing package.") + + def get_shortname(self): + return self.package.name + + def get_description(self): + if self.description: + return self.description + else: + return _("Package %s should be installed.") % self.package.name + + def cleanup(self): + self.package.markInstall() diff -Nru update-manager-17.10.11/DistUpgrade/computerjanitor/missing_package_cruft_tests.py update-manager-0.156.14.15/DistUpgrade/computerjanitor/missing_package_cruft_tests.py --- update-manager-17.10.11/DistUpgrade/computerjanitor/missing_package_cruft_tests.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/computerjanitor/missing_package_cruft_tests.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,61 @@ +# missing_package_cruft_tests.py - unit tests for missing_package_cruft.py +# Copyright (C) 2008, 2009 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import unittest + +import computerjanitor + + +class MockAptPackage(object): + + def __init__(self): + self.name = "name" + self.summary = "summary" + self.installedSize = 12765 + self.installed = False + + def markInstall(self): + self.installed = True + + +class MissingPackageCruftTests(unittest.TestCase): + + def setUp(self): + self.pkg = MockAptPackage() + self.cruft = computerjanitor.MissingPackageCruft(self.pkg) + + def testReturnsCorrectPrefix(self): + self.assertEqual(self.cruft.get_prefix(), "install-deb") + + def testReturnsCorrectPrefixDescription(self): + self.assert_("Install" in self.cruft.get_prefix_description()) + + def testReturnsCorrectShortname(self): + self.assertEqual(self.cruft.get_shortname(), "name") + + def testReturnsCorrectName(self): + self.assertEqual(self.cruft.get_name(), "install-deb:name") + + def testReturnsCorrectDescription(self): + self.assert_("name" in self.cruft.get_description()) + + def testSetsDescriptionWhenAsked(self): + pkg = computerjanitor.MissingPackageCruft(self.pkg, "foo") + self.assertEqual(pkg.get_description(), "foo") + + def testInstallsPackage(self): + self.cruft.cleanup() + self.assert_(self.pkg.installed) diff -Nru update-manager-17.10.11/DistUpgrade/computerjanitor/package_cruft.py update-manager-0.156.14.15/DistUpgrade/computerjanitor/package_cruft.py --- update-manager-17.10.11/DistUpgrade/computerjanitor/package_cruft.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/computerjanitor/package_cruft.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,57 @@ +# package_cruft.py - implementation for the package craft +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import computerjanitor +_ = computerjanitor.setup_gettext() + + +class PackageCruft(computerjanitor.Cruft): + + """Cruft that is .deb packages. + + This type of cruft consists of .deb packages installed onto the + system which can be removed. Various plugins may decide that + various packages are cruft; they can all use objects of PackageCruft + type to mark such packages, regardless of the reason the packages + are considered cruft. + + When PackageCruft instantiated, the package is identified by an + apt.Package object. That object is used for all the real operations, + so this class is merely a thin wrapper around it. + + """ + + def __init__(self, pkg, description): + self._pkg = pkg + self._description = description + + def get_prefix(self): + return "deb" + + def get_prefix_description(self): + return _(".deb package") + + def get_shortname(self): + return self._pkg.name + + def get_description(self): + return u"%s\n\n%s" % (self._description, self._pkg.summary) + + def get_disk_usage(self): + return self._pkg.installedSize + + def cleanup(self): + self._pkg.markDelete() diff -Nru update-manager-17.10.11/DistUpgrade/computerjanitor/package_cruft_tests.py update-manager-0.156.14.15/DistUpgrade/computerjanitor/package_cruft_tests.py --- update-manager-17.10.11/DistUpgrade/computerjanitor/package_cruft_tests.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/computerjanitor/package_cruft_tests.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,61 @@ +# package_cruft_tests.py - unit tests for package_cruft.py +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import unittest + +import computerjanitor + + +class MockAptPackage(object): + + def __init__(self): + self.name = "name" + self.summary = "summary" + self.installedSize = 12765 + self.deleted = False + + def markDelete(self): + self.deleted = True + + +class PackageCruftTests(unittest.TestCase): + + def setUp(self): + self.pkg = MockAptPackage() + self.cruft = computerjanitor.PackageCruft(self.pkg, "description") + + def testReturnsCorrectPrefix(self): + self.assertEqual(self.cruft.get_prefix(), "deb") + + def testReturnsCorrectPrefixDescription(self): + self.assertEqual(self.cruft.get_prefix_description(), ".deb package") + + def testReturnsCorrectShortname(self): + self.assertEqual(self.cruft.get_shortname(), "name") + + def testReturnsCorrectName(self): + self.assertEqual(self.cruft.get_name(), "deb:name") + + def testReturnsCorrectDescription(self): + self.assertEqual(self.cruft.get_description(), + "description\n\nsummary") + + def testReturnsCorrectDiskUsage(self): + self.assertEqual(self.cruft.get_disk_usage(), 12765) + + def testDeletesPackage(self): + self.cruft.cleanup() + self.assert_(self.pkg.deleted) diff -Nru update-manager-17.10.11/DistUpgrade/computerjanitor/plugin.py update-manager-0.156.14.15/DistUpgrade/computerjanitor/plugin.py --- update-manager-17.10.11/DistUpgrade/computerjanitor/plugin.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/computerjanitor/plugin.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,184 @@ +# plugin.py - plugin base class for computerjanitor +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import imp +import inspect +import logging +import os + +import computerjanitor +_ = computerjanitor.setup_gettext() + +class Plugin(object): + + """Base class for plugins. + + These plugins only do one thing: identify cruft. See the 'get_cruft' + method for details. + + """ + + def get_condition(self): + if hasattr(self, "_condition"): + return self._condition + else: + return [] + + def set_condition(self, condition): + self._condition = condition + + condition = property(get_condition, set_condition) + + def set_application(self, app): + """Set the Application instance this plugin belongs to. + + This is used by the plugin manager when creating the plugin + instance. In a perfect world, this would be done via the + __init__ method, but since I took a wrong left turn, I ended + up in an imperfect world, and therefore giving the Application + instance to __init__ would mandate that all sub-classes would + have to deal with that explicitly. That is a lot of unnecessary + make-work, which we should avoid. Therefore, we do it via this + method. + + The class may access the Application instance via the + 'app' attribute. + + """ + + self.app = app + + def do_cleanup_cruft(self): # pragma: no cover + """Find cruft and clean it up. + + This is a helper method. + """ + + for cruft in self.get_cruft(): + cruft.cleanup() + self.post_cleanup() + + def get_cruft(self): + """Find some cruft in the system. + + This method MUST return an iterator (see 'yield' statement). + This interface design allows cruft to be collected piecemeal, + which makes it easier to show progress in the user interface. + + The base class default implementation of this raises an + exception. Subclasses MUST override this method. + + """ + + raise computerjanitor.UnimplementedMethod(self.get_cruft) + + def post_cleanup(self): + """Does plugin wide cleanup after the individual cleanup + was performed. + + This is useful for stuff that needs to be proccessed + in batches (e.g. for performance reasons) like package + removal. + """ + pass + + +class PluginManager(object): + + """Class to find and load plugins. + + Plugins are stored in files named '*_plugin.py' in the list of + directories given to the initializer. + + """ + + def __init__(self, app, plugin_dirs): + self._app = app + self._plugin_dirs = plugin_dirs + self._plugins = None + + def get_plugin_files(self): + """Return all filenames in which plugins may be stored.""" + + names = [] + + + for dirname in self._plugin_dirs: + if not os.path.exists(dirname): + continue + basenames = [x for x in os.listdir(dirname) + if x.endswith("_plugin.py")] + logging.debug("Plugin modules in %s: %s" % + (dirname, " ".join(basenames))) + names += [os.path.join(dirname, x) for x in basenames] + + return names + + def _find_plugins(self, module): + """Find and instantiate all plugins in a module.""" + plugins = [] + for dummy, member in inspect.getmembers(module): + if inspect.isclass(member) and issubclass(member, Plugin): + plugins.append(member) + logging.debug("Plugins in %s: %s" % + (module, " ".join(str(x) for x in plugins))) + return [plugin() for plugin in plugins] + + def _load_module(self, filename): + """Load a module from a filename.""" + logging.debug("Loading module %s" % filename) + module_name, dummy = os.path.splitext(os.path.basename(filename)) + f = file(filename, "r") + try: + module = imp.load_module(module_name, f, filename, + (".py", "r", imp.PY_SOURCE)) + except Exception, e: # pragma: no cover + logging.warning("Failed to load plugin '%s' (%s)" % + (module_name, e)) + return None + f.close() + return module + + def get_plugins(self, condition=[], callback=None): + """Return all plugins that have been found. + + If callback is specified, it is called after each plugin has + been found, with the following arguments: filename, index of + filename in list of files to be examined (starting with 0), and + total number of files to be examined. The purpose of this is to + allow the callback to inform the user in case things take a long + time. + + """ + + if self._plugins is None: + self._plugins = [] + filenames = self.get_plugin_files() + for i in range(len(filenames)): + if callback: + callback(filenames[i], i, len(filenames)) + module = self._load_module(filenames[i]) + for plugin in self._find_plugins(module): + plugin.set_application(self._app) + self._plugins.append(plugin) + # get the matching plugins + plugins = [p for p in self._plugins + if (p.condition == condition) or + (condition in p.condition) or + (condition == "*") ] + logging.debug("plugins for condition '%s' are '%s'" % + (condition, plugins)) + return plugins diff -Nru update-manager-17.10.11/DistUpgrade/computerjanitor/plugin_tests.py update-manager-0.156.14.15/DistUpgrade/computerjanitor/plugin_tests.py --- update-manager-17.10.11/DistUpgrade/computerjanitor/plugin_tests.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/computerjanitor/plugin_tests.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,112 @@ +# plugin_tests.py - unit tests for plugin.py +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import os +import tempfile +import unittest + +import computerjanitor + + +class PluginTests(unittest.TestCase): + + def testGetCruftRaisesException(self): + p = computerjanitor.Plugin() + self.assertRaises(computerjanitor.UnimplementedMethod, p.get_cruft) + + def testPostCleanupReturnsNone(self): + p = computerjanitor.Plugin() + self.assertEqual(p.post_cleanup(), None) + + def testDoesNotHaveAppAttributeByDefault(self): + p = computerjanitor.Plugin() + self.assertFalse(hasattr(p, "app")) + + def testSetApplicationSetsApp(self): + p = computerjanitor.Plugin() + p.set_application("foo") + self.assertEqual(p.app, "foo") + + def testSetsRequiredConditionToNoneByDefault(self): + p = computerjanitor.Plugin() + self.assertEqual(p.condition, []) + + +class PluginManagerTests(unittest.TestCase): + + def testFindsNoPluginsInEmptyDirectory(self): + tempdir = tempfile.mkdtemp() + pm = computerjanitor.PluginManager(None, [tempdir]) + plugins = pm.get_plugins() + os.rmdir(tempdir) + self.assertEqual(plugins, []) + + def testFindsOnePluginFileInTestPluginDirectory(self): + pm = computerjanitor.PluginManager(None, ["testplugins"]) + self.assertEqual(pm.get_plugin_files(), + ["testplugins/hello_plugin.py"]) + + def testFindsOnePluginInTestPluginDirectory(self): + pm = computerjanitor.PluginManager(None, ["testplugins"]) + self.assertEqual(len(pm.get_plugins()), 1) + + def testFindPluginsSetsApplicationInPluginsFound(self): + pm = computerjanitor.PluginManager("foo", ["testplugins"]) + self.assertEqual(pm.get_plugins()[0].app, "foo") + + def callback(self, filename, index, count): + self.callback_called = True + + def testCallsCallbackWhenFindingPlugins(self): + pm = computerjanitor.PluginManager(None, ["testplugins"]) + self.callback_called = False + pm.get_plugins(callback=self.callback) + self.assert_(self.callback_called) + + +class ConditionTests(unittest.TestCase): + + def setUp(self): + self.pm = computerjanitor.PluginManager(None, ["testplugins"]) + + class White(computerjanitor.Plugin): + pass + + class Red(computerjanitor.Plugin): + def __init__(self): + self.condition = ["red"] + + class RedBlack(computerjanitor.Plugin): + def __init__(self): + self.condition = ["red","black"] + + self.white = White() + self.red = Red() + self.redblack = RedBlack() + self.pm._plugins = [self.white, self.red, self.redblack] + + def testReturnsOnlyConditionlessPluginByDefault(self): + self.assertEqual(self.pm.get_plugins(), [self.white]) + + def testReturnsOnlyRedPluginWhenConditionIsRed(self): + self.assertEqual(self.pm.get_plugins(condition="red"), [self.red, self.redblack]) + + def testReturnsOnlyRedPluginWhenConditionIsRedAndBlack(self): + self.assertEqual(self.pm.get_plugins(condition=["red","black"]), [self.redblack]) + + def testReturnsEallPluginsWhenRequested(self): + self.assertEqual(set(self.pm.get_plugins(condition="*")), + set([self.white, self.red, self.redblack])) diff -Nru update-manager-17.10.11/DistUpgrade/crashdialog.ui update-manager-0.156.14.15/DistUpgrade/crashdialog.ui --- update-manager-17.10.11/DistUpgrade/crashdialog.ui 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/crashdialog.ui 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,142 @@ + + CrashDialog + + + + 0 + 0 + 483 + 483 + + + + + 0 + 0 + + + + Upgrader Crashed + + + false + + + true + + + + + + + + + 0 + 0 + + + + <h2>Upgrade Tool Crashed</h2> + + + Qt::AlignVCenter + + + false + + + + + + + QFrame::HLine + + + QFrame::Sunken + + + + + + + <qt>We're sorry; the upgrade tool crashed. Please file a new bug report at <a href="http://launchpad.net/ubuntu/+source/update-manager">http://launchpad.net/ubuntu/+source/update-manager</a> (do not attach your details to any existing bug) and a developer will attend to the problem as soon as possible. To help the developers understand what went wrong, include the following detail in your bug report, and attach the files /var/log/dist-upgrade/apt.log and /var/log/dist-upgrade/main.log: + + + Qt::AlignVCenter + + + true + + + true + + + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 20 + 20 + + + + + + + + &Close + + + Alt+C + + + true + + + true + + + + + + + + + + + qPixmapFromMimeSource + + kurllabel.h + + + + + crash_close + clicked() + CrashDialog + accept() + + + 20 + 20 + + + 20 + 20 + + + + + diff -Nru update-manager-17.10.11/DistUpgrade/demoted.cfg update-manager-0.156.14.15/DistUpgrade/demoted.cfg --- update-manager-17.10.11/DistUpgrade/demoted.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/demoted.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,245 @@ +# demoted packages from oneiric to precise +ajaxterm +asp.net-examples +at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu +cantor +cantor-dbg +cobbler-enlist +couchdb-bin +dcraw +defoma +defoma-doc +desktopcouch +desktopcouch-tools +desktopcouch-ubuntuone +ecosconfig-imx +evolution-couchdb +evolution-couchdb-backend +exiv2 +fortunes-ubuntu-server +g++-4.5-multilib +gamin +gbrainy +gcc-4.4-source +gcc-4.5-multilib +gir1.2-couchdb-1.0 +gir1.2-desktopcouch-1.0 +gnome-desktop-data +gnome-search-tool +jsvc +jython +jython-doc +kaffeine +kaffeine-dbg +kdevelop +kdevelop-data +kdevelop-dev +kdevplatform-dbg +kdevplatform-dev +kdewallpapers +koffice-l10n-ca +koffice-l10n-cavalencia +koffice-l10n-da +koffice-l10n-de +koffice-l10n-el +koffice-l10n-engb +koffice-l10n-es +koffice-l10n-et +koffice-l10n-fr +koffice-l10n-gl +koffice-l10n-hu +koffice-l10n-it +koffice-l10n-ja +koffice-l10n-kk +koffice-l10n-nb +koffice-l10n-nds +koffice-l10n-nl +koffice-l10n-pl +koffice-l10n-pt +koffice-l10n-ptbr +koffice-l10n-ru +koffice-l10n-sv +koffice-l10n-tr +koffice-l10n-uk +koffice-l10n-wa +koffice-l10n-zhcn +koffice-l10n-zhtw +lib32go0 +lib32go0-dbg +lib64go0 +lib64go0-dbg +libaccess-bridge-java +libaccess-bridge-java-jni +libamd2.2.0 +libatspi-dbg +libatspi-dev +libatspi1.0-0 +libbtf1.1.0 +libcamd2.2.0 +libccolamd2.7.1 +libcholmod1.7.1 +libcolamd2.7.1 +libcommons-daemon-java +libcouchdb-glib-1.0-2 +libcouchdb-glib-dev +libcouchdb-glib-doc +libcsparse2.2.3 +libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev +libdesktopcouch-glib-1.0-2 +libdesktopcouch-glib-dev +libdirectfb-1.2-9 +libdirectfb-1.2-9-dbg +libdirectfb-bin +libdirectfb-bin-dbg +libdirectfb-dev +libdirectfb-extra +libdirectfb-extra-dbg +libgamin-dev +libgamin0 +libgdata-cil-dev +libgdict-1.0-6 +libgdict-1.0-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil +libglademm-2.4-1c2a +libglademm-2.4-dbg +libglademm-2.4-dev +libglademm-2.4-doc +libgladeui-1-11 +libgladeui-1-dev +libgmm-dev +libgo0 +libgo0-dbg +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev +libgtkhtml-editor-common +libgtkhtml-editor-dev +libgtkhtml-editor0 +libgtkhtml3.14-19 +libgtkhtml3.14-dbg +libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev +libklu1.1.0 +libldl2.0.1 +libllvm-2.8-ocaml-dev +libllvm-2.9-ocaml-dev +libllvm2.8 +libllvm2.9 +liblpsolve55-dev +libmodplug-dev +libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil +libmozjs185-1.0 +libmozjs185-dev +libmusicbrainz4-dev +libmysql-java +libnotify-cil-dev +libnotify0.4-cil +libofa0 +libofa0-dev +libpg-java +libpod-plainer-perl +libqt4-declarative-shaders +librcps-dev +librcps0 +libreadline-java +libreadline-java-doc +libsac-java +libsac-java-doc +libsac-java-gcj +libsublime-dev +libsuitesparse-dbg +libsuitesparse-dev +libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil +libtextcat-data +libtextcat-dev +libtextcat0 +libts-0.0-0 +libts-0.0-0-dbg +libts-bin +libts-dev +libumfpack5.4.0 +libvala-0.12-0 +libvala-0.12-0-dbg +libxine-dev +libxine1 +libxine1-bin +libxine1-console +libxine1-dbg +libxine1-doc +libxine1-ffmpeg +libxine1-gnome +libxine1-misc-plugins +libxine1-x +linux-wlan-ng +linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime +llvm-2.9 +llvm-2.9-dev +llvm-2.9-doc +llvm-2.9-examples +llvm-2.9-runtime +lp-solve +lp-solve-doc +mono-jay +mono-xsp2 +mono-xsp2-base +myspell-tools +nova-ajax-console-proxy +oxygen-icon-theme-complete +pngquant +python-aptdaemon.gtkwidgets +python-bittorrent +python-central +python-desktopcouch +python-desktopcouch-application +python-desktopcouch-records +python-desktopcouch-recordtypes +python-fontforge +python-gamin +python-indicate +python-smartpm +python-support +python-telepathy +python-xklavier +qt3-designer +squid +squid-common +swift +tomboy +tomcat6-user +tsconf +ttf-lao +ttf-sil-padauk +ttf-unfonts-extra +unionfs-fuse +vala-0.12-doc +valac-0.12 +valac-0.12-dbg +vinagre +x-ttcidfont-conf +xserver-xephyr +zeitgeist-extension-fts diff -Nru update-manager-17.10.11/DistUpgrade/demoted.cfg.hardy update-manager-0.156.14.15/DistUpgrade/demoted.cfg.hardy --- update-manager-17.10.11/DistUpgrade/demoted.cfg.hardy 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/demoted.cfg.hardy 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,568 @@ +# demoted packages from hardy to lucid +acpi +adept +analog +app-install-data-edubuntu +aspell-af +aspell-am +aspell-ar +aspell-bg +aspell-bn +aspell-br +aspell-ca +aspell-cs +aspell-cy +aspell-da +aspell-de +aspell-de-alt +aspell-el +aspell-eo +aspell-es +aspell-et +aspell-fa +aspell-fo +aspell-fr +aspell-ga +aspell-gl-minimos +aspell-gu +aspell-he +aspell-hr +aspell-hu +aspell-hy +aspell-is +aspell-it +aspell-ku +aspell-lt +aspell-lv +aspell-ml +aspell-nl +aspell-no +aspell-nr +aspell-ns +aspell-or +aspell-pa +aspell-pl +aspell-pt-br +aspell-pt-pt +aspell-ro +aspell-ru +aspell-sk +aspell-sl +aspell-ss +aspell-st +aspell-sv +aspell-ta +aspell-te +aspell-tn +aspell-ts +aspell-uk +aspell-xh +aspell-zu +atomix +atomix-data +bacula-traymonitor +bicyclerepair +binutils-static +brazilian-conjugate +bug-buddy +capiutils +cgilib +compiz-fusion-plugins-extra +console-tools +console-tools-dev +contacts-snapshot +cpp-4.1 +cpp-4.1-doc +cpp-4.2 +cpp-4.2-doc +cricket +cups-pdf +cupsddk +db4.6-doc +db4.6-util +debtags +denemo +desktop-base +diff-doc +discover1 +dpkg-awk +drdsl +edubuntu-artwork +edubuntu-desktop +edubuntu-desktop-kde +edubuntu-docs +edubuntu-server +elinks +elinks-data +elinks-doc +elisa +emacs22 +emacs22-bin-common +emacs22-common +emacs22-el +emacs22-nox +enigmail +epiphany-browser +epiphany-browser-data +epiphany-browser-dbg +epiphany-browser-dev +epiphany-extensions +epiphany-gecko +fbreader +fdutils +fontforge-doc +freeradius-dialupadmin +freeradius-iodbc +freeradius-krb5 +freeradius-ldap +freeradius-mysql +freeradius-postgresql +g++-4.2 +g++-4.2-multilib +galculator +gcc-4.1 +gcc-4.1-base +gcc-4.1-doc +gcc-4.1-multilib +gcc-4.1-source +gcc-4.2 +gcc-4.2-base +gcc-4.2-doc +gcc-4.2-locales +gcc-4.2-multilib +gcc-4.2-source +gcompris +gcompris-data +gcompris-dbg +gcompris-sound-ar +gcompris-sound-bg +gcompris-sound-br +gcompris-sound-cs +gcompris-sound-da +gcompris-sound-de +gcompris-sound-el +gcompris-sound-en +gcompris-sound-es +gcompris-sound-eu +gcompris-sound-fi +gcompris-sound-fr +gcompris-sound-hi +gcompris-sound-hu +gcompris-sound-id +gcompris-sound-it +gcompris-sound-mr +gcompris-sound-nb +gcompris-sound-nl +gcompris-sound-pt +gcompris-sound-ptbr +gcompris-sound-ru +gcompris-sound-so +gcompris-sound-sr +gcompris-sound-sv +gcompris-sound-tr +gcompris-sound-ur +gengetopt +gfortran-4.2 +gfortran-4.2-doc +glut-doc +glutg3-dev +gnome-icon-theme-gartoon +gnome-mount +gnome-netstatus-applet +gnome-pilot +gnome-pilot-conduits +gnome-volume-manager +gobby +gobjc-4.2 +gpaint +gpgsm +gstreamer0.10-gnomevfs +gthumb +gtk2-engines-sapwood +gtk2-engines-sapwood-dbg +guile-1.6 +guile-1.6-dev +guile-1.6-doc +guile-1.6-libs +hildon-control-panel +hildon-control-panel-dbg +hildon-control-panel-dev +hildon-control-panel-l10n-engb +hildon-control-panel-l10n-english +hildon-thumbnail +hildon-update-category-database +human-icon-theme +ibrazilian +ibritish +ibulgarian +icatalan +iczech +idanish +idutch +iesperanto +iestonian +ifaroese +ifrench-gut +ihungarian +iirish +iitalian +ilithuanian +imanx +indi +ingerman +inorwegian +iogerman +ipolish +iportuguese +ipppd +irussian +isdnutils-base +isdnutils-doc +isdnutils-xtools +ispanish +iswedish +iswiss +itagalog +italc-client +italc-master +iukrainian +javacc-doc +kdeartwork-theme-icon +kdeartwork-theme-window +keep +kernel-package +kexi +khelpcenter +kino +klogd +kmplayer +kmplayer-base +koffice-data +koffice-doc-html +koffice-libs +kspread +ktorrent +kubuntu-artwork-usplash +kugar +kwin-style-crystal +kword +kword-data +kxsldbg +language-support-writing-no +language-support-writing-sw +laptop-mode-tools +lib32gfortran2 +lib32gfortran2-dbg +lib32stdc++6-4.2-dbg +lib64gfortran2 +lib64gfortran2-dbg +lib64stdc++6-4.2-dbg +libalut-dev +libalut0 +libapache2-mod-auth-pam +libapache2-mod-auth-sys-group +libapache2-svn +libares-dev +libares0 +libavahi-compat-howl-dev +libavahi-compat-howl0 +libboost-python-dev +libcapi20-3 +libcapi20-dev +libcdio7 +libchicken-dev +libconsole +libdb4.2 +libdb4.2++-dev +libdb4.2++c2 +libdb4.2-dev +libdb4.6 +libdb4.6++ +libdb4.6++-dev +libdb4.6-dbg +libdb4.6-dev +libdb4.6-java +libdb4.6-java-dev +libdb4.6-java-gcj +libdiscover1-dev +libehcache-java +libesd-alsa0 +libfile-which-perl +libgda3-3 +libgda3-3-dbg +libgda3-common +libgda3-dev +libgda3-doc +libgfortran2 +libgfortran2-dbg +libggz-gtk-dev +libggz-gtk1 +libggzdmod++-dev +libggzdmod++1 +libggzdmod-dev +libggzdmod6 +libglew1.5 +libglew1.5-dev +libglut3 +libglut3-dev +libgnet-dev +libgnet2.0-0 +libgnome-speech-dev +libgnome-speech7 +libgnomevfs2-bin +libgnumail-java-doc +libguile-ltdl-1 +libhildon-1-0 +libhildon-1-0-dbg +libhildon-1-dev +libhildonhelp-dev +libhildonhelp0 +libhildonhelp0-dbg +libhildonmime-dev +libhildonmime0 +libhildonmime0-dbg +libio-socket-ssl-perl +libiso9660-dev +libitalc +libitext-java +libiw29 +libjakarta-poi-java +libjakarta-poi-java-doc +libjcommon-java +libjcommon-java-doc +libjsr107cache-java +libkpathsea4 +libloader-java +libloader-java-doc +liblockdev1 +liblockdev1-dbg +liblockdev1-dev +libmatchbox-dev +libmatchbox1 +libmikmod2 +libmikmod2-dev +libmimelib1-dev +libmimelib1c2a +libmokoui2-0 +libmokoui2-dev +libmokoui2-doc +libmysqlclient15off +libnet-ssleay-perl +libnet6-1.3-0 +libnet6-1.3-0-dbg +libnet6-1.3-dev +libobby-0.4-1 +libobby-0.4-dev +libopenal-dev +libopensync0 +libopensync0-dbg +libopensync0-dev +libosso-dev +libosso1 +libosso1-dbg +libosso1-doc +libpam-thinkfinger +libpigment-dbg +libpigment0.3-dev +libpixie-java +libpolkit-gnome-dev +libpolkit-gnome0 +libportaudio-dev +libportaudio-doc +libportaudio0 +libpqxx-2.6.9ldbl +libpqxx-dev +libpt-1.10.10 +libpt-1.10.10-dbg +libpt-1.10.10-plugins-alsa +libpt-1.10.10-plugins-v4l +libpt-1.10.10-plugins-v4l2 +libqcad0-dev +libqt-perl +libqthreads-12 +librsvg2-bin +librsync-dev +librsync1 +libscim-dev +libscim8c2a +libsdl-image1.2 +libsdl-image1.2-dev +libsdl-mixer1.2 +libsdl-mixer1.2-dev +libsdl-pango-dev +libsdl-pango1 +libsdl-ttf2.0-0 +libsdl-ttf2.0-dev +libsensors-dev +libsensors3 +libskim-dev +libskim0 +libsmbios-dev +libsmbios-doc +libsmokeqt-dev +libsmokeqt1 +libsmpeg-dev +libsmpeg0 +libsnmp-session-perl +libstdc++6-4.1-dbg +libstdc++6-4.1-doc +libstdc++6-4.2-dbg +libstdc++6-4.2-dev +libstdc++6-4.2-doc +libsvn-java +libsvn-ruby +libsvn-ruby1.8 +libthinkfinger-dev +libthinkfinger-doc +libthinkfinger0 +libwriter2latex-java-doc +libwv2-dev +libxml-encoding-perl +libxml-writer-perl +libzlcore-dev +libzltext-dev +libzlui-gtk +linux-headers-rt +lsb-languages +lsb-multimedia +maemo-af-desktop-l10n-engb +maemo-af-desktop-l10n-english +matchbox-keyboard +matchbox-window-manager +mce-dev +mesa-utils +mii-diag +mimetex +minicom +moodle +myspell-da +myspell-fr-gut +myspell-sw +netcat-traditional +nut-hal-drivers +openoffice.org-style-crystal +openoffice.org-writer2latex +osso-af-settings +osso-gwconnect +osso-gwconnect-dev +pccts +pidgin-otr +planner +planner-dev +policykit-gnome +policykit-gnome-doc +poster +powermanagement-interface +powernowd +pppdcapiplugin +pyqt-tools +python-bluez +python-clientform +python-daap +python-gdata +python-hildon +python-hildon-dev +python-launchpad-bugs +python-mechanize +python-numeric +python-numeric-dbg +python-numeric-ext +python-numeric-ext-dbg +python-pgm +python-pqueue +python-pylirc +python-pysqlite2 +python-pysqlite2-dbg +python-qt-dev +python-qt3 +python-qt3-dbg +python-qt3-doc +python-qtext +python-qtext-dbg +python-selinux +python-sexy +python-tcm +python-twisted-web2 +python-tz +python2.5 +python2.5-dbg +python2.5-doc +python2.5-examples +python2.5-minimal +qca-tls +qcad +qcad-doc +qt3-assistant +quanta +quanta-data +rasmol +rasmol-doc +rdiff-backup +rss-glx +scim +scim-anthy +scim-bridge-agent +scim-bridge-client-gtk +scim-bridge-client-qt +scim-bridge-client-qt4 +scim-chewing +scim-dev +scim-dev-doc +scim-gtk2-immodule +scim-hangul +scim-m17n +scim-modules-socket +scim-modules-table +scim-pinyin +scim-qtimm +scim-tables-additional +scim-tables-zh +selinux-utils +sensord +sepol-utils +skim +sound-juicer +speedcrunch +student-control-panel +swat +sysklogd +tagcoll +tangerine-icon-theme +tasks +tasks-dbg +tcl8.3 +tcl8.3-dev +tcl8.3-doc +tdb-tools +tetex-extra +thin-client-manager-backend +thin-client-manager-gnome +thinkfinger-tools +ttf-kochi-gothic +ttf-kochi-mincho +ttf-sil-andika +ttf-sil-doulos +ttf-sil-gentium +tuxmath +tuxpaint +tuxpaint-data +tuxpaint-stamps-default +tuxtype +tuxtype-data +usplash-theme-ubuntu +vlock +w3c-dtd-xhtml +workrave +xaos +xapian-examples +xapian-tools +xresprobe +xsane +xsane-common +xsane-doc +xserver-xorg-video-amd +xserver-xorg-video-amd-dbg +xserver-xorg-video-dummy +xserver-xorg-video-glint +xserver-xorg-video-via +zope-common diff -Nru update-manager-17.10.11/DistUpgrade/DevelReleaseAnnouncement update-manager-0.156.14.15/DistUpgrade/DevelReleaseAnnouncement --- update-manager-17.10.11/DistUpgrade/DevelReleaseAnnouncement 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DevelReleaseAnnouncement 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,58 @@ += Welcome to the Ubuntu 'Precise Pangolin' development release = + +''This is still a BETA release.'' +''Do not install it on production machines.'' + +Thanks for your interest in this development release of Ubuntu. +The Ubuntu developers are moving very quickly to bring you the +absolute latest and greatest software the Open Source Community has to +offer. This development release brings you a taste of the newest features +for the next version of Ubuntu. + +== Testing == + +Please help to test this development snapshot and report problems back to the +developers. For more information about testing Ubuntu, please read: + + http://www.ubuntu.com/testing + + +== Reporting Bugs == + +This development release of Ubuntu contains bugs. If you want to help +out with bugs, the Bug Squad is always looking for help. Please read the +following information about reporting bugs: + + http://help.ubuntu.com/community/ReportingBugs + +Then report bugs using apport in Ubuntu. For example: + + ubuntu-bug linux + +will open a bug report in Launchpad regarding the linux package. Your +comments, bug reports, patches and suggestions will help fix bugs and improve +future releases. + + +== Participate in Ubuntu == + +If you would like to help shape Ubuntu, take a look at the list of +ways you can participate at + + http://www.ubuntu.com/community/participate/ + + +== More Information == + +You can find out more about Ubuntu on the Ubuntu website and Ubuntu +wiki. + + http://www.ubuntu.com/ + http://wiki.ubuntu.com/ + + +To sign up for Ubuntu development announcements, please +subscribe to Ubuntu's development announcement list at: + + http://lists.ubuntu.com/mailman/listinfo/ubuntu-devel-announce + diff -Nru update-manager-17.10.11/DistUpgrade/dialog_changes.ui update-manager-0.156.14.15/DistUpgrade/dialog_changes.ui --- update-manager-17.10.11/DistUpgrade/dialog_changes.ui 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/dialog_changes.ui 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,213 @@ + + dialog_changes + + + + 0 + 0 + 588 + 417 + + + + + 0 + 0 + + + + Package Changes + + + true + + + + + + &Cancel + + + + + + + + + + + + 0 + 0 + + + + + + + image0 + + + false + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 20 + 80 + + + + + + + + + + + + + + + Qt::RichText + + + Qt::AlignVCenter + + + true + + + + + + + + 0 + 0 + + + + + + + Qt::RichText + + + Qt::AlignVCenter + + + true + + + + + + + + + + + Details >>> + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 341 + 21 + + + + + + + + _Start Upgrade + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 161 + 20 + + + + + + + + false + + + + 1 + + + + + + + + + + + button_confirm_changes + clicked() + dialog_changes + accept() + + + 20 + 20 + + + 20 + 20 + + + + + button_cancel_changes + clicked() + dialog_changes + reject() + + + 20 + 20 + + + 20 + 20 + + + + + diff -Nru update-manager-17.10.11/DistUpgrade/dialog_conffile.ui update-manager-0.156.14.15/DistUpgrade/dialog_conffile.ui --- update-manager-17.10.11/DistUpgrade/dialog_conffile.ui 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/dialog_conffile.ui 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,142 @@ + + dialog_conffile + + + + 0 + 0 + 372 + 319 + + + + Configuration File Change + + + true + + + + + + Show Difference >>> + + + + + + + + 0 + 0 + + + + + + + image0 + + + false + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 121 + 21 + + + + + + + + + + + true + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 336 + 20 + + + + + + + + Keep + + + + + + + Replace + + + + + + + + + + + + + keep_button + clicked() + dialog_conffile + reject() + + + 20 + 20 + + + 20 + 20 + + + + + replace_button + clicked() + dialog_conffile + accept() + + + 20 + 20 + + + 20 + 20 + + + + + diff -Nru update-manager-17.10.11/DistUpgrade/dialog_error.ui update-manager-0.156.14.15/DistUpgrade/dialog_error.ui --- update-manager-17.10.11/DistUpgrade/dialog_error.ui 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/dialog_error.ui 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,119 @@ + + dialog_error + + + + 0 + 0 + 427 + 343 + + + + Error + + + true + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 21 + 161 + + + + + + + + &Close + + + + + + + + 0 + 0 + + + + + + + image0 + + + false + + + + + + + + + + true + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 130 + 21 + + + + + + + + _Report Bug + + + + + + + + + + + + + button_close + clicked() + dialog_error + close() + + + 20 + 20 + + + 20 + 20 + + + + + diff -Nru update-manager-17.10.11/DistUpgrade/distinfo.py update-manager-0.156.14.15/DistUpgrade/distinfo.py --- update-manager-17.10.11/DistUpgrade/distinfo.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/distinfo.py 2015-11-26 16:33:29.000000000 +0000 @@ -0,0 +1,309 @@ +# distinfo.py - provide meta information for distro repositories +# +# Copyright (c) 2005 Gustavo Noronha Silva +# Copyright (c) 2006-2007 Sebastian Heinlein +# +# Authors: Gustavo Noronha Silva +# Sebastian Heinlein +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +from __future__ import print_function + +import errno +import logging +import os +from subprocess import Popen, PIPE +import re + +import apt_pkg + +from apt_pkg import gettext as _ + + +class Template(object): + + def __init__(self): + self.name = None + self.child = False + self.parents = [] # ref to parent template(s) + self.match_name = None + self.description = None + self.base_uri = None + self.type = None + self.components = [] + self.children = [] + self.match_uri = None + self.mirror_set = {} + self.distribution = None + self.available = True + self.official = True + + def has_component(self, comp): + ''' Check if the distribution provides the given component ''' + return comp in (c.name for c in self.components) + + def is_mirror(self, url): + ''' Check if a given url of a repository is a valid mirror ''' + proto, hostname, dir = split_url(url) + if hostname in self.mirror_set: + return self.mirror_set[hostname].has_repository(proto, dir) + else: + return False + + +class Component(object): + + def __init__(self, name, desc=None, long_desc=None, parent_component=None): + self.name = name + self.description = desc + self.description_long = long_desc + self.parent_component = parent_component + + def get_parent_component(self): + return self.parent_component + + def set_parent_component(self, parent): + self.parent_component = parent + + def get_description(self): + if self.description_long is not None: + return self.description_long + elif self.description is not None: + return self.description + else: + return None + + def set_description(self, desc): + self.description = desc + + def set_description_long(self, desc): + self.description_long = desc + + def get_description_long(self): + return self.description_long + + +class Mirror(object): + ''' Storage for mirror related information ''' + + def __init__(self, proto, hostname, dir, location=None): + self.hostname = hostname + self.repositories = [] + self.add_repository(proto, dir) + self.location = location + + def add_repository(self, proto, dir): + self.repositories.append(Repository(proto, dir)) + + def get_repositories_for_proto(self, proto): + return [r for r in self.repositories if r.proto == proto] + + def has_repository(self, proto, dir): + if dir is None: + return False + for r in self.repositories: + if r.proto == proto and dir in r.dir: + return True + return False + + def get_repo_urls(self): + return [r.get_url(self.hostname) for r in self.repositories] + + def get_location(self): + return self.location + + def set_location(self, location): + self.location = location + + +class Repository(object): + + def __init__(self, proto, dir): + self.proto = proto + self.dir = dir + + def get_info(self): + return self.proto, self.dir + + def get_url(self, hostname): + return "%s://%s/%s" % (self.proto, hostname, self.dir) + + +def split_url(url): + ''' split a given URL into the protocoll, the hostname and the dir part ''' + split = re.split(":*\/+", url, maxsplit=2) + while len(split) < 3: + split.append(None) + return split + + +class DistInfo(object): + + def __init__(self, dist=None, base_dir="/usr/share/python-apt/templates"): + self.metarelease_uri = '' + self.templates = [] + self.arch = apt_pkg.config.find("APT::Architecture") + + location = None + match_loc = re.compile(r"^#LOC:(.+)$") + match_mirror_line = re.compile( + r"^(#LOC:.+)|(((http)|(ftp)|(rsync)|(file)|(mirror)|(https))://" + r"[A-Za-z0-9/\.:\-_@]+)$") + #match_mirror_line = re.compile(r".+") + + if not dist: + try: + dist = Popen(["lsb_release", "-i", "-s"], + stdout=PIPE).communicate()[0].strip() + except OSError as exc: + if exc.errno != errno.ENOENT: + logging.warning( + 'lsb_release failed, using defaults:' % exc) + dist = "Debian" + + self.dist = dist + + map_mirror_sets = {} + + dist_fname = "%s/%s.info" % (base_dir, dist) + with open(dist_fname) as dist_file: + template = None + component = None + for line in dist_file: + tokens = line.split(':', 1) + if len(tokens) < 2: + continue + field = tokens[0].strip() + value = tokens[1].strip() + if field == 'ChangelogURI': + self.changelogs_uri = _(value) + elif field == 'MetaReleaseURI': + self.metarelease_uri = value + elif field == 'Suite': + self.finish_template(template, component) + component = None + template = Template() + template.name = value + template.distribution = dist + template.match_name = "^%s$" % value + elif field == 'MatchName': + template.match_name = value + elif field == 'ParentSuite': + template.child = True + for nanny in self.templates: + # look for parent and add back ref to it + if nanny.name == value: + template.parents.append(nanny) + nanny.children.append(template) + elif field == 'Available': + template.available = apt_pkg.string_to_bool(value) + elif field == 'Official': + template.official = apt_pkg.string_to_bool(value) + elif field == 'RepositoryType': + template.type = value + elif field == 'BaseURI' and not template.base_uri: + template.base_uri = value + elif field == 'BaseURI-%s' % self.arch: + template.base_uri = value + elif field == 'MatchURI' and not template.match_uri: + template.match_uri = value + elif field == 'MatchURI-%s' % self.arch: + template.match_uri = value + elif (field == 'MirrorsFile' or + field == 'MirrorsFile-%s' % self.arch): + # Make the path absolute. + value = os.path.isabs(value) and value or \ + os.path.abspath(os.path.join(base_dir, value)) + if value not in map_mirror_sets: + mirror_set = {} + try: + with open(value) as value_f: + mirror_data = list(filter( + match_mirror_line.match, + [x.strip() for x in value_f])) + except Exception: + print("WARNING: Failed to read mirror file") + mirror_data = [] + for line in mirror_data: + if line.startswith("#LOC:"): + location = match_loc.sub(r"\1", line) + continue + (proto, hostname, dir) = split_url(line) + if hostname in mirror_set: + mirror_set[hostname].add_repository(proto, dir) + else: + mirror_set[hostname] = Mirror( + proto, hostname, dir, location) + map_mirror_sets[value] = mirror_set + template.mirror_set = map_mirror_sets[value] + elif field == 'Description': + template.description = _(value) + elif field == 'Component': + if (component and not + template.has_component(component.name)): + template.components.append(component) + component = Component(value) + elif field == 'CompDescription': + component.set_description(_(value)) + elif field == 'CompDescriptionLong': + component.set_description_long(_(value)) + elif field == 'ParentComponent': + component.set_parent_component(value) + self.finish_template(template, component) + template = None + component = None + + def finish_template(self, template, component): + " finish the current tempalte " + if not template: + return + # reuse some properties of the parent template + if template.match_uri is None and template.child: + for t in template.parents: + if t.match_uri: + template.match_uri = t.match_uri + break + if template.mirror_set == {} and template.child: + for t in template.parents: + if t.match_uri: + template.mirror_set = t.mirror_set + break + if component and not template.has_component(component.name): + template.components.append(component) + component = None + # the official attribute is inherited + for t in template.parents: + template.official = t.official + self.templates.append(template) + + +if __name__ == "__main__": + d = DistInfo("Ubuntu", "/usr/share/python-apt/templates") + logging.info(d.changelogs_uri) + for template in d.templates: + logging.info("\nSuite: %s" % template.name) + logging.info("Desc: %s" % template.description) + logging.info("BaseURI: %s" % template.base_uri) + logging.info("MatchURI: %s" % template.match_uri) + if template.mirror_set != {}: + logging.info("Mirrors: %s" % list(template.mirror_set.keys())) + for comp in template.components: + logging.info(" %s -%s -%s" % (comp.name, + comp.description, + comp.description_long)) + for child in template.children: + logging.info(" %s" % child.description) diff -Nru update-manager-17.10.11/DistUpgrade/distro.py update-manager-0.156.14.15/DistUpgrade/distro.py --- update-manager-17.10.11/DistUpgrade/distro.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/distro.py 2015-11-26 16:33:29.000000000 +0000 @@ -0,0 +1,537 @@ +# distro.py - Provide a distro abstraction of the sources.list +# +# Copyright (c) 2004-2009 Canonical Ltd. +# Copyright (c) 2006-2007 Sebastian Heinlein +# +# Authors: Sebastian Heinlein +# Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import gettext +import logging +import re +import os + +from xml.etree.ElementTree import ElementTree + +from apt_pkg import gettext as _ + + +class NoDistroTemplateException(Exception): + pass + + +class Distribution(object): + + def __init__(self, id, codename, description, release): + """ Container for distribution specific informations """ + # LSB information + self.id = id + self.codename = codename + self.description = description + self.release = release + + self.binary_type = "deb" + self.source_type = "deb-src" + + def get_sources(self, sourceslist): + """ + Find the corresponding template, main and child sources + for the distribution + """ + + self.sourceslist = sourceslist + # corresponding sources + self.source_template = None + self.child_sources = [] + self.main_sources = [] + self.disabled_sources = [] + self.cdrom_sources = [] + self.download_comps = [] + self.enabled_comps = [] + self.cdrom_comps = [] + self.used_media = [] + self.get_source_code = False + self.source_code_sources = [] + + # location of the sources + self.default_server = "" + self.main_server = "" + self.nearest_server = "" + self.used_servers = [] + + # find the distro template + for template in self.sourceslist.matcher.templates: + if (self.is_codename(template.name) and + template.distribution == self.id): + #print "yeah! found a template for %s" % self.description + #print template.description, template.base_uri, \ + # template.components + self.source_template = template + break + if self.source_template is None: + raise NoDistroTemplateException( + "Error: could not find a distribution template for %s/%s" % + (self.id, self.codename)) + + # find main and child sources + media = [] + comps = [] + cdrom_comps = [] + enabled_comps = [] + #source_code = [] + for source in self.sourceslist.list: + if (not source.invalid and + self.is_codename(source.dist) and + source.template and + source.template.official and + self.is_codename(source.template.name)): + #print "yeah! found a distro repo: %s" % source.line + # cdroms need do be handled differently + if (source.uri.startswith("cdrom:") and + not source.disabled): + self.cdrom_sources.append(source) + cdrom_comps.extend(source.comps) + elif (source.uri.startswith("cdrom:") and + source.disabled): + self.cdrom_sources.append(source) + elif (source.type == self.binary_type and + not source.disabled): + self.main_sources.append(source) + comps.extend(source.comps) + media.append(source.uri) + elif (source.type == self.binary_type and + source.disabled): + self.disabled_sources.append(source) + elif (source.type == self.source_type and + not source.disabled): + self.source_code_sources.append(source) + elif (source.type == self.source_type and + source.disabled): + self.disabled_sources.append(source) + if (not source.invalid and + source.template in self.source_template.children): + if (not source.disabled and + source.type == self.binary_type): + self.child_sources.append(source) + elif (not source.disabled and + source.type == self.source_type): + self.source_code_sources.append(source) + else: + self.disabled_sources.append(source) + self.download_comps = set(comps) + self.cdrom_comps = set(cdrom_comps) + enabled_comps.extend(comps) + enabled_comps.extend(cdrom_comps) + self.enabled_comps = set(enabled_comps) + self.used_media = set(media) + self.get_mirrors() + + def get_mirrors(self, mirror_template=None): + """ + Provide a set of mirrors where you can get the distribution from + """ + # the main server is stored in the template + self.main_server = self.source_template.base_uri + + # other used servers + for medium in self.used_media: + if not medium.startswith("cdrom:"): + # seems to be a network source + self.used_servers.append(medium) + + if len(self.main_sources) == 0: + self.default_server = self.main_server + else: + self.default_server = self.main_sources[0].uri + + # get a list of country codes and real names + self.countries = {} + fname = "/usr/share/xml/iso-codes/iso_3166.xml" + if os.path.exists(fname): + et = ElementTree(file=fname) + # python2.6 compat, the next two lines can get removed + # once we do not use py2.6 anymore + if getattr(et, "iter", None) is None: + et.iter = et.getiterator + it = et.iter('iso_3166_entry') + for elm in it: + try: + descr = elm.attrib["common_name"] + except KeyError: + descr = elm.attrib["name"] + try: + code = elm.attrib["alpha_2_code"] + except KeyError: + code = elm.attrib["alpha_3_code"] + self.countries[code.lower()] = gettext.dgettext('iso_3166', + descr) + + # try to guess the nearest mirror from the locale + self.country = None + self.country_code = None + locale = os.getenv("LANG", default="en_UK") + a = locale.find("_") + z = locale.find(".") + if z == -1: + z = len(locale) + country_code = locale[a + 1:z].lower() + + if mirror_template: + self.nearest_server = mirror_template % country_code + + if country_code in self.countries: + self.country = self.countries[country_code] + self.country_code = country_code + + def _get_mirror_name(self, server): + ''' Try to get a human readable name for the main mirror of a country + Customize for different distributions ''' + country = None + i = server.find("://") + l = server.find(".archive.ubuntu.com") + if i != -1 and l != -1: + country = server[i + len("://"):l] + if country in self.countries: + # TRANSLATORS: %s is a country + return _("Server for %s") % self.countries[country] + else: + return("%s" % server.rstrip("/ ")) + + def get_server_list(self): + ''' Return a list of used and suggested servers ''' + + def compare_mirrors(mir1, mir2): + ''' Helper function that handles comaprision of mirror urls + that could contain trailing slashes''' + return re.match(mir1.strip("/ "), mir2.rstrip("/ ")) + + # Store all available servers: + # Name, URI, active + mirrors = [] + if (len(self.used_servers) < 1 or + (len(self.used_servers) == 1 and + compare_mirrors(self.used_servers[0], self.main_server))): + mirrors.append([_("Main server"), self.main_server, True]) + if self.nearest_server: + mirrors.append([self._get_mirror_name(self.nearest_server), + self.nearest_server, False]) + elif (len(self.used_servers) == 1 and not + compare_mirrors(self.used_servers[0], self.main_server)): + mirrors.append([_("Main server"), self.main_server, False]) + # Only one server is used + server = self.used_servers[0] + + # Append the nearest server if it's not already used + if self.nearest_server: + if not compare_mirrors(server, self.nearest_server): + mirrors.append([self._get_mirror_name(self.nearest_server), + self.nearest_server, False]) + if server: + mirrors.append([self._get_mirror_name(server), server, True]) + + elif len(self.used_servers) > 1: + # More than one server is used. Since we don't handle this case + # in the user interface we set "custom servers" to true and + # append a list of all used servers + mirrors.append([_("Main server"), self.main_server, False]) + if self.nearest_server: + mirrors.append([self._get_mirror_name(self.nearest_server), + self.nearest_server, False]) + mirrors.append([_("Custom servers"), None, True]) + for server in self.used_servers: + mirror_entry = [self._get_mirror_name(server), server, False] + if (compare_mirrors(server, self.nearest_server) or + compare_mirrors(server, self.main_server)): + continue + elif mirror_entry not in mirrors: + mirrors.append(mirror_entry) + + return mirrors + + def add_source(self, type=None, + uri=None, dist=None, comps=None, comment=""): + """ + Add distribution specific sources + """ + if uri is None: + # FIXME: Add support for the server selector + uri = self.default_server + if dist is None: + dist = self.codename + if comps is None: + comps = list(self.enabled_comps) + if type is None: + type = self.binary_type + new_source = self.sourceslist.add(type, uri, dist, comps, comment) + # if source code is enabled add a deb-src line after the new + # source + if self.get_source_code and type == self.binary_type: + self.sourceslist.add( + self.source_type, uri, dist, comps, comment, + file=new_source.file, + pos=self.sourceslist.list.index(new_source) + 1) + + def enable_component(self, comp): + """ + Enable a component in all main, child and source code sources + (excluding cdrom based sources) + + comp: the component that should be enabled + """ + comps = set([comp]) + # look for parent components that we may have to add + for source in self.main_sources: + for c in source.template.components: + if c.name == comp and c.parent_component: + comps.add(c.parent_component) + for c in comps: + self._enable_component(c) + + def _enable_component(self, comp): + + def add_component_only_once(source, comps_per_dist): + """ + Check if we already added the component to the repository, since + a repository could be splitted into different apt lines. If not + add the component + """ + # if we don't have that distro, just return (can happen for e.g. + # dapper-update only in deb-src + if source.dist not in comps_per_dist: + return + # if we have seen this component already for this distro, + # return (nothing to do) + if comp in comps_per_dist[source.dist]: + return + # add it + source.comps.append(comp) + comps_per_dist[source.dist].add(comp) + + sources = [] + sources.extend(self.main_sources) + sources.extend(self.child_sources) + # store what comps are enabled already per distro (where distro is + # e.g. "dapper", "dapper-updates") + comps_per_dist = {} + comps_per_sdist = {} + for s in sources: + if s.type == self.binary_type: + if s.dist not in comps_per_dist: + comps_per_dist[s.dist] = set() + for c in s.comps: + comps_per_dist[s.dist].add(c) + for s in self.source_code_sources: + if s.type == self.source_type: + if s.dist not in comps_per_sdist: + comps_per_sdist[s.dist] = set() + for c in s.comps: + comps_per_sdist[s.dist].add(c) + + # check if there is a main source at all + if len(self.main_sources) < 1: + # create a new main source + self.add_source(comps=["%s" % comp]) + else: + # add the comp to all main, child and source code sources + for source in sources: + add_component_only_once(source, comps_per_dist) + + for source in self.source_code_sources: + add_component_only_once(source, comps_per_sdist) + + # check if there is a main source code source at all + if self.get_source_code: + if len(self.source_code_sources) < 1: + # create a new main source + self.add_source(type=self.source_type, comps=["%s" % comp]) + else: + # add the comp to all main, child and source code sources + for source in self.source_code_sources: + add_component_only_once(source, comps_per_sdist) + + def disable_component(self, comp): + """ + Disable a component in all main, child and source code sources + (excluding cdrom based sources) + """ + sources = [] + sources.extend(self.main_sources) + sources.extend(self.child_sources) + sources.extend(self.source_code_sources) + if comp in self.cdrom_comps: + sources = [] + sources.extend(self.main_sources) + for source in sources: + if comp in source.comps: + source.comps.remove(comp) + if len(source.comps) < 1: + self.sourceslist.remove(source) + + def change_server(self, uri): + ''' Change the server of all distro specific sources to + a given host ''' + + def change_server_of_source(source, uri, seen): + # Avoid creating duplicate entries + source.uri = uri + for comp in source.comps: + if [source.uri, source.dist, comp] in seen: + source.comps.remove(comp) + else: + seen.append([source.uri, source.dist, comp]) + if len(source.comps) < 1: + self.sourceslist.remove(source) + + seen_binary = [] + seen_source = [] + self.default_server = uri + for source in self.main_sources: + change_server_of_source(source, uri, seen_binary) + for source in self.child_sources: + # Do not change the forces server of a child source + if (source.template.base_uri is None or + source.template.base_uri != source.uri): + change_server_of_source(source, uri, seen_binary) + for source in self.source_code_sources: + change_server_of_source(source, uri, seen_source) + + def is_codename(self, name): + ''' Compare a given name with the release codename. ''' + if name == self.codename: + return True + else: + return False + + +class DebianDistribution(Distribution): + ''' Class to support specific Debian features ''' + + def is_codename(self, name): + ''' Compare a given name with the release codename and check if + if it can be used as a synonym for a development releases ''' + if name == self.codename or self.release in ("testing", "unstable"): + return True + else: + return False + + def _get_mirror_name(self, server): + ''' Try to get a human readable name for the main mirror of a country + Debian specific ''' + country = None + i = server.find("://ftp.") + l = server.find(".debian.org") + if i != -1 and l != -1: + country = server[i + len("://ftp."):l] + if country in self.countries: + # TRANSLATORS: %s is a country + return _("Server for %s") % gettext.dgettext( + "iso_3166", self.countries[country].rstrip()).rstrip() + else: + return("%s" % server.rstrip("/ ")) + + def get_mirrors(self): + Distribution.get_mirrors( + self, mirror_template="http://ftp.%s.debian.org/debian/") + + +class UbuntuDistribution(Distribution): + ''' Class to support specific Ubuntu features ''' + + def get_mirrors(self): + Distribution.get_mirrors( + self, mirror_template="http://%s.archive.ubuntu.com/ubuntu/") + + +class UbuntuRTMDistribution(UbuntuDistribution): + ''' Class to support specific Ubuntu RTM features ''' + + def get_mirrors(self): + self.main_server = self.source_template.base_uri + + +def _lsb_release(): + """Call lsb_release --idrc and return a mapping.""" + from subprocess import Popen, PIPE + import errno + result = {'Codename': 'sid', 'Distributor ID': 'Debian', + 'Description': 'Debian GNU/Linux unstable (sid)', + 'Release': 'unstable'} + try: + out = Popen(['lsb_release', '-idrc'], stdout=PIPE).communicate()[0] + # Convert to unicode string, needed for Python 3.1 + out = out.decode("utf-8") + result.update(l.split(":\t") for l in out.split("\n") if ':\t' in l) + except OSError as exc: + if exc.errno != errno.ENOENT: + logging.warning('lsb_release failed, using defaults:' % exc) + return result + + +def _system_image_channel(): + """Get the current channel from system-image-cli -i if possible.""" + from subprocess import Popen, PIPE + import errno + try: + from subprocess import DEVNULL + except ImportError: + # no DEVNULL in 2.7 + DEVNULL = os.open(os.devnull, os.O_RDWR) + try: + out = Popen( + ['system-image-cli', '-i'], stdout=PIPE, stderr=DEVNULL, + universal_newlines=True).communicate()[0] + for l in out.splitlines(): + if l.startswith('channel: '): + return l.split(': ', 1)[1] + except OSError as exc: + if exc.errno != errno.ENOENT: + logging.warning( + 'system-image-cli failed, using defaults: %s' % exc) + return None + + +def get_distro(id=None, codename=None, description=None, release=None): + """ + Check the currently used distribution and return the corresponding + distriubtion class that supports distro specific features. + + If no paramter are given the distro will be auto detected via + a call to lsb-release + """ + # make testing easier + if not (id and codename and description and release): + result = _lsb_release() + id = result['Distributor ID'] + codename = result['Codename'] + description = result['Description'] + release = result['Release'] + if id == "Ubuntu": + channel = _system_image_channel() + if channel is not None and "ubuntu-rtm/" in channel: + id = "Ubuntu-RTM" + codename = channel.rsplit("/", 1)[1].split("-", 1)[0] + description = codename + release = codename + if id == "Ubuntu": + return UbuntuDistribution(id, codename, description, release) + if id == "Ubuntu-RTM": + return UbuntuRTMDistribution(id, codename, description, release) + elif id == "Debian": + return DebianDistribution(id, codename, description, release) + else: + return Distribution(id, codename, description, release) diff -Nru update-manager-17.10.11/DistUpgrade/DistUpgradeApport.py update-manager-0.156.14.15/DistUpgrade/DistUpgradeApport.py --- update-manager-17.10.11/DistUpgrade/DistUpgradeApport.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DistUpgradeApport.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,109 @@ + +import os +import os.path +import logging +import subprocess +import sys +import gettext +import errno + +APPORT_WHITELIST = { + "apt.log": "Aptlog", + "apt-term.log": "Apttermlog", + "apt-clone_system_state.tar.gz": "Aptclonesystemstate.tar.gz", + "history.log": "Historylog", + "lspci.txt": "Lspcitxt", + "main.log": "Mainlog", + "term.log": "Termlog", + "screenlog.0": "Screenlog", + "xorg_fixup.log": "Xorgfixup" + } + + +def _apport_append_logfiles(report, logdir="/var/log/dist-upgrade/"): + dirname = 'VarLogDistupgrade' + for fname in APPORT_WHITELIST: + f = os.path.join(logdir, fname) + if not os.path.isfile(f) or os.path.getsize(f) == 0: + continue + ident = dirname + APPORT_WHITELIST[fname] + report[ident] = (open(f), ) + +def apport_crash(type, value, tb): + logging.debug("running apport_crash()") + try: + from apport_python_hook import apport_excepthook + from apport.report import Report + except ImportError, e: + logging.error("failed to import apport python module, can't report bug: %s" % e) + return False + # we pretend we are update-manager + sys.argv[0] = "/usr/bin/update-manager" + apport_excepthook(type, value, tb) + # now add the files in /var/log/dist-upgrade/* + if os.path.exists('/var/crash/_usr_bin_update-manager.0.crash'): + report = Report() + report.setdefault('Tags', 'dist-upgrade') + report['Tags'] += ' dist-upgrade' + _apport_append_logfiles(report) + report.add_to_existing('/var/crash/_usr_bin_update-manager.0.crash') + return True + +def apport_pkgfailure(pkg, errormsg): + logging.debug("running apport_pkgfailure() %s: %s", pkg, errormsg) + LOGDIR="/var/log/dist-upgrade/" + s = "/usr/share/apport/package_hook" + + # we do not report followup errors from earlier failures + # dpkg messages will not be translated if DPKG_UNTRANSLATED_MESSAGES is + # set which it is by default so check for the English message first + if "dependency problems - leaving unconfigured" in errormsg: + return False + if gettext.dgettext('dpkg', "dependency problems - leaving unconfigured") in errormsg: + return False + # we do not run apport_pkgfailure for full disk errors + if os.strerror(errno.ENOSPC) in errormsg: + logging.debug("dpkg error because of full disk, not reporting against %s " % pkg) + return False + + if os.path.exists(s): + args = [s, "-p", pkg] + for fname in APPORT_WHITELIST: + args.extend(["-l", os.path.join(LOGDIR, fname)]) + try: + p = subprocess.Popen(args, stdin=subprocess.PIPE) + p.stdin.write("ErrorMessage: %s\n" % errormsg) + p.stdin.close() + #p.wait() + except Exception, e: + logging.warning("Failed to run apport (%s)" % e) + return False + return True + return False + +def run_apport(): + " run apport, check if we have a display " + if "RELEASE_UPRADER_NO_APPORT" in os.environ: + logging.debug("RELEASE_UPRADER_NO_APPORT env set") + return False + if "DISPLAY" in os.environ: + for p in ["/usr/share/apport/apport-gtk", "/usr/share/apport/apport-qt"]: + if os.path.exists(p): + ret = -1 + try: + ret = subprocess.call(p) + except Exception: + logging.exception("Unable to launch '%s' " % p) + return (ret == 0) + elif os.path.exists("/usr/bin/apport-cli"): + try: + return (subprocess.call("/usr/bin/apport-cli") == 0) + except Exception: + logging.exception("Unable to launch '/usr/bin/apport-cli'") + return False + logging.debug("can't find apport") + return False + + +if __name__ == "__main__": + apport_crash(None, None, None) diff -Nru update-manager-17.10.11/DistUpgrade/DistUpgradeAptCdrom.py update-manager-0.156.14.15/DistUpgrade/DistUpgradeAptCdrom.py --- update-manager-17.10.11/DistUpgrade/DistUpgradeAptCdrom.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DistUpgradeAptCdrom.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,298 @@ +# DistUpgradeAptCdrom.py +# +# Copyright (c) 2008 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import re +import os +import apt +import apt_pkg +import logging +import gzip +import shutil +import subprocess +from gettext import gettext as _ + + +class AptCdromError(Exception): + " base exception for apt cdrom errors " + pass + +class AptCdrom(object): + " represents a apt cdrom object " + + def __init__(self, view, path): + self.view = view + self.cdrompath = path + # the directories we found on disk with signatures, packages and i18n + self.packages = set() + self.signatures = set() + self.i18n = set() + + def restoreBackup(self, backup_ext): + " restore the backup copy of the cdroms.list file (*not* sources.list)! " + cdromstate = os.path.join(apt_pkg.Config.find_dir("Dir::State"), + apt_pkg.Config.find("Dir::State::cdroms")) + if os.path.exists(cdromstate+backup_ext): + shutil.copy(cdromstate+backup_ext, cdromstate) + # mvo: we don't have to care about restoring the sources.list here because + # aptsources will do this for us anyway + + + def comment_out_cdrom_entry(self): + """ comment out the cdrom entry """ + diskname = self._readDiskName() + pentry = self._generateSourcesListLine(diskname, self.packages) + sourceslist=apt_pkg.Config.find_file("Dir::Etc::sourcelist") + content = open(sourceslist).read() + content = content.replace(pentry, "# %s" % pentry) + open(sourceslist, "w").write(content) + + def _scanCD(self): + """ + scan the CD for interessting files and return them as: + (packagesfiles, signaturefiles, i18nfiles) + """ + packages = set() + signatures = set() + i18n = set() + for root, dirs, files in os.walk(self.cdrompath, topdown=True): + if (root.endswith("debian-installer") or + root.endswith("dist-upgrader")): + del dirs[:] + continue + elif ".aptignr" in files: + continue + elif "Packages" in files: + packages.add(os.path.join(root,"Packages")) + elif "Packages.gz" in files: + packages.add(os.path.join(root,"Packages.gz")) + elif "Sources" in files or "Sources.gz" in files: + logging.error("Sources entry found in %s but not supported" % root) + elif "Release.gpg" in files: + signatures.add(os.path.join(root,"Release.gpg")) + elif "i18n" in dirs: + for f in os.listdir(os.path.join(root,"i18n")): + i18n.add(os.path.join(root,"i18n",f)) + # there is nothing under pool but deb packages (no + # indexfiles, so we skip that here + elif os.path.split(root)[1] == ("pool"): + del dirs[:] + return (packages, signatures, i18n) + + def _writeDatabase(self): + " update apts cdrom.list " + dbfile = apt_pkg.Config.find_file("Dir::State::cdroms") + cdrom = apt_pkg.Cdrom() + id=cdrom.ident(apt.progress.base.CdromProgress()) + label = self._readDiskName() + out=open(dbfile,"a") + out.write('CD::%s "%s";\n' % (id, label)) + out.write('CD::%s::Label "%s";\n' % (id, label)) + + def _dropArch(self, packages): + " drop architectures that are not ours " + # create a copy + packages = set(packages) + # now go over the packagesdirs and drop stuff that is not + # our binary-$arch + arch = apt_pkg.Config.find("APT::Architecture") + for d in set(packages): + if "/binary-" in d and not arch in d: + packages.remove(d) + return packages + + def _readDiskName(self): + # default to cdrompath if there is no name + diskname = self.cdrompath + info = os.path.join(self.cdrompath, ".disk","info") + if os.path.exists(info): + diskname = open(info).read() + for special in ('"',']','[','_'): + diskname = diskname.replace(special,'_') + return diskname + + def _generateSourcesListLine(self, diskname, packages): + # see apts indexcopy.cc:364 for details + path = "" + dist = "" + comps = [] + for d in packages: + # match(1) is the path, match(2) the dist + # and match(3) the components + m = re.match("(.*)/dists/([^/]*)/(.*)/binary-*", d) + if not m: + raise AptCdromError, _("Could not calculate sources.list entry") + path = m.group(1) + dist = m.group(2) + comps.append(m.group(3)) + if not path or not comps: + return None + comps.sort() + pentry = "deb cdrom:[%s]/ %s %s" % (diskname, dist, " ".join(comps)) + return pentry + + def _copyTranslations(self, translations, targetdir=None): + if not targetdir: + targetdir=apt_pkg.Config.find_dir("Dir::State::lists") + diskname = self._readDiskName() + for f in translations: + fname = apt_pkg.URItoFileName("cdrom:[%s]/%s" % (diskname,f[f.find("dists"):])) + outf = os.path.join(targetdir,os.path.splitext(fname)[0]) + if f.endswith(".gz"): + g=gzip.open(f) + out=open(outf,"w") + # uncompress in 64k chunks + while True: + s=g.read(64000) + out.write(s) + if s == "": + break + else: + shutil.copy(f,outf) + return True + + def _copyPackages(self, packages, targetdir=None): + if not targetdir: + targetdir=apt_pkg.Config.find_dir("Dir::State::lists") + # CopyPackages() + diskname = self._readDiskName() + for f in packages: + fname = apt_pkg.URItoFileName("cdrom:[%s]/%s" % (diskname,f[f.find("dists"):])) + outf = os.path.join(targetdir,os.path.splitext(fname)[0]) + if f.endswith(".gz"): + g=gzip.open(f) + out=open(outf,"w") + # uncompress in 64k chunks + while True: + s=g.read(64000) + out.write(s) + if s == "": + break + else: + shutil.copy(f,outf) + return True + + def _verifyRelease(self, signatures): + " verify the signatues and hashes " + gpgv = apt_pkg.Config.find("Dir::Bin::gpg","/usr/bin/gpgv") + keyring = apt_pkg.Config.find("Apt::GPGV::TrustedKeyring", + "/etc/apt/trusted.gpg") + for sig in signatures: + basepath = os.path.split(sig)[0] + # do gpg checking + releasef = os.path.splitext(sig)[0] + cmd = [gpgv,"--keyring",keyring, + "--ignore-time-conflict", + sig, releasef] + ret = subprocess.call(cmd) + if not (ret == 0): + return False + # now do the hash sum checks + t=apt_pkg.ParseTagFile(open(releasef)) + t.step() + for entry in t.section["SHA256"].split("\n"): + (hash,size,name) = entry.split() + f=os.path.join(basepath,name) + if not os.path.exists(f): + logging.info("ignoring missing '%s'" % f) + continue + sum = apt_pkg.sha256sum(open(f)) + if not (sum == hash): + logging.error("hash sum mismatch expected %s but got %s" % (hash, sum)) + return False + return True + + def _copyRelease(self, signatures, targetdir=None): + " copy the release file " + if not targetdir: + targetdir=apt_pkg.Config.find_dir("Dir::State::lists") + diskname = self._readDiskName() + for sig in signatures: + releasef = os.path.splitext(sig)[0] + # copy both Release and Release.gpg + for f in (sig, releasef): + fname = apt_pkg.URItoFileName("cdrom:[%s]/%s" % (diskname,f[f.find("dists"):])) + shutil.copy(f,os.path.join(targetdir,fname)) + return True + + def _doAdd(self): + " reimplement pkgCdrom::Add() in python " + # os.walk() will not follow symlinks so we don't need + # pkgCdrom::Score() and not dropRepeats() that deal with + # killing the links + (self.packages, self.signatures, self.i18n) = self._scanCD() + self.packages = self._dropArch(self.packages) + if len(self.packages) == 0: + logging.error("no useable indexes found on CD, wrong ARCH?") + raise AptCdromError, _("Unable to locate any package files, perhaps this is not a Ubuntu Disc or the wrong architecture?") + + # CopyAndVerify + if self._verifyRelease(self.signatures): + self._copyRelease(self.signatures) + + # copy the packages and translations + self._copyPackages(self.packages) + self._copyTranslations(self.i18n) + + # add CD to cdroms.list "database" and update sources.list + diskname = self._readDiskName() + if not diskname: + logging.error("no .disk/ directory found") + return False + debline = self._generateSourcesListLine(diskname, self.packages) + + # prepend to the sources.list + sourceslist=apt_pkg.Config.find_file("Dir::Etc::sourcelist") + content=open(sourceslist).read() + open(sourceslist,"w").write("# added by the release upgrader\n%s\n%s" % (debline,content)) + self._writeDatabase() + + return True + + def add(self, backup_ext=None): + " add a cdrom to apt's database " + logging.debug("AptCdrom.add() called with '%s'", self.cdrompath) + # do backup (if needed) of the cdroms.list file + if backup_ext: + cdromstate = os.path.join(apt_pkg.Config.find_dir("Dir::State"), + apt_pkg.Config.find("Dir::State::cdroms")) + if os.path.exists(cdromstate): + shutil.copy(cdromstate, cdromstate+backup_ext) + # do the actual work + apt_pkg.Config.Set("Acquire::cdrom::mount",self.cdrompath) + apt_pkg.Config.Set("APT::CDROM::NoMount","true") + # FIXME: add cdrom progress here for the view + #progress = self.view.getCdromProgress() + try: + res = self._doAdd() + except (SystemError, AptCdromError), e: + logging.error("can't add cdrom: %s" % e) + self.view.error(_("Failed to add the CD"), + _("There was a error adding the CD, the " + "upgrade will abort. Please report this as " + "a bug if this is a valid Ubuntu CD.\n\n" + "The error message was:\n'%s'") % e) + return False + logging.debug("AptCdrom.add() returned: %s" % res) + return res + + def __nonzero__(self): + """ helper to use this as 'if cdrom:' """ + return self.cdrompath is not None diff -Nru update-manager-17.10.11/DistUpgrade/DistUpgradeAufs.py update-manager-0.156.14.15/DistUpgrade/DistUpgradeAufs.py --- update-manager-17.10.11/DistUpgrade/DistUpgradeAufs.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DistUpgradeAufs.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,252 @@ +import string +import logging +import os +import os.path +import subprocess +import tempfile + +def aufsOptionsAndEnvironmentSetup(options, config): + """ setup the environment based on the config and options + It will use + config("Aufs","Enabled") - to show if its enabled + and + config("Aufs","RWDir") - for the writable overlay dir + """ + logging.debug("aufsOptionsAndEnvironmentSetup()") + # enabled from the commandline (full overlay by default) + if options and options.useAufs: + logging.debug("enabling full overlay from commandline") + config.set("Aufs","Enabled", "True") + config.set("Aufs","EnableFullOverlay","True") + + # setup environment based on config + tmprw = tempfile.mkdtemp(prefix="upgrade-rw-") + aufs_rw_dir = config.getWithDefault("Aufs","RWDir", tmprw) + logging.debug("using '%s' as aufs_rw_dir" % aufs_rw_dir) + os.environ["RELEASE_UPGRADE_AUFS_RWDIR"] = aufs_rw_dir + config.set("Aufs","RWDir",aufs_rw_dir) + # now the chroot tmpdir + tmpchroot = tempfile.mkdtemp(prefix="upgrade-chroot-") + os.chmod(tmpchroot, 0755) + aufs_chroot_dir = config.getWithDefault("Aufs","ChrootDir", tmpchroot) + logging.debug("using '%s' as aufs chroot dir" % aufs_chroot_dir) + + if config.getWithDefault("Aufs","EnableFullOverlay", False): + logging.debug("enabling aufs full overlay (from config)") + config.set("Aufs","Enabled", "True") + os.environ["RELEASE_UPGRADE_USE_AUFS_FULL_OVERLAY"] = "1" + if config.getWithDefault("Aufs","EnableChrootOverlay",False): + logging.debug("enabling aufs chroot overlay") + config.set("Aufs","Enabled", "True") + os.environ["RELEASE_UPGRADE_USE_AUFS_CHROOT"] = aufs_chroot_dir + if config.getWithDefault("Aufs","EnableChrootRsync", False): + logging.debug("enable aufs chroot rsync back to real system") + os.environ["RELEASE_UPGRADE_RSYNC_AUFS_CHROOT"] = "1" + + +def _bindMount(from_dir, to_dir, rbind=False): + " helper that bind mounts a given dir to a new place " + if not os.path.exists(to_dir): + os.makedirs(to_dir) + if rbind: + bind = "--rbind" + else: + bind = "--bind" + cmd = ["mount",bind, from_dir, to_dir] + logging.debug("cmd: %s" % cmd) + res = subprocess.call(cmd) + if res != 0: + # FIXME: revert already mounted stuff + logging.error("Failed to bind mount from '%s' to '%s'" % (from_dir, to_dir)) + return False + return True + +def _aufsOverlayMount(target, rw_dir, chroot_dir="/"): + """ + helper that takes a target dir and mounts a rw dir over it, e.g. + /var , /tmp/upgrade-rw + """ + if not os.path.exists(rw_dir+target): + os.makedirs(rw_dir+target) + if not os.path.exists(chroot_dir+target): + os.makedirs(chroot_dir+target) + # FIXME: figure out when to use aufs and when to use overlayfs + use_overlayfs = False + if use_overlayfs: + cmd = ["mount", + "-t","overlayfs", + "-o","upperdir=%s,lowerdir=%s" % (rw_dir+target, target), + "none", + chroot_dir+target] + else: + cmd = ["mount", + "-t","aufs", + "-o","br:%s:%s=ro" % (rw_dir+target, target), + "none", + chroot_dir+target] + res = subprocess.call(cmd) + if res != 0: + # FIXME: revert already mounted stuff + logging.error("Failed to mount rw aufs overlay for '%s'" % target) + return False + logging.debug("cmd '%s' return '%s' " % (cmd, res)) + return True + +def is_aufs_mount(dir): + " test if the given dir is already mounted with aufs overlay " + for line in open("/proc/mounts"): + (device, mountpoint, fstype, options, a, b) = line.split() + if device == "none" and fstype == "aufs" and mountpoint == dir: + return True + return False + +def is_submount(mountpoint, systemdirs): + " helper: check if the given mountpoint is a submount of a systemdir " + logging.debug("is_submount: %s %s" % (mountpoint, systemdirs)) + for d in systemdirs: + if not d.endswith("/"): + d += "/" + if mountpoint.startswith(d): + return True + return False + +def is_real_fs(fs): + if fs.startswith("fuse"): + return False + if fs in ["rootfs","tmpfs","proc","fusectrl","aufs", + "devpts","binfmt_misc", "sysfs"]: + return False + return True + +def doAufsChrootRsync(aufs_chroot_dir): + """ + helper that rsyncs the changes in the aufs chroot back to the + real system + """ + from DistUpgradeMain import SYSTEM_DIRS + for d in SYSTEM_DIRS: + if not os.path.exists(d): + continue + # its important to have the "/" at the end of source + # and dest so that rsync knows what to do + cmd = ["rsync","-aHAX","--del","-v", "--progress", + "/%s/%s/" % (aufs_chroot_dir, d), + "/%s/" % d] + logging.debug("running: '%s'" % cmd) + ret = subprocess.call(cmd) + logging.debug("rsync back result for %s: %i" % (d, ret)) + return True + +def doAufsChroot(aufs_rw_dir, aufs_chroot_dir): + " helper that sets the chroot up and does chroot() into it " + if not setupAufsChroot(aufs_rw_dir, aufs_chroot_dir): + return False + os.chroot(aufs_chroot_dir) + os.chdir("/") + return True + + +def setupAufsChroot(rw_dir, chroot_dir): + " setup aufs chroot that is based on / but with a writable overlay " + # with the chroot aufs we can just rsync the changes back + # from the chroot dir to the real dirs + # + # (if we run rsync with --backup --backup-dir we could even + # create something vaguely rollbackable + + # get the mount points before the aufs buisiness starts + mounts = open("/proc/mounts").read() + from DistUpgradeMain import SYSTEM_DIRS + systemdirs = SYSTEM_DIRS + + # aufs mount or bind mount required dirs + for d in os.listdir("/"): + d = os.path.join("/",d) + if os.path.isdir(d): + if d in systemdirs: + logging.debug("bind mounting %s" % d) + if not _aufsOverlayMount(d, rw_dir, chroot_dir): + return False + else: + logging.debug("overlay mounting %s" % d) + if not _bindMount(d, chroot_dir+d, rbind=True): + return False + + # create binds for the systemdirs + #needs_bind_mount = set() + for line in map(string.strip, mounts.split("\n")): + if not line: continue + (device, mountpoint, fstype, options, a, b) = line.split() + if (fstype != "aufs" and + not is_real_fs(fstype) and + is_submount(mountpoint, systemdirs)): + logging.debug("found %s that needs bind mount", mountpoint) + if not _bindMount(mountpoint, chroot_dir+mountpoint): + return False + return True + +def setupAufs(rw_dir): + " setup aufs overlay over the rootfs " + # * we need to find a way to tell all the existing daemon + # to look into the new namespace. so probably something + # like a reboot is required and some hackery in initramfs-tools + # to ensure that we boot into a overlay ready system + # * this is much less of a issue with the aufsChroot code + logging.debug("setupAufs") + if not os.path.exists("/proc/mounts"): + logging.debug("no /proc/mounts, can not do aufs overlay") + return False + + from DistUpgradeMain import SYSTEM_DIRS + systemdirs = SYSTEM_DIRS + # verify that there are no submounts of a systemdir and collect + # the stuff that needs bind mounting (because a aufs does not + # include sub mounts) + needs_bind_mount = set() + needs_bind_mount.add("/var/cache/apt/archives") + for line in open("/proc/mounts"): + (device, mountpoint, fstype, options, a, b) = line.split() + if is_real_fs(fstype) and is_submount(mountpoint, systemdirs): + logging.warning("mountpoint %s submount of systemdir" % mountpoint) + return False + if (fstype != "aufs" and not is_real_fs(fstype) and is_submount(mountpoint, systemdirs)): + logging.debug("found %s that needs bind mount", mountpoint) + needs_bind_mount.add(mountpoint) + + # aufs mounts do not support stacked filesystems, so + # if we mount /var we will loose the tmpfs stuff + # first bind mount varun and varlock into the tmpfs + for d in needs_bind_mount: + if not _bindMount(d, rw_dir+"/needs_bind_mount/"+d): + return False + # setup writable overlay into /tmp/upgrade-rw so that all + # changes are written there instead of the real fs + for d in systemdirs: + if not is_aufs_mount(d): + if not _aufsOverlayMount(d, rw_dir): + return False + # now bind back the tempfs to the original location + for d in needs_bind_mount: + if not _bindMount(rw_dir+"/needs_bind_mount/"+d, d): + return False + + # The below information is only of historical relevance: + # now what we *could* do to apply the changes is to + # mount -o bind / /orig + # (bind is important, *not* rbind that includes submounts) + # + # This will give us the original "/" without the + # aufs rw overlay - *BUT* only if "/" is all on one parition + # + # then apply the diff (including the whiteouts) to /orig + # e.g. by "rsync -av /tmp/upgrade-rw /orig" + # "script that search for whiteouts and removes them" + # (whiteout files start with .wh.$name + # whiteout dirs with .wh..? - check with aufs man page) + return True + +if __name__ == "__main__": + logging.basicConfig(level=logging.DEBUG) + #print setupAufs("/tmp/upgrade-rw") + print setupAufsChroot("/tmp/upgrade-chroot-rw", + "/tmp/upgrade-chroot") diff -Nru update-manager-17.10.11/DistUpgrade/DistUpgradeCache.py update-manager-0.156.14.15/DistUpgrade/DistUpgradeCache.py --- update-manager-17.10.11/DistUpgrade/DistUpgradeCache.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DistUpgradeCache.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,1218 @@ +# DistUpgradeCache.py +# +# Copyright (c) 2004-2008 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import warnings +warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning) +import apt +import apt_pkg +import os +import os.path +import re +import logging +import string +import statvfs +import time +import datetime +import threading +import ConfigParser +from subprocess import Popen, PIPE + +from DistUpgradeGettext import gettext as _ +from DistUpgradeGettext import ngettext + +from utils import inside_chroot, estimate_kernel_size_in_boot + +class CacheException(Exception): + pass +class CacheExceptionLockingFailed(CacheException): + pass +class CacheExceptionDpkgInterrupted(CacheException): + pass + +# the initrd/vmlinuz/abi space required in /boot for each kernel +# we estimate based on the current kernel size and add a safety marging +def _set_kernel_initrd_size(): + size = estimate_kernel_size_in_boot() + if size == 0: + logging.warn("estimate_kernel_size_in_boot() returned '0'?") + size = 30*1024*1024 + # add small safety buffer + size += 2*1024*1024 + return size +KERNEL_INITRD_SIZE = _set_kernel_initrd_size() + +class FreeSpaceRequired(object): + """ FreeSpaceRequired object: + + This exposes: + - the total size required (size_total) + - the dir that requires the space (dir) + - the additional space that is needed (size_needed) + """ + def __init__(self, size_total, dir, size_needed): + self.size_total = size_total + self.dir = dir + self.size_needed = size_needed + def __str__(self): + return "FreeSpaceRequired Object: Dir: %s size_total: %s size_needed: %s" % (self.dir, self.size_total, self.size_needed) + + +class NotEnoughFreeSpaceError(CacheException): + """ + Exception if there is not enough free space for this operation + + """ + def __init__(self, free_space_required_list): + self.free_space_required_list = free_space_required_list + +class MyCache(apt.Cache): + ReInstReq = 1 + HoldReInstReq = 3 + + # init + def __init__(self, config, view, quirks, progress=None, lock=True): + apt.Cache.__init__(self, progress) + self.to_install = [] + self.to_remove = [] + self.view = view + self.quirks = quirks + self.lock = False + self.partialUpgrade = False + self.config = config + self.metapkgs = self.config.getlist("Distro","MetaPkgs") + # acquire lock + self._listsLock = -1 + if lock: + try: + apt_pkg.PkgSystemLock() + self.lockListsDir() + self.lock = True + except SystemError, e: + # checking for this is ok, its not translatable + if "dpkg --configure -a" in str(e): + raise CacheExceptionDpkgInterrupted, e + raise CacheExceptionLockingFailed, e + # a list of regexp that are not allowed to be removed + self.removal_blacklist = config.getListFromFile("Distro","RemovalBlacklistFile") + self.uname = Popen(["uname","-r"],stdout=PIPE).communicate()[0].strip() + self._initAptLog() + # from hardy on we use recommends by default, so for the + # transition to the new dist we need to enable them now + if (config.get("Sources","From") == "hardy" and + not "RELEASE_UPGRADE_NO_RECOMMENDS" in os.environ): + apt_pkg.Config.set("APT::Install-Recommends","true") + + def _apply_dselect_upgrade(self): + """ honor the dselect install state """ + for pkg in self: + if pkg.is_installed: + continue + if pkg._pkg.selected_state == apt_pkg.SELSTATE_INSTALL: + # upgrade() will take care of this + pkg.mark_install(auto_inst=False, auto_fix=False) + + @property + def reqReinstallPkgs(self): + " return the packages not downloadable packages in reqreinst state " + reqreinst = set() + for pkg in self: + if (not pkg.candidateDownloadable and + (pkg._pkg.inst_state == self.ReInstReq or + pkg._pkg.inst_state == self.HoldReInstReq)): + reqreinst.add(pkg.name) + return reqreinst + + def fixReqReinst(self, view): + " check for reqreinst state and offer to fix it " + reqreinst = self.reqReinstallPkgs + if len(reqreinst) > 0: + header = ngettext("Remove package in bad state", + "Remove packages in bad state", + len(reqreinst)) + summary = ngettext("The package '%s' is in an inconsistent " + "state and needs to be reinstalled, but " + "no archive can be found for it. " + "Do you want to remove this package " + "now to continue?", + "The packages '%s' are in an inconsistent " + "state and need to be reinstalled, but " + "no archives can be found for them. Do you " + "want to remove these packages now to " + "continue?", + len(reqreinst)) % ", ".join(reqreinst) + if view.askYesNoQuestion(header, summary): + self.releaseLock() + cmd = ["dpkg","--remove","--force-remove-reinstreq"] + list(reqreinst) + view.getTerminal().call(cmd) + self.getLock() + return True + return False + + # logging stuff + def _initAptLog(self): + " init logging, create log file" + logdir = self.config.getWithDefault("Files","LogDir", + "/var/log/dist-upgrade") + if not os.path.exists(logdir): + os.makedirs(logdir) + apt_pkg.Config.set("Dir::Log",logdir) + apt_pkg.Config.set("Dir::Log::Terminal","apt-term.log") + self.logfd = os.open(os.path.join(logdir,"apt.log"), + os.O_RDWR|os.O_CREAT|os.O_APPEND, 0644) + os.write(self.logfd, "Log time: %s\n" % datetime.datetime.now()) + # turn on debugging in the cache + apt_pkg.Config.set("Debug::pkgProblemResolver","true") + apt_pkg.Config.set("Debug::pkgDepCache::AutoInstall","true") + def _startAptResolverLog(self): + if hasattr(self, "old_stdout"): + os.close(self.old_stdout) + os.close(self.old_stderr) + self.old_stdout = os.dup(1) + self.old_stderr = os.dup(2) + os.dup2(self.logfd, 1) + os.dup2(self.logfd, 2) + def _stopAptResolverLog(self): + os.fsync(1) + os.fsync(2) + os.dup2(self.old_stdout, 1) + os.dup2(self.old_stderr, 2) + # use this decorator instead of the _start/_stop stuff directly + # FIXME: this should probably be a decorator class where all + # logging is moved into? + def withResolverLog(f): + " decorator to ensure that the apt output is logged " + def wrapper(*args, **kwargs): + args[0]._startAptResolverLog() + res = f(*args, **kwargs) + args[0]._stopAptResolverLog() + return res + return wrapper + + # properties + @property + def requiredDownload(self): + """ get the size of the packages that are required to download """ + pm = apt_pkg.PackageManager(self._depcache) + fetcher = apt_pkg.Acquire() + pm.get_archives(fetcher, self._list, self._records) + return fetcher.fetch_needed + @property + def additionalRequiredSpace(self): + """ get the size of the additional required space on the fs """ + return self._depcache.usr_size + @property + def isBroken(self): + """ is the cache broken """ + return self._depcache.broken_count > 0 + + # methods + def lockListsDir(self): + name = apt_pkg.Config.find_dir("Dir::State::Lists") + "lock" + self._listsLock = apt_pkg.GetLock(name) + if self._listsLock < 0: + e = "Can not lock '%s' " % name + raise CacheExceptionLockingFailed, e + def unlockListsDir(self): + if self._listsLock > 0: + os.close(self._listsLock) + self._listsLock = -1 + def update(self, fprogress=None): + """ + our own update implementation is required because we keep the lists + dir lock + """ + self.unlockListsDir() + res = apt.Cache.update(self, fprogress) + self.lockListsDir() + if fprogress and fprogress.release_file_download_error: + # FIXME: not ideal error message, but we just reuse a + # existing one here to avoid a new string + raise IOError(_("The server may be overloaded")) + if res == False: + raise IOError("apt.cache.update() returned False, but did not raise exception?!?") + + def commit(self, fprogress, iprogress): + logging.info("cache.commit()") + if self.lock: + self.releaseLock() + apt.Cache.commit(self, fprogress, iprogress) + + def releaseLock(self, pkgSystemOnly=True): + if self.lock: + try: + apt_pkg.PkgSystemUnLock() + self.lock = False + except SystemError, e: + logging.debug("failed to SystemUnLock() (%s) " % e) + + def getLock(self, pkgSystemOnly=True): + if not self.lock: + try: + apt_pkg.PkgSystemLock() + self.lock = True + except SystemError, e: + logging.debug("failed to SystemLock() (%s) " % e) + + def downloadable(self, pkg, useCandidate=True): + " check if the given pkg can be downloaded " + if useCandidate: + ver = self._depcache.get_candidate_ver(pkg._pkg) + else: + ver = pkg._pkg.CurrentVer + if ver == None: + logging.warning("no version information for '%s' (useCandidate=%s)" % (pkg.name, useCandidate)) + return False + return ver.downloadable + + def pkgAutoRemovable(self, pkg): + """ check if the pkg is auto-removable """ + return (pkg.is_installed and + self._depcache.is_garbage(pkg._pkg)) + + def fixBroken(self): + """ try to fix broken dependencies on the system, may throw + SystemError when it can't""" + return self._depcache.FixBroken() + + def create_snapshot(self): + """ create a snapshot of the current changes """ + self.to_install = [] + self.to_remove = [] + for pkg in self.get_changes(): + if pkg.marked_install or pkg.marked_upgrade: + self.to_install.append(pkg.name) + if pkg.marked_delete: + self.to_remove.append(pkg.name) + + def clear(self): + self._depcache.Init() + + def restore_snapshot(self): + """ restore a snapshot """ + actiongroup = apt_pkg.ActionGroup(self._depcache) + # just make pyflakes shut up, later we need to use + # with self.actiongroup(): + actiongroup + self.clear() + for name in self.to_remove: + pkg = self[name] + pkg.mark_delete() + for name in self.to_install: + pkg = self[name] + pkg.mark_install(auto_fix=False, auto_inst=False) + + def needServerMode(self): + """ + This checks if we run on a desktop or a server install. + + A server install has more freedoms, for a desktop install + we force a desktop meta package to be install on the upgrade. + + We look for a installed desktop meta pkg and for key + dependencies, if none of those are installed we assume + server mode + """ + #logging.debug("needServerMode() run") + # check for the MetaPkgs (e.g. ubuntu-desktop) + metapkgs = self.config.getlist("Distro","MetaPkgs") + for key in metapkgs: + # if it is installed we are done + if self.has_key(key) and self[key].is_installed: + logging.debug("needServerMode(): run in 'desktop' mode, (because of pkg '%s')" % key) + return False + # if it is not installed, but its key depends are installed + # we are done too (we auto-select the package later) + deps_found = True + for pkg in self.config.getlist(key,"KeyDependencies"): + deps_found &= self.has_key(pkg) and self[pkg].is_installed + if deps_found: + logging.debug("needServerMode(): run in 'desktop' mode, (because of key deps for '%s')" % key) + return False + logging.debug("needServerMode(): can not find a desktop meta package or key deps, running in server mode") + return True + + def sanityCheck(self, view): + """ check if the cache is ok and if the required metapkgs + are installed + """ + if self.isBroken: + try: + logging.debug("Have broken pkgs, trying to fix them") + self.fixBroken() + except SystemError: + view.error(_("Broken packages"), + _("Your system contains broken packages " + "that couldn't be fixed with this " + "software. " + "Please fix them first using synaptic or " + "apt-get before proceeding.")) + return False + return True + + def mark_install(self, pkg, reason=""): + logging.debug("Installing '%s' (%s)" % (pkg, reason)) + if self.has_key(pkg): + self[pkg].mark_install() + if not (self[pkg].marked_install or self[pkg].marked_upgrade): + logging.error("Installing/upgrading '%s' failed" % pkg) + #raise (SystemError, "Installing '%s' failed" % pkg) + return False + return True + def mark_upgrade(self, pkg, reason=""): + logging.debug("Upgrading '%s' (%s)" % (pkg, reason)) + if self.has_key(pkg) and self[pkg].is_installed: + self[pkg].mark_upgrade() + if not self[pkg].marked_upgrade: + logging.error("Upgrading '%s' failed" % pkg) + return False + return True + def mark_remove(self, pkg, reason=""): + logging.debug("Removing '%s' (%s)" % (pkg, reason)) + if self.has_key(pkg): + self[pkg].mark_delete() + def mark_purge(self, pkg, reason=""): + logging.debug("Purging '%s' (%s)" % (pkg, reason)) + if self.has_key(pkg): + self._depcache.mark_delete(self[pkg]._pkg,True) + + def _keepInstalled(self, pkgname, reason): + if (self.has_key(pkgname) + and self[pkgname].is_installed + and self[pkgname].marked_delete): + self.mark_install(pkgname, reason) + + def keepInstalledRule(self): + """ run after the dist-upgrade to ensure that certain + packages are kept installed """ + # first the global list + for pkgname in self.config.getlist("Distro","KeepInstalledPkgs"): + self._keepInstalled(pkgname, "Distro KeepInstalledPkgs rule") + # the the per-metapkg rules + for key in self.metapkgs: + if self.has_key(key) and (self[key].is_installed or + self[key].marked_install): + for pkgname in self.config.getlist(key,"KeepInstalledPkgs"): + self._keepInstalled(pkgname, "%s KeepInstalledPkgs rule" % key) + + # only enforce section if we have a network. Otherwise we run + # into CD upgrade issues for installed language packs etc + if self.config.get("Options","withNetwork") == "True": + logging.debug("Running KeepInstalledSection rules") + # now the KeepInstalledSection code + for section in self.config.getlist("Distro","KeepInstalledSection"): + for pkg in self: + if pkg.candidateDownloadable and pkg.marked_delete and pkg.section == section: + self._keepInstalled(pkg.name, "Distro KeepInstalledSection rule: %s" % section) + for key in self.metapkgs: + if self.has_key(key) and (self[key].is_installed or + self[key].marked_install): + for section in self.config.getlist(key,"KeepInstalledSection"): + for pkg in self: + if pkg.candidateDownloadable and pkg.marked_delete and pkg.section == section: + self._keepInstalled(pkg.name, "%s KeepInstalledSection rule: %s" % (key, section)) + + + def postUpgradeRule(self): + " run after the upgrade was done in the cache " + for (rule, action) in [("Install", self.mark_install), + ("Upgrade", self.mark_upgrade), + ("Remove", self.mark_remove), + ("Purge", self.mark_purge)]: + # first the global list + for pkg in self.config.getlist("Distro","PostUpgrade%s" % rule): + action(pkg, "Distro PostUpgrade%s rule" % rule) + for key in self.metapkgs: + if self.has_key(key) and (self[key].is_installed or + self[key].marked_install): + for pkg in self.config.getlist(key,"PostUpgrade%s" % rule): + action(pkg, "%s PostUpgrade%s rule" % (key, rule)) + # run the quirks handlers + if not self.partialUpgrade: + self.quirks.run("PostDistUpgradeCache") + + def identifyObsoleteKernels(self): + # we have a funny policy that we remove security updates + # for the kernel from the archive again when a new ABI + # version hits the archive. this means that we have + # e.g. + # linux-image-2.6.24-15-generic + # is obsolete when + # linux-image-2.6.24-19-generic + # is available + # ... + # This code tries to identify the kernels that can be removed + logging.debug("identifyObsoleteKernels()") + obsolete_kernels = set() + version = self.config.get("KernelRemoval","Version") + basenames = self.config.getlist("KernelRemoval","BaseNames") + types = self.config.getlist("KernelRemoval","Types") + for pkg in self: + for base in basenames: + basename = "%s-%s-" % (base,version) + for type in types: + if (pkg.name.startswith(basename) and + pkg.name.endswith(type) and + pkg.is_installed): + if (pkg.name == "%s-%s" % (base,self.uname)): + logging.debug("skipping running kernel %s" % pkg.name) + continue + logging.debug("removing obsolete kernel '%s'" % pkg.name) + obsolete_kernels.add(pkg.name) + logging.debug("identifyObsoleteKernels found '%s'" % obsolete_kernels) + return obsolete_kernels + + def checkForNvidia(self): + """ + this checks for nvidia hardware and checks what driver is needed + """ + logging.debug("nvidiaUpdate()") + # if the free drivers would give us a equally hard time, we would + # never be able to release + try: + from NvidiaDetector.nvidiadetector import NvidiaDetection + except ImportError, e: + logging.error("NvidiaDetector can not be imported %s" % e) + return False + try: + # get new detection module and use the modalises files + # from within the release-upgrader + nv = NvidiaDetection(obsolete="./nvidia-obsolete.pkgs") + #nv = NvidiaDetection() + # check if a binary driver is installed now + for oldDriver in nv.oldPackages: + if oldDriver in self and self[oldDriver].is_installed: + self.mark_remove(oldDriver, "old nvidia driver") + break + else: + logging.info("no old nvidia driver installed, installing no new") + return False + # check which one to use + driver = nv.selectDriver() + logging.debug("nv.selectDriver() returned '%s'" % driver) + if not driver in self: + logging.warning("no '%s' found" % driver) + return False + if not (self[driver].marked_install or self[driver].marked_upgrade): + self[driver].mark_install() + logging.info("installing %s as suggested by NvidiaDetector" % driver) + return True + except Exception, e: + logging.error("NvidiaDetection returned a error: %s" % e) + return False + + + def getKernelsFromBaseInstaller(self): + """get the list of recommended kernels from base-installer""" + p = Popen(["/bin/sh", "./get_kernel_list.sh"], stdout=PIPE) + res = p.wait() + if res != 0: + logging.warn("./get_kernel_list.sh returned non-zero exitcode") + return "" + kernels = p.communicate()[0] + kernels = filter(lambda x : len(x) > 0, + map(string.strip, kernels.split("\n"))) + logging.debug("./get_kernel_list.sh returns: %s" % kernels) + return kernels + + def _selectKernelFromBaseInstaller(self): + """ use the get_kernel_list.sh script (that uses base-installer) + to figure out what kernel is most suitable for the system + """ + # check if we have a kernel from that list installed first + kernels = self.getKernelsFromBaseInstaller() + for kernel in kernels: + if not kernel in self: + logging.debug("%s not available in cache" % kernel) + continue + # this can happen e.g. on cdrom -> cdrom only upgrades + # where on hardy we have linux-386 but on the lucid CD + # we only have linux-generic + if not self[kernel].candidateDownloadable: + logging.debug("%s not downloadable" % kernel) + continue + # check if installed + if self[kernel].is_installed or self[kernel].marked_install: + logging.debug("%s kernel already installed" % kernel) + if self[kernel].is_upgradable and not self[kernel].marked_upgrade: + self.mark_upgrade(kernel, "Upgrading kernel from base-installer") + return + # if we have not found a kernel yet, use the first one that installs + for kernel in kernels: + if self.mark_install(kernel, + "Selecting new kernel from base-installer"): + if self._has_kernel_headers_installed(): + prefix, sep, postfix = kernel.partition("-") + headers = "%s-header-%s" % (prefix, postfix) + self.mark_install( + headers, + "Selecting new kernel headers from base-installer") + else: + logging.debug("no kernel-headers installed") + return + + def _has_kernel_headers_installed(self): + for pkg in self: + if (pkg.name.startswith("linux-headers-") and + pkg.is_installed): + return True + return False + + def checkForKernel(self): + """ check for the running kernel and try to ensure that we have + an updated version + """ + logging.debug("Kernel uname: '%s' " % self.uname) + try: + (version, build, flavour) = self.uname.split("-") + except Exception, e: + logging.warning("Can't parse kernel uname: '%s' (self compiled?)" % e) + return False + # now check if we have a SMP system + dmesg = Popen(["dmesg"],stdout=PIPE).communicate()[0] + if "WARNING: NR_CPUS limit" in dmesg: + logging.debug("UP kernel on SMP system!?!") + # use base-installer to get the kernel we want (if it exists) + if os.path.exists("./get_kernel_list.sh"): + self._selectKernelFromBaseInstaller() + else: + logging.debug("skipping ./get_kernel_list.sh: not found") + return True + + def checkPriority(self): + # tuple of priorities we require to be installed + need = ('required', ) + # stuff that its ok not to have + removeEssentialOk = self.config.getlist("Distro","RemoveEssentialOk") + # check now + for pkg in self: + # WORKADOUND bug on the CD/python-apt #253255 + ver = pkg._pcache._depcache.get_candidate_ver(pkg._pkg) + if ver and ver.Priority == 0: + logging.error("Package %s has no priority set" % pkg.name) + continue + if (pkg.candidateDownloadable and + not (pkg.is_installed or pkg.marked_install) and + not pkg.name in removeEssentialOk and + # ignore multiarch priority required packages + not ":" in pkg.name and + pkg.priority in need): + self.mark_install(pkg.name, "priority in required set '%s' but not scheduled for install" % need) + + # FIXME: make this a decorator (just like the withResolverLog()) + def updateGUI(self, view, lock): + i = 0 + while lock.locked(): + if i % 15 == 0: + view.pulseProgress() + view.processEvents() + time.sleep(0.02) + i += 1 + view.pulseProgress(finished=True) + view.processEvents() + + @withResolverLog + def distUpgrade(self, view, serverMode, partialUpgrade): + # keep the GUI alive + lock = threading.Lock() + lock.acquire() + t = threading.Thread(target=self.updateGUI, args=(self.view, lock,)) + t.start() + try: + # mvo: disabled as it casues to many errornous installs + #self._apply_dselect_upgrade() + + # upgrade (and make sure this way that the cache is ok) + self.upgrade(True) + + # check that everything in priority required is installed + self.checkPriority() + + # see if our KeepInstalled rules are honored + self.keepInstalledRule() + + # check if we got a new kernel (if we are not inside a + # chroot) + if inside_chroot(): + logging.warn("skipping kernel checks because we run inside a chroot") + else: + self.checkForKernel() + + # check for nvidia stuff + self.checkForNvidia() + + # and if we have some special rules + self.postUpgradeRule() + + # install missing meta-packages (if not in server upgrade mode) + self._keepBaseMetaPkgsInstalled(view) + if not serverMode: + # if this fails, a system error is raised + self._installMetaPkgs(view) + + # see if it all makes sense, if not this function raises + self._verifyChanges() + + except SystemError, e: + # this should go into a finally: line, see below for the + # rationale why it doesn't + lock.release() + t.join() + # FIXME: change the text to something more useful + details = _("An unresolvable problem occurred while " + "calculating the upgrade:\n%s\n\n " + "This can be caused by:\n" + " * Upgrading to a pre-release version of Ubuntu\n" + " * Running the current pre-release version of Ubuntu\n" + " * Unofficial software packages not provided by Ubuntu\n" + "\n") % e + # we never have partialUpgrades (including removes) on a stable system + # with only ubuntu sources so we do not recommend reporting a bug + if partialUpgrade: + details += _("This is most likely a transient problem, " + "please try again later.") + else: + details += _("If none of this applies, then please report this bug using " + "the command 'ubuntu-bug update-manager' in a terminal.") + # make the error text available again on stdout for the + # text frontend + self._stopAptResolverLog() + view.error(_("Could not calculate the upgrade"), details) + # start the resolver log again because this is run with + # the withResolverLog decorator + self._startAptResolverLog() + logging.error("Dist-upgrade failed: '%s'", e) + return False + # would be nice to be able to use finally: here, but we need + # to run on python2.4 too + #finally: + # wait for the gui-update thread to exit + lock.release() + t.join() + + # check the trust of the packages that are going to change + untrusted = [] + for pkg in self.get_changes(): + if pkg.marked_delete: + continue + # special case because of a bug in pkg.candidateOrigin + if pkg.marked_downgrade: + for ver in pkg._pkg.version_list: + # version is lower than installed one + if apt_pkg.version_compare( + ver.ver_str, pkg.installed.version) < 0: + for (verFileIter, index) in ver.file_list: + indexfile = pkg._pcache._list.find_index(verFileIter) + if indexfile and not indexfile.is_trusted: + untrusted.append(pkg.name) + break + continue + origins = pkg.candidate.origins + trusted = False + for origin in origins: + #print origin + trusted |= origin.trusted + if not trusted: + untrusted.append(pkg.name) + # check if the user overwrote the unauthenticated warning + try: + b = self.config.getboolean("Distro","AllowUnauthenticated") + if b: + logging.warning("AllowUnauthenticated set!") + return True + except ConfigParser.NoOptionError, e: + pass + if len(untrusted) > 0: + untrusted.sort() + logging.error("Unauthenticated packages found: '%s'" % \ + " ".join(untrusted)) + # FIXME: maybe ask a question here? instead of failing? + self._stopAptResolverLog() + view.error(_("Error authenticating some packages"), + _("It was not possible to authenticate some " + "packages. This may be a transient network problem. " + "You may want to try again later. See below for a " + "list of unauthenticated packages."), + "\n".join(untrusted)) + # start the resolver log again because this is run with + # the withResolverLog decorator + self._startAptResolverLog() + return False + return True + + def _verifyChanges(self): + """ this function tests if the current changes don't violate + our constrains (blacklisted removals etc) + """ + removeEssentialOk = self.config.getlist("Distro","RemoveEssentialOk") + # check changes + for pkg in self.get_changes(): + if pkg.marked_delete and self._inRemovalBlacklist(pkg.name): + logging.debug("The package '%s' is marked for removal but it's in the removal blacklist", pkg.name) + raise SystemError, _("The package '%s' is marked for removal but it is in the removal blacklist.") % pkg.name + if pkg.marked_delete and (pkg._pkg.Essential == True and + not pkg.name in removeEssentialOk): + logging.debug("The package '%s' is marked for removal but it's an ESSENTIAL package", pkg.name) + raise SystemError, _("The essential package '%s' is marked for removal.") % pkg.name + # check bad-versions blacklist + badVersions = self.config.getlist("Distro","BadVersions") + for bv in badVersions: + (pkgname, ver) = bv.split("_") + if (self.has_key(pkgname) and + self[pkgname].candidateVersion == ver and + (self[pkgname].marked_install or + self[pkgname].marked_upgrade)): + raise SystemError, _("Trying to install blacklisted version '%s'") % bv + return True + + def _lookupPkgRecord(self, pkg): + """ + helper to make sure that the pkg._records is pointing to the right + location - needed because python-apt 0.7.9 dropped the python-apt + version but we can not yet use the new version because on upgrade + the old version is still installed + """ + ver = pkg._pcache._depcache.get_candidate_ver(pkg._pkg) + if ver is None: + print "No candidate ver: ", pkg.name + return False + if ver.file_list is None: + print "No FileList for: %s " % self._pkg.Name() + return False + f, index = ver.file_list.pop(0) + pkg._pcache._records.lookup((f, index)) + return True + + @property + def installedTasks(self): + tasks = {} + installed_tasks = set() + for pkg in self: + if not self._lookupPkgRecord(pkg): + logging.debug("no PkgRecord found for '%s', skipping " % pkg.name) + continue + for line in pkg._pcache._records.record.split("\n"): + if line.startswith("Task:"): + for task in (line[len("Task:"):]).split(","): + task = task.strip() + if not tasks.has_key(task): + tasks[task] = set() + tasks[task].add(pkg.name) + for task in tasks: + installed = True + for pkgname in tasks[task]: + if not self[pkgname].is_installed: + installed = False + break + if installed: + installed_tasks.add(task) + return installed_tasks + + def installTasks(self, tasks): + logging.debug("running installTasks") + for pkg in self: + if pkg.marked_install or pkg.is_installed: + continue + self._lookupPkgRecord(pkg) + if not (hasattr(pkg._pcache._records,"record") and pkg._pcache._records.record): + logging.warning("can not find Record for '%s'" % pkg.name) + continue + for line in pkg._pcache._records.record.split("\n"): + if line.startswith("Task:"): + for task in (line[len("Task:"):]).split(","): + task = task.strip() + if task in tasks: + pkg.mark_install() + return True + + def _keepBaseMetaPkgsInstalled(self, view): + for pkg in self.config.getlist("Distro","BaseMetaPkgs"): + self._keepInstalled(pkg, "base meta package keep installed rule") + + def _installMetaPkgs(self, view): + + def metaPkgInstalled(): + """ + internal helper that checks if at least one meta-pkg is + installed or marked install + """ + for key in metapkgs: + if self.has_key(key): + pkg = self[key] + if pkg.is_installed and pkg.marked_delete: + logging.debug("metapkg '%s' installed but marked_delete" % pkg.name) + if ((pkg.is_installed and not pkg.marked_delete) + or self[key].marked_install): + return True + return False + + # now check for ubuntu-desktop, kubuntu-desktop, edubuntu-desktop + metapkgs = self.config.getlist("Distro","MetaPkgs") + + # we never go without ubuntu-base + for pkg in self.config.getlist("Distro","BaseMetaPkgs"): + self[pkg].mark_install() + + # every meta-pkg that is installed currently, will be marked + # install (that result in a upgrade and removes a markDelete) + for key in metapkgs: + try: + if (self.has_key(key) and + self[key].is_installed and + self[key].is_upgradable): + logging.debug("Marking '%s' for upgrade" % key) + self[key].mark_upgrade() + except SystemError, e: + # warn here, but don't fail, its possible that meta-packages + # conflict (like ubuntu-desktop vs xubuntu-desktop) LP: #775411 + logging.warn("Can't mark '%s' for upgrade (%s)" % (key,e)) + + # check if we have a meta-pkg, if not, try to guess which one to pick + if not metaPkgInstalled(): + logging.debug("none of the '%s' meta-pkgs installed" % metapkgs) + for key in metapkgs: + deps_found = True + for pkg in self.config.getlist(key,"KeyDependencies"): + deps_found &= self.has_key(pkg) and self[pkg].is_installed + if deps_found: + logging.debug("guessing '%s' as missing meta-pkg" % key) + try: + self[key].mark_install() + except (SystemError, KeyError), e: + logging.error("failed to mark '%s' for install (%s)" % (key,e)) + view.error(_("Can't install '%s'") % key, + _("It was impossible to install a " + "required package. Please report " + "this as a bug using " + "'ubuntu-bug update-manager' in " + "a terminal.")) + return False + logging.debug("marked_install: '%s' -> '%s'" % (key, self[key].marked_install)) + break + # check if we actually found one + if not metaPkgInstalled(): + # FIXME: provide a list + view.error(_("Can't guess meta-package"), + _("Your system does not contain a " + "ubuntu-desktop, kubuntu-desktop, xubuntu-desktop or " + "edubuntu-desktop package and it was not " + "possible to detect which version of " + "Ubuntu you are running.\n " + "Please install one of the packages " + "above first using synaptic or " + "apt-get before proceeding.")) + return False + return True + + def _inRemovalBlacklist(self, pkgname): + for expr in self.removal_blacklist: + if re.compile(expr).match(pkgname): + logging.debug("blacklist expr '%s' matches '%s'" % (expr, pkgname)) + return True + return False + + @withResolverLog + def tryMarkObsoleteForRemoval(self, pkgname, remove_candidates, foreign_pkgs): + #logging.debug("tryMarkObsoleteForRemoval(): %s" % pkgname) + # sanity check, first see if it looks like a running kernel pkg + if pkgname.endswith(self.uname): + logging.debug("skipping running kernel pkg '%s'" % pkgname) + return False + if self._inRemovalBlacklist(pkgname): + logging.debug("skipping '%s' (in removalBlacklist)" % pkgname) + return False + # ensure we honor KeepInstalledSection here as well + for section in self.config.getlist("Distro","KeepInstalledSection"): + if self.has_key(pkgname) and self[pkgname].section == section: + logging.debug("skipping '%s' (in KeepInstalledSection)" % pkgname) + return False + # if we don't have the package anyway, we are fine (this can + # happen when forced_obsoletes are specified in the config file) + if not self.has_key(pkgname): + #logging.debug("package '%s' not in cache" % pkgname) + return True + # check if we want to purge + try: + purge = self.config.getboolean("Distro","PurgeObsoletes") + except ConfigParser.NoOptionError, e: + purge = False + + # this is a delete candidate, only actually delete, + # if it dosn't remove other packages depending on it + # that are not obsolete as well + actiongroup = apt_pkg.ActionGroup(self._depcache) + # just make pyflakes shut up, later we should use + # with self.actiongroup(): + actiongroup + self.create_snapshot() + try: + self[pkgname].markDelete(purge=purge) + self.view.processEvents() + #logging.debug("marking '%s' for removal" % pkgname) + for pkg in self.get_changes(): + if (pkg.name not in remove_candidates or + pkg.name in foreign_pkgs or + self._inRemovalBlacklist(pkg.name)): + logging.debug("package '%s' has unwanted removals, skipping" % pkgname) + self.restore_snapshot() + return False + except (SystemError,KeyError),e: + logging.warning("_tryMarkObsoleteForRemoval failed for '%s' (%s: %s)" % (pkgname, repr(e), e)) + self.restore_snapshot() + return False + return True + + def _getObsoletesPkgs(self): + " get all package names that are not downloadable " + obsolete_pkgs =set() + for pkg in self: + if pkg.is_installed: + # check if any version is downloadable. we need to check + # for older ones too, because there might be + # cases where e.g. firefox in gutsy-updates is newer + # than hardy + if not self.anyVersionDownloadable(pkg): + obsolete_pkgs.add(pkg.name) + return obsolete_pkgs + + def anyVersionDownloadable(self, pkg): + " helper that checks if any of the version of pkg is downloadable " + for ver in pkg._pkg.version_list: + if ver.downloadable: + return True + return False + + def _getUnusedDependencies(self): + " get all package names that are not downloadable " + unused_dependencies =set() + for pkg in self: + if pkg.is_installed and self._depcache.is_garbage(pkg._pkg): + unused_dependencies.add(pkg.name) + return unused_dependencies + + def get_installed_demoted_packages(self): + """ return list of installed and demoted packages + + If a demoted package is a automatic install it will be skipped + """ + demotions = set() + demotions_file = self.config.get("Distro","Demotions") + if os.path.exists(demotions_file): + map(lambda pkgname: demotions.add(pkgname.strip()), + filter(lambda line: not line.startswith("#"), + open(demotions_file).readlines())) + installed_demotions = set() + for demoted_pkgname in demotions: + if not self.has_key(demoted_pkgname): + continue + pkg = self[demoted_pkgname] + if (not pkg.is_installed or + self._depcache.is_auto_installed(pkg._pkg) or + pkg.marked_delete): + continue + installed_demotions.add(pkg) + return list(installed_demotions) + + def _getForeignPkgs(self, allowed_origin, fromDist, toDist): + """ get all packages that are installed from a foreign repo + (and are actually downloadable) + """ + foreign_pkgs=set() + for pkg in self: + if pkg.is_installed and self.downloadable(pkg): + # assume it is foreign and see if it is from the + # official archive + foreign=True + for origin in pkg.candidateOrigin: + # FIXME: use some better metric here + if fromDist in origin.archive and \ + origin.origin == allowed_origin: + foreign = False + if toDist in origin.archive and \ + origin.origin == allowed_origin: + foreign = False + if foreign: + foreign_pkgs.add(pkg.name) + return foreign_pkgs + + def checkFreeSpace(self, snapshots_in_use=False): + """ + this checks if we have enough free space on /var, /boot and /usr + with the given cache + + Note: this can not be fully accurate if there are multiple + mountpoints for /usr, /var, /boot + """ + + class FreeSpace(object): + " helper class that represents the free space on each mounted fs " + def __init__(self, initialFree): + self.free = initialFree + self.need = 0 + + def make_fs_id(d): + """ return 'id' of a directory so that directories on the + same filesystem get the same id (simply the mount_point) + """ + for mount_point in mounted: + if d.startswith(mount_point): + return mount_point + return "/" + + # this is all a bit complicated + # 1) check what is mounted (in mounted) + # 2) create FreeSpace objects for the dirs we are interested in + # (mnt_map) + # 3) use the mnt_map to check if we have enough free space and + # if not tell the user how much is missing + mounted = [] + mnt_map = {} + fs_free = {} + for line in open("/proc/mounts"): + try: + (what, where, fs, options, a, b) = line.split() + except ValueError, e: + logging.debug("line '%s' in /proc/mounts not understood (%s)" % (line, e)) + continue + if not where in mounted: + mounted.append(where) + # make sure mounted is sorted by longest path + mounted.sort(cmp=lambda a,b: cmp(len(a),len(b)), reverse=True) + archivedir = apt_pkg.Config.find_dir("Dir::Cache::archives") + aufs_rw_dir = "/tmp/" + if (hasattr(self, "config") and + self.config.getWithDefault("Aufs","Enabled", False)): + aufs_rw_dir = self.config.get("Aufs","RWDir") + if not os.path.exists(aufs_rw_dir): + os.makedirs(aufs_rw_dir) + logging.debug("cache aufs_rw_dir: %s" % aufs_rw_dir) + for d in ["/","/usr","/var","/boot", archivedir, aufs_rw_dir, "/home","/tmp/"]: + d = os.path.realpath(d) + fs_id = make_fs_id(d) + if os.path.exists(d): + st = os.statvfs(d) + free = st[statvfs.F_BAVAIL]*st[statvfs.F_FRSIZE] + else: + logging.warn("directory '%s' does not exists" % d) + free = 0 + if fs_id in mnt_map: + logging.debug("Dir %s mounted on %s" % (d,mnt_map[fs_id])) + fs_free[d] = fs_free[mnt_map[fs_id]] + else: + logging.debug("Free space on %s: %s" % (d,free)) + mnt_map[fs_id] = d + fs_free[d] = FreeSpace(free) + del mnt_map + logging.debug("fs_free contains: '%s'" % fs_free) + + # now calculate the space that is required on /boot + # we do this by checking how many linux-image-$ver packages + # are installed or going to be installed + space_in_boot = 0 + for pkg in self: + # we match against everything that looks like a kernel + # and add space check to filter out metapackages + if re.match("^linux-(image|image-debug)-[0-9.]*-.*", pkg.name): + if pkg.marked_install: + logging.debug("%s (new-install) added with %s to boot space" % (pkg.name, KERNEL_INITRD_SIZE)) + space_in_boot += KERNEL_INITRD_SIZE + # mvo: jaunty does not create .bak files anymore + #elif (pkg.marked_upgrade or pkg.is_installed): + # logging.debug("%s (upgrade|installed) added with %s to boot space" % (pkg.name, KERNEL_INITRD_SIZE)) + # space_in_boot += KERNEL_INITRD_SIZE # creates .bak + + # we check for various sizes: + # archivedir is were we download the debs + # /usr is assumed to get *all* of the install space (incorrect, + # but as good as we can do currently + safety buffer + # / has a small safety buffer as well + required_for_aufs = 0.0 + if (hasattr(self, "config") and + self.config.getWithDefault("Aufs","Enabled", False)): + logging.debug("taking aufs overlay into space calculation") + aufs_rw_dir = self.config.get("Aufs","RWDir") + # if we use the aufs rw overlay all the space is consumed + # the overlay dir + for pkg in self: + if pkg.marked_upgrade or pkg.marked_install: + required_for_aufs += pkg.candidate.installed_size + + # add old size of the package if we use snapshots + required_for_snapshots = 0.0 + if snapshots_in_use: + for pkg in self: + if (pkg.is_installed and + (pkg.marked_upgrade or pkg.marked_delete)): + required_for_snapshots += pkg.installed.installed_size + logging.debug("additional space for the snapshots: %s" % required_for_snapshots) + + # sum up space requirements + for (dir, size) in [(archivedir, self.requiredDownload), + # plus 50M safety buffer in /usr + ("/usr", self.additionalRequiredSpace), + ("/usr", 50*1024*1024), + ("/boot", space_in_boot), + ("/tmp", 5*1024*1024), # /tmp for dkms LP: #427035 + ("/", 10*1024*1024), # small safety buffer / + (aufs_rw_dir, required_for_aufs), + # if snapshots are in use + ("/usr", required_for_snapshots), + ]: + dir = os.path.realpath(dir) + logging.debug("dir '%s' needs '%s' of '%s' (%f)" % (dir, size, fs_free[dir], fs_free[dir].free)) + fs_free[dir].free -= size + fs_free[dir].need += size + + + # check for space required violations + required_list = {} + for dir in fs_free: + if fs_free[dir].free < 0: + free_at_least = apt_pkg.SizeToStr(float(abs(fs_free[dir].free)+1)) + # make_fs_id ensures we only get stuff on the same + # mountpoint, so we report the requirements only once + # per mountpoint + required_list[make_fs_id(dir)] = FreeSpaceRequired(apt_pkg.SizeToStr(fs_free[dir].need), make_fs_id(dir), free_at_least) + # raise exception if free space check fails + if len(required_list) > 0: + logging.error("Not enough free space: %s" % [str(i) for i in required_list]) + raise NotEnoughFreeSpaceError(required_list.values()) + return True + + + +if __name__ == "__main__": + import sys + import DistUpgradeConfigParser + import DistUpgradeView + print "foo" + c = MyCache(DistUpgradeConfigParser.DistUpgradeConfig("."), + DistUpgradeView.DistUpgradeView(), None) + #c.checkForNvidia() + #print c._identifyObsoleteKernels() + print c.checkFreeSpace() + sys.exit() + + c.clear() + c.create_snapshot() + c.installedTasks + c.installTasks(["ubuntu-desktop"]) + print c.get_changes() + c.restore_snapshot() diff -Nru update-manager-17.10.11/DistUpgrade/DistUpgrade.cfg update-manager-0.156.14.15/DistUpgrade/DistUpgrade.cfg --- update-manager-17.10.11/DistUpgrade/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DistUpgrade.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,117 @@ +[View] +# the views will be tried in this order, if one fails to import, the next +# is tried +View=DistUpgradeViewGtk,DistUpgradeViewGtk3,DistUpgradeViewKDE,DistUpgradeViewText +#View=DistUpgradeViewNonInteractive +#Depends= python-apt (>= 0.6.0), apt (>= 0.6) +# the views below support upgrades over ssh connection +SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive + +# Distro contains global information about the upgrade +[Distro] +# the meta-pkgs we support +MetaPkgs=ubuntu-desktop, kubuntu-desktop, xubuntu-desktop, ubuntustudio-desktop, ichthux-desktop, mythbuntu-desktop, ubuntu-netbook, kubuntu-netbook, lubuntu-desktop +BaseMetaPkgs=ubuntu-minimal, ubuntu-standard +Demotions=demoted.cfg +RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin +RemovalBlacklistFile=removal_blacklist.cfg +# if those packages were installed, make sure to keep them installed +KeepInstalledPkgs=gnumeric, hpijs, xserver-xorg-video-all +KeepInstalledSection=translations +RemoveObsoletes=yes +ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools +# hints for for stuff that should be done early +PostUpgradePurge=ltsp-client, ltspfsd, linux-restricted-modules-common +PostUpgradeRemove=libflashsupport, kvm-source, gtk-qt-engine, libparted1.8-12, usplash, printconf, foomatic-db-gutenprint, ebox-printers, kbluetooth, kde-plasmoid-cwp +PostUpgradeUpgrade=brasero,edubuntu-desktop +#PostUpgradeInstall=apt +PostInstallScripts=./xorg_fix_proprietary.py +EnableApport=yes +# this supported blacklisting certain versions to ensure we do not upgrade +# - blcr-dkms fails to build on kernel 2.6.35 +BadVersions=blcr-dkms_0.8.2-13 +# ubiquity slideshow +#SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/ + +[KernelRemoval] +Version=3.0.0 +BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules,linux-header-lbm +Types=386,ec2,generic,rt,server,virtual + +# information about the individual meta-pkgs +[ubuntu-desktop] +KeyDependencies=gdm, ubuntu-artwork, ubuntu-sounds +# those pkgs will be marked remove right after the distUpgrade in the cache +PostUpgradeRemove=xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner +ForcedObsoletes=desktop-effects, cups-pdf, gnome-app-install, policykit-gnome, gnome-mount + +[kubuntu-desktop] +KeyDependencies=kdm, kubuntu-artwork +PostUpgradeRemove=powermanagement-interface, guidance-power-manager, kde-guidance-powermanager +# those packages are marked as obsolete right after the upgrade +ForcedObsoletes=ivman, cups-pdf, gtk-qt-engine + +[kubuntu-netbook] +KeyDependencies=kdm, kubuntu-netbook-default-settings + +[ubuntu-netbook] +KeyDependencies=gdm, ubuntu-netbook-default-settings + +[xubuntu-desktop] +KeyDependencies=xubuntu-artwork, xubuntu-default-settings, xfwm4 +PostUpgradeRemove=notification-daemon +ForcedObsoletes=cups-pdf + +[ubuntustudio-desktop] +KeyDependencies=ubuntustudio-default-settings, ubuntustudio-look + +[ichthux-desktop] +KeyDependencies=ichthux-artwork, ichthux-default-settings + +[mythbuntu-desktop] +KeyDependencies=mythbuntu-artwork, mythbuntu-default-settings + +[lubuntu-desktop] +KeyDependencies=lubuntu-core, lubuntu-default-settings +#Remove previous gnome component from lubuntu to avoid pulling gnome depends on upgrade (LP: #945215) +PostUpgradeRemove=gnome-bluetooth, gnome-power-manager + +[Files] +BackupExt=distUpgrade +LogDir=/var/log/dist-upgrade/ + +[Sources] +From=oneiric +To=precise +ValidOrigin=Ubuntu +ValidMirrors = mirrors.cfg +Components=main,restricted,universe,multiverse +Pockets=security,updates,proposed,backports +;AllowThirdParty=False + +;[PreRequists] +;Packages=release-upgrader-apt,release-upgrader-dpkg +;SourcesList=prerequists-sources.list +;SourcesList-ia64=prerequists-sources.ports.list +;SourcesList-hppa=prerequists-sources.ports.list + +[Aufs] +; this is a xor option, either full or chroot overlay +;EnableFullOverlay=yes +;EnableChrootOverlay=yes +; sync changes from the chroot back to the real system +;EnableChrootRsync=yes +; what chroot dir to use +;ChrootDir=/tmp/upgrade-chroot +; the RW dir to use (either for full overlay or chroot overlay) +;RWDir=/tmp/upgrade-rw + +[Network] +MaxRetries=3 + +[NonInteractive] +ForceOverwrite=yes +RealReboot=no +DebugBrokenScripts=no +DpkgProgressLog=no +;TerminalTimeout=2400 diff -Nru update-manager-17.10.11/DistUpgrade/DistUpgrade.cfg.dapper update-manager-0.156.14.15/DistUpgrade/DistUpgrade.cfg.dapper --- update-manager-17.10.11/DistUpgrade/DistUpgrade.cfg.dapper 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DistUpgrade.cfg.dapper 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,56 @@ +[View] +View=DistUpgradeViewGtk,DistUpgradeViewKDE, DistUpgradeViewText + +# Distro contains global information about the upgrade +[Distro] +# the meta-pkgs we support +MetaPkgs=ubuntu-desktop, kubuntu-desktop, edubuntu-desktop, xubuntu-desktop +BaseMetaPkgs=ubuntu-minimal, ubuntu-standard, bash +PostUpgradePurge=xorg-common, libgl1-mesa, ltsp-client, ltspfsd, python2.3 +Demotions=demoted.cfg.dapper +RemoveEssentialOk=sysvinit +RemovalBlacklistFile=removal_blacklist.cfg +PostInstallScripts=/usr/lib/udev/migrate-fstab-to-uuid.sh +KeepInstalledPkgs=lvm2 +KeepInstalledSection=translations +RemoveObsoletes=yes +ForcedObsoletes=esound, esound-common, slocate, ksplash-engine-moodin + +# information about the individual meta-pkgs +[ubuntu-desktop] +KeyDependencies=gdm, gnome-panel, ubuntu-artwork +# those pkgs will be marked remove right after the distUpgrade in the cache +PostUpgradeRemove=xchat, xscreensaver, gnome-cups-manager + +[kubuntu-desktop] +KeyDependencies=kdm, kicker, kubuntu-artwork-usplash +# those packages are marked as obsolete right after the upgrade +ForcedObsoletes=ivman, slocate + +[edubuntu-desktop] +KeyDependencies=edubuntu-artwork, tuxpaint + +[xubuntu-desktop] +KeyDependencies=xubuntu-artwork-usplash, xubuntu-default-settings, xfwm4 + + +[Files] +BackupExt=distUpgrade +LogDir=/var/log/dist-upgrade + +[PreRequists] +Packages=release-upgrader-apt,release-upgrader-dpkg +SourcesList=prerequists-sources.dapper.list +SourcesList-ia64=prerequists-sources.dapper-ports.list +SourcesList-hppa=prerequists-sources.dapper-ports.list + +[Sources] +From=dapper +To=hardy +ValidOrigin=Ubuntu +ValidMirrors = mirrors.cfg + +[Network] +MaxRetries=3 + + diff -Nru update-manager-17.10.11/DistUpgrade/DistUpgrade.cfg.hardy update-manager-0.156.14.15/DistUpgrade/DistUpgrade.cfg.hardy --- update-manager-17.10.11/DistUpgrade/DistUpgrade.cfg.hardy 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DistUpgrade.cfg.hardy 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,106 @@ +[View] +# the views will be tried in this order, if one fails to import, the next +# is tried +View=DistUpgradeViewGtk,DistUpgradeViewKDE,DistUpgradeViewText +#View=DistUpgradeViewNonInteractive +#Depends= python-apt (>= 0.6.0), apt (>= 0.6) +# the views below support upgrades over ssh connection +SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive + +# Distro contains global information about the upgrade +[Distro] +# the meta-pkgs we support +MetaPkgs=ubuntu-desktop, kubuntu-desktop, edubuntu-desktop, xubuntu-desktop, ubuntustudio-desktop, ichthux-desktop, mythbuntu-desktop, kubuntu-kde4-desktop +BaseMetaPkgs=ubuntu-minimal, ubuntu-standard +Demotions=demoted.cfg.hardy +RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin +RemovalBlacklistFile=removal_blacklist.cfg +# if those packages were installed, make sure to keep them installed +KeepInstalledPkgs=gnumeric, hpijs, xserver-xorg-video-all +KeepInstalledSection=translations +RemoveObsoletes=yes +ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools +# libflashsupport is now oboselete and causes problems so we remove it +# early +PostUpgradePurge=ltsp-client, ltspfsd, linux-restricted-modules-common +PostUpgradeRemove=libflashsupport, slocate, gtk-qt-engine, libparted1.8-12, usplash +#PostUpgradeInstall=apt +PostInstallScripts=./xorg_fix_proprietary.py +# this supported blacklisting certain versions to ensure we do not upgrade +# - the openoffice.org-filter-binfilter causes a pre-depends cycle error +# (#516727) +BadVersions=openoffice.org-filter-binfilter_1:3.2.0~rc4-1ubuntu1 +EnableApport=no + +[KernelRemoval] +Version=2.6.24 +BaseNames=linux-image,linux-headers,linux-image-debug,linux-ubuntu-modules,linux-header-lum,linux-backport-modules,linux-header-lbm,linux-restricted-modules +Types=386,generic,rt,server,virtual + +# information about the individual meta-pkgs +[ubuntu-desktop] +KeyDependencies=gdm, usplash-theme-ubuntu, ubuntu-artwork, ubuntu-sounds +# those pkgs will be marked remove right after the distUpgrade in the cache +PostUpgradeRemove=xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner, tracker +ForcedObsoletes=desktop-effects, cups-pdf + +[kubuntu-desktop] +KeyDependencies=kdm, kubuntu-artwork-usplash +PostUpgradeRemove=powermanagement-interface,adept +# those packages are marked as obsolete right after the upgrade +ForcedObsoletes=ivman, cups-pdf, guidance-power-manager, gtk-qt-engine + +[kubuntu-kde4-desktop] +KeyDependencies=kdebase-bin-kde4, kubuntu-artwork-usplash, kwin-kde4 + +[edubuntu-desktop] +KeyDependencies=edubuntu-artwork, tuxpaint + +[xubuntu-desktop] +KeyDependencies=xubuntu-artwork-usplash, xubuntu-default-settings, xfwm4 +PostUpgradeRemove=notification-daemon +ForcedObsoletes=cups-pdf + +[ubuntustudio-desktop] +KeyDependencies=ubuntustudio-default-settings, ubuntustudio-look, usplash-theme-ubuntustudio + +[ichthux-desktop] +KeyDependencies=ichthux-artwork-usplash, ichthux-default-settings + +[mythbuntu-desktop] +KeyDependencies=mythbuntu-artwork-usplash,mythbuntu-default-settings + +[Files] +BackupExt=distUpgrade +LogDir=/var/log/dist-upgrade/ + +[Sources] +From=hardy +To=lucid +ValidOrigin=Ubuntu +ValidMirrors = mirrors.cfg +Components=main,restricted,universe,multiverse + +;[PreRequists] +;Packages=release-upgrader-apt,release-upgrader-dpkg +;SourcesList=prerequists-sources.list +;SourcesList-ia64=prerequists-sources.ports.list +;SourcesList-hppa=prerequists-sources.ports.list + +[Aufs] +; this is a xor option, either full or chroot overlay +;EnableFullOverlay=yes +;EnableChrootOverlay=yes +; sync changes from the chroot back to the real system +;EnableChrootRsync=yes +; what chroot dir to use +;ChrootDir=/tmp/upgrade-chroot +; the RW dir to use (either for full overlay or chroot overlay) +;RWDir=/tmp/upgrade-rw + +[Network] +MaxRetries=3 + +[NonInteractive] +ForceOverwrite=no +RealReboot=no diff -Nru update-manager-17.10.11/DistUpgrade/DistUpgrade.cfg.lucid update-manager-0.156.14.15/DistUpgrade/DistUpgrade.cfg.lucid --- update-manager-17.10.11/DistUpgrade/DistUpgrade.cfg.lucid 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DistUpgrade.cfg.lucid 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,114 @@ +[View] +# the views will be tried in this order, if one fails to import, the next +# is tried +View=DistUpgradeViewGtk,DistUpgradeViewGtk3,DistUpgradeViewKDE,DistUpgradeViewText +#View=DistUpgradeViewNonInteractive +#Depends= python-apt (>= 0.6.0), apt (>= 0.6) +# the views below support upgrades over ssh connection +SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive + +# Distro contains global information about the upgrade +[Distro] +# the meta-pkgs we support +MetaPkgs=ubuntu-desktop, kubuntu-desktop, xubuntu-desktop, ubuntustudio-desktop, ichthux-desktop, mythbuntu-desktop, ubuntu-netbook, kubuntu-netbook +BaseMetaPkgs=ubuntu-minimal, ubuntu-standard +Demotions=demoted.cfg +RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin +RemovalBlacklistFile=removal_blacklist.cfg +# if those packages were installed, make sure to keep them installed +KeepInstalledPkgs=gnumeric, hpijs, xserver-xorg-video-all +KeepInstalledSection=translations +RemoveObsoletes=yes +ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools +# hints for for stuff that should be done early +PostUpgradePurge=ltsp-client, ltspfsd, linux-restricted-modules-common +PostUpgradeRemove=libflashsupport, kvm-source, gtk-qt-engine, libparted1.8-12, usplash, printconf, foomatic-db-gutenprint, ebox-printers, kbluetooth, kde-plasmoid-cwp +PostUpgradeUpgrade=brasero,edubuntu-desktop +#PostUpgradeInstall=apt +PostInstallScripts=./xorg_fix_proprietary.py +EnableApport=yes +# this supported blacklisting certain versions to ensure we do not upgrade +# - blcr-dkms fails to build on kernel 2.6.35 +BadVersions=blcr-dkms_0.8.2-13 +# ubiquity slideshow +#SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/ +# useful for e.g. testing +;AllowUnauthenticated=yes + +[KernelRemoval] +Version=2.6.32 +BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules,linux-header-lbm +Types=386,ec2,generic,rt,server,virtual + +# information about the individual meta-pkgs +[ubuntu-desktop] +KeyDependencies=gdm, ubuntu-artwork, ubuntu-sounds +# those pkgs will be marked remove right after the distUpgrade in the cache +PostUpgradeRemove=xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner +ForcedObsoletes=desktop-effects, cups-pdf, gnome-app-install, policykit-gnome, gnome-mount + +[kubuntu-desktop] +KeyDependencies=kdm, kubuntu-artwork +PostUpgradeRemove=powermanagement-interface, guidance-power-manager, kde-guidance-powermanager +# those packages are marked as obsolete right after the upgrade +ForcedObsoletes=ivman, cups-pdf, gtk-qt-engine + +[kubuntu-netbook] +KeyDependencies=kdm, kubuntu-netbook-default-settings + +[ubuntu-netbook] +KeyDependencies=gdm, ubuntu-netbook-default-settings + +[xubuntu-desktop] +KeyDependencies=xubuntu-artwork, xubuntu-default-settings, xfwm4 +PostUpgradeRemove=notification-daemon +ForcedObsoletes=cups-pdf + +[ubuntustudio-desktop] +KeyDependencies=ubuntustudio-default-settings, ubuntustudio-look + +[ichthux-desktop] +KeyDependencies=ichthux-artwork, ichthux-default-settings + +[mythbuntu-desktop] +KeyDependencies=mythbuntu-artwork, mythbuntu-default-settings + +[Files] +BackupExt=distUpgrade +LogDir=/var/log/dist-upgrade/ + +[Sources] +From=lucid +To=precise +ValidOrigin=Ubuntu +ValidMirrors = mirrors.cfg +Components=main,restricted,universe,multiverse +Pockets=security,updates,proposed,backports +;AllowThirdParty=False + +[PreRequists] +Packages=libapt-pkg4.12,libapt-inst1.4,release-upgrader-python-apt +SourcesList=prerequists-sources.list +;SourcesList-ia64=prerequists-sources.ports.list +;SourcesList-hppa=prerequists-sources.ports.list + +[Aufs] +; this is a xor option, either full or chroot overlay +;EnableFullOverlay=yes +;EnableChrootOverlay=yes +; sync changes from the chroot back to the real system +;EnableChrootRsync=yes +; what chroot dir to use +;ChrootDir=/tmp/upgrade-chroot +; the RW dir to use (either for full overlay or chroot overlay) +;RWDir=/tmp/upgrade-rw + +[Network] +MaxRetries=3 + +[NonInteractive] +ForceOverwrite=yes +RealReboot=no +DebugBrokenScripts=no +DpkgProgressLog=no +;TerminalTimeout=2400 diff -Nru update-manager-17.10.11/DistUpgrade/DistUpgradeConfigParser.py update-manager-0.156.14.15/DistUpgrade/DistUpgradeConfigParser.py --- update-manager-17.10.11/DistUpgrade/DistUpgradeConfigParser.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DistUpgradeConfigParser.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,70 @@ +from ConfigParser import SafeConfigParser, NoOptionError, NoSectionError +import subprocess +import os.path +import logging +import glob + +CONFIG_OVERRIDE_DIR = "/etc/update-manager/release-upgrades.d" + +class DistUpgradeConfig(SafeConfigParser): + def __init__(self, datadir, name="DistUpgrade.cfg", + override_dir=CONFIG_OVERRIDE_DIR, + defaults_dir=None): + SafeConfigParser.__init__(self) + # we support a config overwrite, if DistUpgrade.cfg.dapper exists + # and the user runs dapper, that one will be used + from_release = subprocess.Popen(["lsb_release","-c","-s"], + stdout=subprocess.PIPE).communicate()[0].strip() + self.datadir=datadir + if os.path.exists(name+"."+from_release): + name = name+"."+from_release + maincfg = os.path.join(datadir,name) + # defaults are read first + self.config_files = [] + if defaults_dir: + for cfg in glob.glob(defaults_dir+"/*.cfg"): + self.config_files.append(cfg) + # our config file + self.config_files += [maincfg] + # overrides are read later + for cfg in glob.glob(override_dir+"/*.cfg"): + self.config_files.append(cfg) + self.read(self.config_files) + def getWithDefault(self, section, option, default): + try: + if type(default) == bool: + return self.getboolean(section, option) + elif type(default) == float: + return self.getfloat(section, option) + elif type(default) == int: + return self.getint(section, option) + return self.get(section, option) + except (NoSectionError, NoOptionError): + return default + def getlist(self, section, option): + try: + tmp = self.get(section, option) + except (NoSectionError,NoOptionError): + return [] + items = [x.strip() for x in tmp.split(",")] + return items + def getListFromFile(self, section, option): + try: + filename = self.get(section, option) + except NoOptionError: + return [] + p = os.path.join(self.datadir,filename) + if not os.path.exists(p): + logging.error("getListFromFile: no '%s' found" % p) + items = [x.strip() for x in open(p)] + return filter(lambda s: not s.startswith("#") and not s == "", items) + + +if __name__ == "__main__": + c = DistUpgradeConfig(".") + print c.getlist("Distro","MetaPkgs") + print c.getlist("Distro","ForcedPurges") + print c.getListFromFile("Sources","ValidMirrors") + print c.getWithDefault("Distro","EnableApport", True) + print c.set("Distro","Foo", "False") + print c.getWithDefault("Distro","Foo", True) diff -Nru update-manager-17.10.11/DistUpgrade/DistUpgradeController.py update-manager-0.156.14.15/DistUpgrade/DistUpgradeController.py --- update-manager-17.10.11/DistUpgrade/DistUpgradeController.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DistUpgradeController.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,1779 @@ +# DistUpgradeController.py +# +# Copyright (c) 2004-2008 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + + +import warnings +warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning) +import apt +import apt_pkg +import sys +import os +import subprocess +import locale +import logging +import shutil +import glob +import time +import copy +import ConfigParser +from utils import (country_mirror, + url_downloadable, + check_and_fix_xbit, + get_arch, + iptables_active, + inside_chroot, + get_string_with_no_auth_from_source_entry, + is_child_of_process_name) +from string import Template +from urlparse import urlsplit + +import DistUpgradeView +from DistUpgradeCache import MyCache +from DistUpgradeConfigParser import DistUpgradeConfig +from DistUpgradeQuirks import DistUpgradeQuirks +from DistUpgradeAptCdrom import AptCdrom +from DistUpgradeAufs import setupAufs, aufsOptionsAndEnvironmentSetup + +# workaround broken relative import in python-apt (LP: #871007), we +# want the local version of distinfo.py from oneiric, but because of +# a bug in python-apt we will get the natty version that does not +# know about "Component.parent_component" leading to a crash +import distinfo +import sourceslist +sourceslist.DistInfo = distinfo.DistInfo + +from sourceslist import SourcesList, is_mirror +from distro import get_distro, NoDistroTemplateException + +from DistUpgradeGettext import gettext as _ +from DistUpgradeGettext import ngettext +import gettext + +from DistUpgradeCache import (CacheExceptionDpkgInterrupted, + CacheExceptionLockingFailed, + NotEnoughFreeSpaceError) +from DistUpgradeApport import run_apport + +REBOOT_REQUIRED_FILE = "/var/run/reboot-required" + +class NoBackportsFoundException(Exception): + pass + + +class DistUpgradeController(object): + """ this is the controller that does most of the work """ + + def __init__(self, distUpgradeView, options=None, datadir=None): + # setup the paths + localedir = "/usr/share/locale/" + if datadir == None: + datadir = os.getcwd() + localedir = os.path.join(datadir,"mo") + self.datadir = datadir + self.options = options + + # init gettext + gettext.bindtextdomain("update-manager",localedir) + gettext.textdomain("update-manager") + + # setup the view + logging.debug("Using '%s' view" % distUpgradeView.__class__.__name__) + self._view = distUpgradeView + self._view.updateStatus(_("Reading cache")) + self.cache = None + + if not self.options or self.options.withNetwork == None: + self.useNetwork = True + else: + self.useNetwork = self.options.withNetwork + if options: + cdrompath = options.cdromPath + else: + cdrompath = None + self.aptcdrom = AptCdrom(distUpgradeView, cdrompath) + + # the configuration + self.config = DistUpgradeConfig(datadir) + self.sources_backup_ext = "."+self.config.get("Files","BackupExt") + + # move some of the options stuff into the self.config, + # ConfigParser deals only with strings it seems *sigh* + self.config.add_section("Options") + self.config.set("Options","withNetwork", str(self.useNetwork)) + + # aufs stuff + aufsOptionsAndEnvironmentSetup(self.options, self.config) + + # some constants here + self.fromDist = self.config.get("Sources","From") + self.toDist = self.config.get("Sources","To") + self.origin = self.config.get("Sources","ValidOrigin") + self.arch = get_arch() + + # we run with --force-overwrite by default + if not os.environ.has_key("RELEASE_UPGRADE_NO_FORCE_OVERWRITE"): + logging.debug("enable dpkg --force-overwrite") + apt_pkg.Config.set("DPkg::Options::","--force-overwrite") + + # we run in full upgrade mode by default + self._partialUpgrade = False + + # install the quirks handler + self.quirks = DistUpgradeQuirks(self, self.config) + + # setup env var + os.environ["RELEASE_UPGRADE_IN_PROGRESS"] = "1" + os.environ["PYCENTRAL_FORCE_OVERWRITE"] = "1" + os.environ["PATH"] = "%s:%s" % (os.getcwd()+"/imported", + os.environ["PATH"]) + check_and_fix_xbit("./imported/invoke-rc.d") + + # set max retries + maxRetries = self.config.getint("Network","MaxRetries") + apt_pkg.Config.set("Acquire::Retries", str(maxRetries)) + # max sizes for dpkgpm for large installs (see linux/limits.h and + # linux/binfmts.h) + apt_pkg.Config.set("Dpkg::MaxArgs", str(64*1024)) + apt_pkg.Config.set("Dpkg::MaxArgBytes", str(128*1024)) + + # smaller to avoid hangs + apt_pkg.Config.set("Acquire::http::Timeout","20") + apt_pkg.Config.set("Acquire::ftp::Timeout","20") + + # no list cleanup here otherwise a "cancel" in the upgrade + # will not restore the full state (lists will be missing) + apt_pkg.Config.set("Apt::Get::List-Cleanup", "false") + + # forced obsoletes + self.forced_obsoletes = self.config.getlist("Distro","ForcedObsoletes") + # list of valid mirrors that we can add + self.valid_mirrors = self.config.getListFromFile("Sources","ValidMirrors") + # third party mirrors + self.valid_3p_mirrors = [] + if self.config.has_section('ThirdPartyMirrors'): + self.valid_3p_mirrors = [pair[1] for pair in + self.config.items('ThirdPartyMirrors')] + # debugging + #apt_pkg.config.set("DPkg::Options::","--debug=0077") + + # apt cron job + self._aptCronJobPerms = 0755 + + def openCache(self, lock=True): + logging.debug("openCache()") + if self.cache is None: + self.quirks.run("PreCacheOpen") + else: + self.cache.releaseLock() + self.cache.unlockListsDir() + try: + self.cache = MyCache(self.config, + self._view, + self.quirks, + self._view.getOpCacheProgress(), + lock) + # alias name for the plugin interface code + self.apt_cache = self.cache + # if we get a dpkg error that it was interrupted, just + # run dpkg --configure -a + except CacheExceptionDpkgInterrupted, e: + logging.warning("dpkg interrupted, calling dpkg --configure -a") + cmd = ["/usr/bin/dpkg","--configure","-a"] + if os.environ.get("DEBIAN_FRONTEND") == "noninteractive": + cmd.append("--force-confold") + self._view.getTerminal().call(cmd) + self.cache = MyCache(self.config, + self._view, + self.quirks, + self._view.getOpCacheProgress()) + except CacheExceptionLockingFailed, e: + logging.error("Cache can not be locked (%s)" % e) + self._view.error(_("Unable to get exclusive lock"), + _("This usually means that another " + "package management application " + "(like apt-get or aptitude) " + "already running. Please close that " + "application first.")); + sys.exit(1) + self.cache.partialUpgrade = self._partialUpgrade + logging.debug("/openCache(), new cache size %i" % len(self.cache)) + + def _viewSupportsSSH(self): + """ + Returns True if this view support upgrades over ssh. + In theory all views should support it, but for savety + we do only allow text ssh upgrades (see LP: #322482) + """ + supported = self.config.getlist("View","SupportSSH") + if self._view.__class__.__name__ in supported: + return True + return False + + def _sshMagic(self): + """ this will check for server mode and if we run over ssh. + if this is the case, we will ask and spawn a additional + daemon (to be sure we have a spare one around in case + of trouble) + """ + pidfile = os.path.join("/var/run/release-upgrader-sshd.pid") + if (not os.path.exists(pidfile) and + os.path.isdir("/proc") and + is_child_of_process_name("sshd")): + # check if the frontend supports ssh upgrades (see lp: #322482) + if not self._viewSupportsSSH(): + logging.error("upgrade over ssh not alllowed") + self._view.error(_("Upgrading over remote connection not supported"), + _("You are running the upgrade over a " + "remote ssh connection with a frontend " + "that does " + "not support this. Please try a text " + "mode upgrade with 'do-release-upgrade'." + "\n\n" + "The upgrade will " + "abort now. Please try without ssh.") + ) + sys.exit(1) + return False + # ask for a spare one to start (and below 1024) + port = 1022 + res = self._view.askYesNoQuestion( + _("Continue running under SSH?"), + _("This session appears to be running under ssh. " + "It is not recommended to perform a upgrade " + "over ssh currently because in case of failure " + "it is harder to recover.\n\n" + "If you continue, an additional ssh daemon will be " + "started at port '%s'.\n" + "Do you want to continue?") % port) + # abort + if res == False: + sys.exit(1) + res = subprocess.call(["/usr/sbin/sshd", + "-o", "PidFile=%s" % pidfile, + "-p",str(port)]) + if res == 0: + summary = _("Starting additional sshd") + descr = _("To make recovery in case of failure easier, an " + "additional sshd will be started on port '%s'. " + "If anything goes wrong with the running ssh " + "you can still connect to the additional one.\n" + ) % port + if iptables_active(): + cmd = "iptables -I INPUT -p tcp --dport %s -j ACCEPT" % port + descr += _( + "If you run a firewall, you may need to " + "temporarily open this port. As this is " + "potentially dangerous it's not done automatically. " + "You can open the port with e.g.:\n'%s'") % cmd + self._view.information(summary, descr) + return True + + def _tryUpdateSelf(self): + """ this is a helper that is run if we are started from a CD + and we have network - we will then try to fetch a update + of ourself + """ + from MetaRelease import MetaReleaseCore + from DistUpgradeFetcherSelf import DistUpgradeFetcherSelf + # check if we run from a LTS + forceLTS=False + if (self.release == "dapper" or + self.release == "hardy" or + self.release == "lucid" or + self.release == "precise"): + forceLTS=True + m = MetaReleaseCore(useDevelopmentRelease=False, + forceLTS=forceLTS) + # this will timeout eventually + while m.downloading: + self._view.processEvents() + time.sleep(0.1) + if m.new_dist is None: + logging.error("No new dist found") + return False + # we have a new dist + progress = self._view.getFetchProgress() + fetcher = DistUpgradeFetcherSelf(new_dist=m.new_dist, + progress=progress, + options=self.options, + view=self._view) + fetcher.run() + + def _pythonSymlinkCheck(self): + """ sanity check that /usr/bin/python points to the default + python version. Users tend to modify this symlink, which + breaks stuff in obscure ways (Ubuntu #75557). + """ + logging.debug("_pythonSymlinkCheck run") + from ConfigParser import SafeConfigParser, NoOptionError + if os.path.exists('/usr/share/python/debian_defaults'): + config = SafeConfigParser() + config.readfp(file('/usr/share/python/debian_defaults')) + try: + expected_default = config.get('DEFAULT', 'default-version') + except NoOptionError: + logging.debug("no default version for python found in '%s'" % config) + return False + try: + fs_default_version = os.readlink('/usr/bin/python') + except OSError, e: + logging.error("os.readlink failed (%s)" % e) + return False + if not fs_default_version in (expected_default, os.path.join('/usr/bin', expected_default)): + logging.debug("python symlink points to: '%s', but expected is '%s' or '%s'" % (fs_default_version, expected_default, os.path.join('/usr/bin', expected_default))) + return False + return True + + + def prepare(self): + """ initial cache opening, sanity checking, network checking """ + # first check if that is a good upgrade + self.release = release = subprocess.Popen(["lsb_release","-c","-s"], + stdout=subprocess.PIPE).communicate()[0].strip() + logging.debug("lsb-release: '%s'" % release) + if not (release == self.fromDist or release == self.toDist): + logging.error("Bad upgrade: '%s' != '%s' " % (release, self.fromDist)) + self._view.error(_("Can not upgrade"), + _("An upgrade from '%s' to '%s' is not " + "supported with this tool." % (release, self.toDist))) + sys.exit(1) + + # setup aufs + if self.config.getWithDefault("Aufs", "EnableFullOverlay", False): + aufs_rw_dir = self.config.get("Aufs","RWDir") + if not setupAufs(aufs_rw_dir): + logging.error("aufs setup failed") + self._view.error(_("Sandbox setup failed"), + _("It was not possible to create the sandbox " + "environment.")) + return False + + # all good, tell the user about the sandbox mode + logging.info("running in aufs overlay mode") + self._view.information(_("Sandbox mode"), + _("This upgrade is running in sandbox " + "(test) mode. All changes are written " + "to '%s' and will be lost on the next " + "reboot.\n\n" + "*No* changes written to a system directory " + "from now until the next reboot are " + "permanent.") % aufs_rw_dir) + + # setup backports (if we have them) + if self.options and self.options.havePrerequists: + backportsdir = os.getcwd()+"/backports" + logging.info("using backports in '%s' " % backportsdir) + logging.debug("have: %s" % glob.glob(backportsdir+"/*.udeb")) + if os.path.exists(backportsdir+"/usr/bin/dpkg"): + apt_pkg.Config.set("Dir::Bin::dpkg",backportsdir+"/usr/bin/dpkg"); + if os.path.exists(backportsdir+"/usr/lib/apt/methods"): + apt_pkg.Config.set("Dir::Bin::methods",backportsdir+"/usr/lib/apt/methods") + conf = backportsdir+"/etc/apt/apt.conf.d/01ubuntu" + if os.path.exists(conf): + logging.debug("adding config '%s'" % conf) + apt_pkg.ReadConfigFile(apt_pkg.Config, conf) + + # do the ssh check and warn if we run under ssh + self._sshMagic() + # check python version + if not self._pythonSymlinkCheck(): + logging.error("pythonSymlinkCheck() failed, aborting") + self._view.error(_("Can not upgrade"), + _("Your python install is corrupted. " + "Please fix the '/usr/bin/python' symlink.")) + sys.exit(1) + # open cache + try: + self.openCache() + except SystemError, e: + logging.error("openCache() failed: '%s'" % e) + return False + if not self.cache.sanityCheck(self._view): + return False + + # now figure out if we need to go into desktop or + # server mode - we use a heuristic for this + self.serverMode = self.cache.needServerMode() + if self.serverMode: + os.environ["RELEASE_UPGRADE_MODE"] = "server" + else: + os.environ["RELEASE_UPGRADE_MODE"] = "desktop" + + if not self.checkViewDepends(): + logging.error("checkViewDepends() failed") + return False + + if os.path.exists("/usr/bin/debsig-verify"): + logging.error("debsig-verify is installed") + self._view.error(_("Package 'debsig-verify' is installed"), + _("The upgrade can not continue with that " + "package installed.\n" + "Please remove it with synaptic " + "or 'apt-get remove debsig-verify' first " + "and run the upgrade again.")) + self.abort() + + from DistUpgradeMain import SYSTEM_DIRS + for systemdir in SYSTEM_DIRS: + if os.path.exists(systemdir) and not os.access(systemdir, os.W_OK): + logging.error("%s not writable" % systemdir) + self._view.error( + _("Can not write to '%s'") % systemdir, + _("Its not possible to write to the system directory " + "'%s' on your system. The upgrade can not " + "continue.\n" + "Please make sure that the system directory is " + "writable.") % systemdir) + self.abort() + + + # FIXME: we may try to find out a bit more about the network + # connection here and ask more intelligent questions + if self.aptcdrom and self.options and self.options.withNetwork == None: + res = self._view.askYesNoQuestion(_("Include latest updates from the Internet?"), + _("The upgrade system can use the internet to " + "automatically download " + "the latest updates and install them during the " + "upgrade. If you have a network connection this is " + "highly recommended.\n\n" + "The upgrade will take longer, but when " + "it is complete, your system will be fully up to " + "date. You can choose not to do this, but you " + "should install the latest updates soon after " + "upgrading.\n" + "If you answer 'no' here, the network is not " + "used at all."), + 'Yes') + self.useNetwork = res + self.config.set("Options","withNetwork", str(self.useNetwork)) + logging.debug("useNetwork: '%s' (selected by user)" % res) + if res: + self._tryUpdateSelf() + return True + + def _sourcesListEntryDownloadable(self, entry): + """ + helper that checks if a sources.list entry points to + something downloadable + """ + logging.debug("verifySourcesListEntry: %s" % entry) + # no way to verify without network + if not self.useNetwork: + logging.debug("skiping downloadable check (no network)") + return True + # check if the entry points to something we can download + uri = "%s/dists/%s/Release" % (entry.uri, entry.dist) + return url_downloadable(uri, logging.debug) + + def rewriteSourcesList(self, mirror_check=True): + logging.debug("rewriteSourcesList()") + + sync_components = self.config.getlist("Sources","Components") + + # skip mirror check if special environment is set + # (useful for server admins with internal repos) + if (self.config.getWithDefault("Sources","AllowThirdParty",False) or + "RELEASE_UPRADER_ALLOW_THIRD_PARTY" in os.environ): + logging.warning("mirror check skipped, *overriden* via config") + mirror_check=False + + # check if we need to enable main + if mirror_check == True and self.useNetwork: + # now check if the base-meta pkgs are available in + # the archive or only available as "now" + # -> if not that means that "main" is missing and we + # need to enable it + for pkgname in self.config.getlist("Distro","BaseMetaPkgs"): + if ((not pkgname in self.cache or + not self.cache[pkgname].candidate or + len(self.cache[pkgname].candidate.origins) == 0) + or + (self.cache[pkgname].candidate and + len(self.cache[pkgname].candidate.origins) == 1 and + self.cache[pkgname].candidate.origins[0].archive == "now") + ): + logging.debug("BaseMetaPkg '%s' has no candidateOrigin" % pkgname) + try: + distro = get_distro() + distro.get_sources(self.sources) + distro.enable_component("main") + except NoDistroTemplateException: + # fallback if everything else does not work, + # we replace the sources.list with a single + # line to ubuntu-main + logging.warning('get_distro().enable_component("man") failed, overwriting sources.list instead as last resort') + s = "# auto generated by update-manager" + s += "deb http://archive.ubuntu.com/ubuntu %s main restricted" % self.toDist + s += "deb http://archive.ubuntu.com/ubuntu %s-updates main restricted" % self.toDist + s += "deb http://security.ubuntu.com/ubuntu %s-security main restricted" % self.toDist + open("/etc/apt/sources.list","w").write(s) + break + + # this must map, i.e. second in "from" must be the second in "to" + # (but they can be different, so in theory we could exchange + # component names here) + pockets = self.config.getlist("Sources","Pockets") + fromDists = [self.fromDist] + ["%s-%s" % (self.fromDist, x) + for x in pockets] + toDists = [self.toDist] + ["%s-%s" % (self.toDist,x) + for x in pockets] + self.sources_disabled = False + + # look over the stuff we have + foundToDist = False + # collect information on what components (main,universe) are enabled for what distro (sub)version + # e.g. found_components = { 'hardy':set("main","restricted"), 'hardy-updates':set("main") } + self.found_components = {} + for entry in self.sources.list[:]: + + # ignore invalid records or disabled ones + if entry.invalid or entry.disabled: + continue + + # we disable breezy cdrom sources to make sure that demoted + # packages are removed + if entry.uri.startswith("cdrom:") and entry.dist == self.fromDist: + logging.debug("disabled '%s' cdrom entry (dist == fromDist)" % entry) + entry.disabled = True + continue + # check if there is actually a lists file for them available + # and disable them if not + elif entry.uri.startswith("cdrom:"): + # + listdir = apt_pkg.Config.find_dir("Dir::State::lists") + if not os.path.exists("%s/%s%s_%s_%s" % + (listdir, + apt_pkg.URItoFileName(entry.uri), + "dists", + entry.dist, + "Release")): + logging.warning("disabling cdrom source '%s' because it has no Release file" % entry) + entry.disabled = True + continue + + # special case for archive.canonical.com that needs to + # be rewritten (for pre-gutsy upgrades) + cdist = "%s-commercial" % self.fromDist + if (not entry.disabled and + entry.uri.startswith("http://archive.canonical.com") and + entry.dist == cdist): + entry.dist = self.toDist + entry.comps = ["partner"] + logging.debug("transitioned commercial to '%s' " % entry) + continue + + # special case for landscape.canonical.com because they + # don't use a standard archive layout (gutsy->hardy) + if (not entry.disabled and + entry.uri.startswith("http://landscape.canonical.com/packages/%s" % self.fromDist)): + logging.debug("commenting landscape.canonical.com out") + entry.disabled = True + continue + + # handle upgrades from a EOL release and check if there + # is a supported release available + if (not entry.disabled and + "old-releases.ubuntu.com/" in entry.uri): + logging.debug("upgrade from old-releases.ubuntu.com detected") + # test country mirror first, then archive.u.c + for uri in ["http://%sarchive.ubuntu.com/ubuntu" % country_mirror(), + "http://archive.ubuntu.com/ubuntu"]: + test_entry = copy.copy(entry) + test_entry.uri = uri + test_entry.dist = self.toDist + if self._sourcesListEntryDownloadable(test_entry): + logging.info("transition from old-release.u.c to %s" % uri) + entry.uri = uri + break + + logging.debug("examining: '%s'" % get_string_with_no_auth_from_source_entry(entry)) + # check if it's a mirror (or official site) + validMirror = self.isMirror(entry.uri) + thirdPartyMirror = not mirror_check or self.isThirdPartyMirror(entry.uri) + if validMirror or thirdPartyMirror: + # disabled/security/commercial/extras are special cases + # we use validTo/foundToDist to figure out if we have a + # main archive mirror in the sources.list or if we + # need to add one + validTo = True + if (entry.disabled or + entry.type == "deb-src" or + "/security.ubuntu.com" in entry.uri or + "%s-security" % self.fromDist in entry.dist or + "/archive.canonical.com" in entry.uri or + "/extras.ubuntu.com" in entry.uri): + validTo = False + if entry.dist in toDists: + # so the self.sources.list is already set to the new + # distro + logging.debug("entry '%s' is already set to new dist" % get_string_with_no_auth_from_source_entry(entry)) + foundToDist |= validTo + elif entry.dist in fromDists: + foundToDist |= validTo + entry.dist = toDists[fromDists.index(entry.dist)] + logging.debug("entry '%s' updated to new dist" % get_string_with_no_auth_from_source_entry(entry)) + elif entry.type == 'deb-src': + continue + elif validMirror: + # disable all entries that are official but don't + # point to either "to" or "from" dist + entry.disabled = True + self.sources_disabled = True + logging.debug("entry '%s' was disabled (unknown dist)" % get_string_with_no_auth_from_source_entry(entry)) + + # if we make it to this point, we have a official or third-party mirror + + # check if the arch is powerpc or sparc and if so, transition + # to ports.ubuntu.com (powerpc got demoted in gutsy, sparc + # in hardy) + if (entry.type == "deb" and + not "ports.ubuntu.com" in entry.uri and + (self.arch == "powerpc" or self.arch == "sparc")): + logging.debug("moving %s source entry to 'ports.ubuntu.com' " % self.arch) + entry.uri = "http://ports.ubuntu.com/ubuntu-ports/" + + # gather what components are enabled and are inconsitent + for d in ["%s" % self.toDist, + "%s-updates" % self.toDist, + "%s-security" % self.toDist]: + # create entry if needed, ignore disabled + # entries and deb-src + self.found_components.setdefault(d,set()) + if (not entry.disabled and entry.dist == d and + entry.type == "deb"): + for comp in entry.comps: + # only sync components we know about + if not comp in sync_components: + continue + self.found_components[d].add(comp) + + else: + # disable anything that is not from a official mirror or a whitelisted third party + if entry.dist == self.fromDist: + entry.dist = self.toDist + entry.comment += " " + _("disabled on upgrade to %s") % self.toDist + entry.disabled = True + self.sources_disabled = True + logging.debug("entry '%s' was disabled (unknown mirror)" % get_string_with_no_auth_from_source_entry(entry)) + + # now go over the list again and check for missing components + # in $dist-updates and $dist-security and add them + for entry in self.sources.list[:]: + # skip all comps that are not relevant (including e.g. "hardy") + if (entry.invalid or entry.disabled or entry.type == "deb-src" or + entry.uri.startswith("cdrom:") or entry.dist == self.toDist): + continue + # now check for "$dist-updates" and "$dist-security" and add any inconsistencies + if self.found_components.has_key(entry.dist): + component_diff = self.found_components[self.toDist]-self.found_components[entry.dist] + if component_diff: + logging.info("fixing components inconsistency from '%s'" % get_string_with_no_auth_from_source_entry(entry)) + entry.comps.extend(list(component_diff)) + logging.info("to new entry '%s'" % get_string_with_no_auth_from_source_entry(entry)) + del self.found_components[entry.dist] + return foundToDist + + def updateSourcesList(self): + logging.debug("updateSourcesList()") + self.sources = SourcesList(matcherPath=".") + if not self.rewriteSourcesList(mirror_check=True): + logging.error("No valid mirror found") + res = self._view.askYesNoQuestion(_("No valid mirror found"), + _("While scanning your repository " + "information no mirror entry for " + "the upgrade was found. " + "This can happen if you run a internal " + "mirror or if the mirror information is " + "out of date.\n\n" + "Do you want to rewrite your " + "'sources.list' file anyway? If you choose " + "'Yes' here it will update all '%s' to '%s' " + "entries.\n" + "If you select 'No' the upgrade will cancel." + ) % (self.fromDist, self.toDist)) + if res: + # re-init the sources and try again + self.sources = SourcesList(matcherPath=".") + # its ok if rewriteSourcesList fails here if + # we do not use a network, the sources.list may be empty + if (not self.rewriteSourcesList(mirror_check=False) + and self.useNetwork): + #hm, still nothing useful ... + prim = _("Generate default sources?") + secon = _("After scanning your 'sources.list' no " + "valid entry for '%s' was found.\n\n" + "Should default entries for '%s' be " + "added? If you select 'No', the upgrade " + "will cancel.") % (self.fromDist, self.toDist) + if not self._view.askYesNoQuestion(prim, secon): + self.abort() + + # add some defaults here + # FIXME: find mirror here + logging.info("generate new default sources.list") + uri = "http://archive.ubuntu.com/ubuntu" + comps = ["main","restricted"] + self.sources.add("deb", uri, self.toDist, comps) + self.sources.add("deb", uri, self.toDist+"-updates", comps) + self.sources.add("deb", + "http://security.ubuntu.com/ubuntu/", + self.toDist+"-security", comps) + else: + self.abort() + + # write (well, backup first ;) ! + self.sources.backup(self.sources_backup_ext) + self.sources.save() + + # re-check if the written self.sources are valid, if not revert and + # bail out + # TODO: check if some main packages are still available or if we + # accidentally shot them, if not, maybe offer to write a standard + # sources.list? + try: + sourceslist = apt_pkg.SourceList() + sourceslist.read_main_list() + except SystemError: + logging.error("Repository information invalid after updating (we broke it!)") + self._view.error(_("Repository information invalid"), + _("Upgrading the repository information " + "resulted in a invalid file so a bug " + "reporting process is being started.")) + subprocess.Popen(["apport-bug", "update-manager"]) + return False + + if self.sources_disabled: + self._view.information(_("Third party sources disabled"), + _("Some third party entries in your sources.list " + "were disabled. You can re-enable them " + "after the upgrade with the " + "'software-properties' tool or " + "your package manager." + )) + return True + + def _logChanges(self): + # debugging output + logging.debug("About to apply the following changes") + inst = [] + up = [] + rm = [] + held = [] + keep = [] + for pkg in self.cache: + if pkg.marked_install: inst.append(pkg.name) + elif pkg.marked_upgrade: up.append(pkg.name) + elif pkg.marked_delete: rm.append(pkg.name) + elif (pkg.is_installed and pkg.is_upgradable): held.append(pkg.name) + elif pkg.is_installed and pkg.marked_keep: keep.append(pkg.name) + logging.debug("Keep at same version: %s" % " ".join(keep)) + logging.debug("Upgradable, but held- back: %s" % " ".join(held)) + logging.debug("Remove: %s" % " ".join(rm)) + logging.debug("Install: %s" % " ".join(inst)) + logging.debug("Upgrade: %s" % " ".join(up)) + + + def doPostInitialUpdate(self): + # check if we have packages in ReqReinst state that are not + # downloadable + logging.debug("doPostInitialUpdate") + self.quirks.run("PostInitialUpdate") + if len(self.cache.reqReinstallPkgs) > 0: + logging.warning("packages in reqReinstall state, trying to fix") + self.cache.fixReqReinst(self._view) + self.openCache() + if len(self.cache.reqReinstallPkgs) > 0: + reqreinst = self.cache.reqReinstallPkgs + header = ngettext("Package in inconsistent state", + "Packages in inconsistent state", + len(reqreinst)) + summary = ngettext("The package '%s' is in an inconsistent " + "state and needs to be reinstalled, but " + "no archive can be found for it. " + "Please reinstall the package manually " + "or remove it from the system.", + "The packages '%s' are in an inconsistent " + "state and need to be reinstalled, but " + "no archive can be found for them. " + "Please reinstall the packages manually " + "or remove them from the system.", + len(reqreinst)) % ", ".join(reqreinst) + self._view.error(header, summary) + return False + # FIXME: check out what packages are downloadable etc to + # compare the list after the update again + self.obsolete_pkgs = self.cache._getObsoletesPkgs() + self.foreign_pkgs = self.cache._getForeignPkgs(self.origin, self.fromDist, self.toDist) + if self.serverMode: + self.tasks = self.cache.installedTasks + logging.debug("Foreign: %s" % " ".join(self.foreign_pkgs)) + logging.debug("Obsolete: %s" % " ".join(self.obsolete_pkgs)) + return True + + def doUpdate(self, showErrors=True, forceRetries=None): + logging.debug("running doUpdate() (showErrors=%s)" % showErrors) + if not self.useNetwork: + logging.debug("doUpdate() will not use the network because self.useNetwork==false") + return True + self.cache._list.read_main_list() + progress = self._view.getFetchProgress() + # FIXME: also remove all files from the lists partial dir! + currentRetry = 0 + if forceRetries is not None: + maxRetries=forceRetries + else: + maxRetries = self.config.getint("Network","MaxRetries") + while currentRetry < maxRetries: + try: + self.cache.update(progress) + except (SystemError, IOError), e: + logging.error("IOError/SystemError in cache.update(): '%s'. Retrying (currentRetry: %s)" % (e,currentRetry)) + currentRetry += 1 + continue + # no exception, so all was fine, we are done + return True + + logging.error("doUpdate() failed completely") + if showErrors: + self._view.error(_("Error during update"), + _("A problem occurred during the update. " + "This is usually some sort of network " + "problem, please check your network " + "connection and retry."), "%s" % e) + return False + + + def _checkFreeSpace(self): + " this checks if we have enough free space on /var and /usr" + err_sum = _("Not enough free disk space") + err_long= _("The upgrade has aborted. " + "The upgrade needs a total of %s free space on disk '%s'. " + "Please free at least an additional %s of disk " + "space on '%s'. " + "Empty your trash and remove temporary " + "packages of former installations using " + "'sudo apt-get clean'.") + # allow override + if self.config.getWithDefault("FreeSpace","SkipCheck",False): + logging.warning("free space check skipped via config override") + return True + # do the check + with_snapshots = self._is_apt_btrfs_snapshot_supported() + try: + self.cache.checkFreeSpace(with_snapshots) + except NotEnoughFreeSpaceError, e: + # ok, showing multiple error dialog sucks from the UI + # perspective, but it means we do not need to break the + # string freeze + for required in e.free_space_required_list: + self._view.error(err_sum, err_long % (required.size_total, + required.dir, + required.size_needed, + required.dir)) + return False + return True + + + def askDistUpgrade(self): + self._view.updateStatus(_("Calculating the changes")) + if not self.cache.distUpgrade(self._view, self.serverMode, self._partialUpgrade): + return False + + if self.serverMode: + if not self.cache.installTasks(self.tasks): + return False + + # show changes and confirm + changes = self.cache.get_changes() + self._view.processEvents() + + # log the changes for debugging + self._logChanges() + self._view.processEvents() + + # check if we have enough free space + if not self._checkFreeSpace(): + return False + self._view.processEvents() + + # get the demotions + self.installed_demotions = self.cache.get_installed_demoted_packages() + if len(self.installed_demotions) > 0: + self.installed_demotions.sort() + logging.debug("demoted: '%s'" % " ".join([x.name for x in self.installed_demotions])) + logging.debug("found components: %s" % self.found_components) + + # flush UI + self._view.processEvents() + + # ask the user + res = self._view.confirmChanges(_("Do you want to start the upgrade?"), + changes, + self.installed_demotions, + self.cache.requiredDownload) + return res + + def _disableAptCronJob(self): + if os.path.exists("/etc/cron.daily/apt"): + #self._aptCronJobPerms = os.stat("/etc/cron.daily/apt")[ST_MODE] + logging.debug("disabling apt cron job (%s)" % oct(self._aptCronJobPerms)) + os.chmod("/etc/cron.daily/apt",0644) + def _enableAptCronJob(self): + if os.path.exists("/etc/cron.daily/apt"): + logging.debug("enabling apt cron job") + os.chmod("/etc/cron.daily/apt", self._aptCronJobPerms) + + def doDistUpgradeFetching(self): + # ensure that no apt cleanup is run during the download/install + self._disableAptCronJob() + # get the upgrade + currentRetry = 0 + fprogress = self._view.getFetchProgress() + #iprogress = self._view.getInstallProgress(self.cache) + # start slideshow + url = self.config.getWithDefault("Distro","SlideshowUrl",None) + if url: + try: + lang = locale.getdefaultlocale()[0].split('_')[0] + except: + logging.exception("getdefaultlocale") + lang = "en" + self._view.getHtmlView().open("%s#locale=%s" % (url, lang)) + # retry the fetching in case of errors + maxRetries = self.config.getint("Network","MaxRetries") + # FIXME: we get errors like + # "I wasn't able to locate file for the %s package" + # here sometimes. its unclear why and not reproducible, the + # current theory is that for some reason the file is not + # considered trusted at the moment + # pkgAcquireArchive::QueueNext() runs debReleaseIndex::IsTrused() + # (the later just checks for the existence of the .gpg file) + # OR + # the fact that we get a pm and fetcher here confuses something + # in libapt? + # POSSIBLE workaround: keep the list-dir locked so that + # no apt-get update can run outside from the release + # upgrader + user_canceled = False + while currentRetry < maxRetries: + try: + pm = apt_pkg.PackageManager(self.cache._depcache) + fetcher = apt_pkg.Acquire(fprogress) + self.cache._fetch_archives(fetcher, pm) + except apt.cache.FetchCancelledException, e: + logging.info("user canceled") + user_canceled = True + break + except IOError, e: + # fetch failed, will be retried + logging.error("IOError in cache.commit(): '%s'. Retrying (currentTry: %s)" % (e,currentRetry)) + currentRetry += 1 + continue + return True + + # maximum fetch-retries reached without a successful commit + if user_canceled: + self._view.information(_("Upgrade canceled"), + _("The upgrade will cancel now and the " + "original system state will be restored. " + "You can resume the upgrade at a later " + "time.")) + else: + logging.error("giving up on fetching after maximum retries") + self._view.error(_("Could not download the upgrades"), + _("The upgrade has aborted. Please check your " + "Internet connection or " + "installation media and try again. All files " + "downloaded so far have been kept."), + "%s" % e) + # abort here because we want our sources.list back + self._enableAptCronJob() + self.abort() + + def enableApport(self, fname="/etc/default/apport"): + """ enable apport """ + # startup apport just until the next reboot, it has the magic + # "force_start" environment for this + subprocess.call(["service","apport","start","force_start=1"]) + + def _is_apt_btrfs_snapshot_supported(self): + """ check if apt-btrfs-snapshot is usable """ + try: + import apt_btrfs_snapshot + except ImportError: + return + try: + apt_btrfs = apt_btrfs_snapshot.AptBtrfsSnapshot() + res = apt_btrfs.snapshots_supported() + except: + logging.exception("failed to check btrfs support") + return False + logging.debug("apt btrfs snapshots supported: %s" % res) + return res + + def _maybe_create_apt_btrfs_snapshot(self): + """ create btrfs snapshot (if btrfs layout is there) """ + if not self._is_apt_btrfs_snapshot_supported(): + return + import apt_btrfs_snapshot + apt_btrfs = apt_btrfs_snapshot.AptBtrfsSnapshot() + prefix = "release-upgrade-%s-" % self.toDist + res = apt_btrfs.create_btrfs_root_snapshot(prefix) + logging.info("creating snapshot '%s' (success=%s)" % (prefix, res)) + + def doDistUpgrade(self): + # check if we want apport running during the upgrade + if self.config.getWithDefault("Distro","EnableApport", False): + self.enableApport() + + # add debug code only here + #apt_pkg.config.set("Debug::pkgDpkgPM", "1") + #apt_pkg.config.set("Debug::pkgOrderList", "1") + #apt_pkg.config.set("Debug::pkgPackageManager", "1") + + # get the upgrade + currentRetry = 0 + fprogress = self._view.getFetchProgress() + iprogress = self._view.getInstallProgress(self.cache) + # retry the fetching in case of errors + maxRetries = self.config.getint("Network","MaxRetries") + if not self._partialUpgrade: + self.quirks.run("StartUpgrade") + # FIXME: take this into account for diskspace calculation + self._maybe_create_apt_btrfs_snapshot() + res = False + while currentRetry < maxRetries: + try: + res = self.cache.commit(fprogress,iprogress) + logging.debug("cache.commit() returned %s" % res) + except SystemError, e: + logging.error("SystemError from cache.commit(): %s" % e) + # if its a ordering bug we can cleanly revert to + # the previous release, no packages have been installed + # yet (LP: #328655, #356781) + if os.path.exists("/var/run/update-manager-apt-exception"): + e = open("/var/run/update-manager-apt-exception").read() + logging.error("found exception: '%s'" % e) + # if its a ordering bug we can cleanly revert but we need to write + # a marker for the parent process to know its this kind of error + pre_configure_errors = [ + "E:Internal Error, Could not perform immediate configuration", + "E:Couldn't configure pre-depend "] + for preconf_error in pre_configure_errors: + if str(e).startswith(preconf_error): + logging.debug("detected preconfigure error, restorting state") + self._enableAptCronJob() + # FIXME: strings are not good, but we are in string freeze + # currently + msg = _("Error during commit") + msg += "\n'%s'\n" % str(e) + msg += _("Restoring original system state") + self._view.error(_("Could not install the upgrades"), msg) + # abort() exits cleanly + self.abort() + + # invoke the frontend now and show a error message + msg = _("The upgrade has aborted. Your system " + "could be in an unusable state. A recovery " + "will run now (dpkg --configure -a).") + if not self._partialUpgrade: + if not run_apport(): + msg += _("\n\nPlease report this bug in a browser at " + "http://bugs.launchpad.net/ubuntu/+source/update-manager/+filebug " + "and attach the files in /var/log/dist-upgrade/ " + "to the bug report.\n" + "%s" % e) + self._view.error(_("Could not install the upgrades"), msg) + # installing the packages failed, can't be retried + cmd = ["dpkg","--configure","-a"] + if os.environ.get("DEBIAN_FRONTEND") == "noninteractive": + cmd.append("--force-confold") + self._view.getTerminal().call(cmd) + self._enableAptCronJob() + return False + except IOError, e: + # fetch failed, will be retried + logging.error("IOError in cache.commit(): '%s'. Retrying (currentTry: %s)" % (e,currentRetry)) + currentRetry += 1 + continue + except OSError, e: + logging.exception("cache.commit()") + # deal gracefully with: + # OSError: [Errno 12] Cannot allocate memory + if e.errno == 12: + self._enableAptCronJob() + msg = _("Error during commit") + msg += "\n'%s'\n" % str(e) + msg += _("Restoring original system state") + self._view.error(_("Could not install the upgrades"), msg) + # abort() exits cleanly + self.abort() + # no exception, so all was fine, we are done + self._enableAptCronJob() + return True + + # maximum fetch-retries reached without a successful commit + logging.error("giving up on fetching after maximum retries") + self._view.error(_("Could not download the upgrades"), + _("The upgrade has aborted. Please check your "\ + "Internet connection or "\ + "installation media and try again. "), + "%s" % e) + # abort here because we want our sources.list back + self.abort() + + def doPostUpgrade(self): + # reopen cache + self.openCache() + # run the quirks handler that does does like things adding + # missing groups or similar work arounds, only do it on real + # upgrades + self.quirks.run("PostUpgrade") + # check out what packages are cruft now + # use self.{foreign,obsolete}_pkgs here and see what changed + now_obsolete = self.cache._getObsoletesPkgs() + now_foreign = self.cache._getForeignPkgs(self.origin, self.fromDist, self.toDist) + logging.debug("Obsolete: %s" % " ".join(now_obsolete)) + logging.debug("Foreign: %s" % " ".join(now_foreign)) + # now sanity check - if a base meta package is in the obsolete list now, that means + # that something went wrong (see #335154) badly with the network. this should never happen, but it did happen + # at least once so we add extra paranoia here + for pkg in self.config.getlist("Distro","BaseMetaPkgs"): + if pkg in now_obsolete: + logging.error("the BaseMetaPkg '%s' is in the obsolete list, something is wrong, ignoring the obsoletes" % pkg) + now_obsolete = set() + break + # check if we actually want obsolete removal + if not self.config.getWithDefault("Distro","RemoveObsoletes", True): + logging.debug("Skipping obsolete Removal") + return True + + # now get the meta-pkg specific obsoletes and purges + for pkg in self.config.getlist("Distro","MetaPkgs"): + if self.cache.has_key(pkg) and self.cache[pkg].is_installed: + self.forced_obsoletes.extend(self.config.getlist(pkg,"ForcedObsoletes")) + # now add the obsolete kernels to the forced obsoletes + self.forced_obsoletes.extend(self.cache.identifyObsoleteKernels()) + logging.debug("forced_obsoletes: %s", self.forced_obsoletes) + + # mark packages that are now obsolete (and where not obsolete + # before) to be deleted. make sure to not delete any foreign + # (that is, not from ubuntu) packages + if self.useNetwork: + # we can only do the obsoletes calculation here if we use a + # network. otherwise after rewriting the sources.list everything + # that is not on the CD becomes obsolete (not-downloadable) + remove_candidates = now_obsolete - self.obsolete_pkgs + else: + # initial remove candidates when no network is used should + # be the demotions to make sure we don't leave potential + # unsupported software + remove_candidates = set([p.name for p in self.installed_demotions]) + remove_candidates |= set(self.forced_obsoletes) + + # no go for the unused dependencies + unused_dependencies = self.cache._getUnusedDependencies() + logging.debug("Unused dependencies: %s" %" ".join(unused_dependencies)) + remove_candidates |= set(unused_dependencies) + + # see if we actually have to do anything here + if not self.config.getWithDefault("Distro","RemoveObsoletes", True): + logging.debug("Skipping RemoveObsoletes as stated in the config") + remove_candidates = set() + logging.debug("remove_candidates: '%s'" % remove_candidates) + logging.debug("Start checking for obsolete pkgs") + progress = self._view.getOpCacheProgress() + for (i, pkgname) in enumerate(remove_candidates): + progress.update((i/float(len(remove_candidates)))*100.0) + if pkgname not in self.foreign_pkgs: + self._view.processEvents() + if not self.cache.tryMarkObsoleteForRemoval(pkgname, remove_candidates, self.foreign_pkgs): + logging.debug("'%s' scheduled for remove but not safe to remove, skipping", pkgname) + logging.debug("Finish checking for obsolete pkgs") + progress.done() + + # get changes + changes = self.cache.get_changes() + logging.debug("The following packages are marked for removal: %s" % " ".join([pkg.name for pkg in changes])) + summary = _("Remove obsolete packages?") + actions = [_("_Keep"), _("_Remove")] + # FIXME Add an explanation about what obsolete packages are + #explanation = _("") + if (len(changes) > 0 and + self._view.confirmChanges(summary, changes, [], 0, actions, False)): + fprogress = self._view.getFetchProgress() + iprogress = self._view.getInstallProgress(self.cache) + try: + self.cache.commit(fprogress,iprogress) + except (SystemError, IOError), e: + logging.error("cache.commit() in doPostUpgrade() failed: %s" % e) + self._view.error(_("Error during commit"), + _("A problem occurred during the clean-up. " + "Please see the below message for more " + "information. "), + "%s" % e) + # run stuff after cleanup + self.quirks.run("PostCleanup") + # run the post upgrade scripts that can do fixup like xorg.conf + # fixes etc - only do on real upgrades + if not self._partialUpgrade: + self.runPostInstallScripts() + return True + + def runPostInstallScripts(self): + """ + scripts that are run in any case after the distupgrade finished + whether or not it was successful + """ + # now run the post-upgrade fixup scripts (if any) + for script in self.config.getlist("Distro","PostInstallScripts"): + if not os.path.exists(script): + logging.warning("PostInstallScript: '%s' not found" % script) + continue + logging.debug("Running PostInstallScript: '%s'" % script) + try: + # work around kde tmpfile problem where it eats permissions + check_and_fix_xbit(script) + self._view.getTerminal().call([script], hidden=True) + except Exception, e: + logging.error("got error from PostInstallScript %s (%s)" % (script, e)) + + def abort(self): + """ abort the upgrade, cleanup (as much as possible) """ + logging.debug("abort called") + if hasattr(self, "sources"): + self.sources.restore_backup(self.sources_backup_ext) + if hasattr(self, "aptcdrom"): + self.aptcdrom.restoreBackup(self.sources_backup_ext) + # generate a new cache + self._view.updateStatus(_("Restoring original system state")) + self._view.abort() + self.openCache() + sys.exit(1) + + def _checkDep(self, depstr): + " check if a given depends can be satisfied " + for or_group in apt_pkg.ParseDepends(depstr): + logging.debug("checking: '%s' " % or_group) + for dep in or_group: + depname = dep[0] + ver = dep[1] + oper = dep[2] + if not self.cache.has_key(depname): + logging.error("_checkDep: '%s' not in cache" % depname) + return False + inst = self.cache[depname] + instver = inst.installedVersion + if (instver != None and + apt_pkg.CheckDep(instver,oper,ver) == True): + return True + logging.error("depends '%s' is not satisfied" % depstr) + return False + + def checkViewDepends(self): + " check if depends are satisfied " + logging.debug("checkViewDepends()") + res = True + # now check if anything from $foo-updates is required + depends = self.config.getlist("View","Depends") + depends.extend(self.config.getlist(self._view.__class__.__name__, + "Depends")) + for dep in depends: + logging.debug("depends: '%s'", dep) + res &= self._checkDep(dep) + if not res: + # FIXME: instead of error out, fetch and install it + # here + self._view.error(_("Required depends is not installed"), + _("The required dependency '%s' is not " + "installed. " % dep)) + sys.exit(1) + return res + + def _verifyBackports(self): + # run update (but ignore errors in case the countrymirror + # substitution goes wrong, real errors will be caught later + # when the cache is searched for the backport packages) + backportslist = self.config.getlist("PreRequists","Packages") + i=0 + noCache = apt_pkg.Config.find("Acquire::http::No-Cache","false") + maxRetries = self.config.getint("Network","MaxRetries") + while i < maxRetries: + self.doUpdate(showErrors=False) + self.openCache() + for pkgname in backportslist: + if not self.cache.has_key(pkgname): + logging.error("Can not find backport '%s'" % pkgname) + raise NoBackportsFoundException, pkgname + if self._allBackportsAuthenticated(backportslist): + break + # FIXME: move this to some more generic place + logging.debug("setting a cache control header to turn off caching temporarily") + apt_pkg.Config.set("Acquire::http::No-Cache","true") + i += 1 + if i == maxRetries: + logging.error("pre-requists item is NOT trusted, giving up") + return False + apt_pkg.Config.set("Acquire::http::No-Cache",noCache) + return True + + def _allBackportsAuthenticated(self, backportslist): + # check if the user overwrote the check + if apt_pkg.Config.find_b("APT::Get::AllowUnauthenticated",False) == True: + logging.warning("skip authentication check because of APT::Get::AllowUnauthenticated==true") + return True + try: + b = self.config.getboolean("Distro","AllowUnauthenticated") + if b: + return True + except ConfigParser.NoOptionError: + pass + for pkgname in backportslist: + pkg = self.cache[pkgname] + if not pkg.candidate: + return False + for cand in pkg.candidate.origins: + if cand.trusted: + break + else: + return False + return True + + def isMirror(self, uri): + """ check if uri is a known mirror """ + # deal with username:password in a netloc + raw_uri = uri.rstrip("/") + scheme, netloc, path, query, fragment = urlsplit(raw_uri) + if "@" in netloc: + netloc = netloc.split("@")[1] + # construct new mirror url without the username/pw + uri = "%s://%s%s" % (scheme, netloc, path) + for mirror in self.valid_mirrors: + mirror = mirror.rstrip("/") + if is_mirror(mirror, uri): + return True + # deal with mirrors like + # deb http://localhost:9977/security.ubuntu.com/ubuntu intrepid-security main restricted + # both apt-debtorrent and apt-cacher use this (LP: #365537) + mirror_host_part = mirror.split("//")[1] + if uri.endswith(mirror_host_part): + logging.debug("found apt-cacher/apt-torrent style uri %s" % uri) + return True + return False + + def isThirdPartyMirror(self, uri): + " check if uri is a whitelisted third-party mirror " + uri = uri.rstrip("/") + for mirror in self.valid_3p_mirrors: + mirror = mirror.rstrip("/") + if is_mirror(mirror, uri): + return True + return False + + def _getPreReqMirrorLines(self, dumb=False): + " get sources.list snippet lines for the current mirror " + lines = "" + sources = SourcesList(matcherPath=".") + for entry in sources.list: + if entry.invalid or entry.disabled: + continue + if (entry.type == "deb" and + entry.disabled == False and + self.isMirror(entry.uri) and + "main" in entry.comps and + "%s-updates" % self.fromDist in entry.dist and + not entry.uri.startswith("http://security.ubuntu.com") and + not entry.uri.startswith("http://archive.ubuntu.com") ): + new_line = "deb %s %s-updates main\n" % (entry.uri, self.fromDist) + if not new_line in lines: + lines += new_line + # FIXME: do we really need "dumb" mode? + #if (dumb and entry.type == "deb" and + # "main" in entry.comps): + # lines += "deb %s %s-proposed main\n" % (entry.uri, self.fromDist) + return lines + + def _addPreRequistsSourcesList(self, template, out, dumb=False): + " add prerequists based on template into the path outfile " + # go over the sources.list and try to find a valid mirror + # that we can use to add the backports dir + logging.debug("writing prerequists sources.list at: '%s' " % out) + outfile = open(out, "w") + mirrorlines = self._getPreReqMirrorLines(dumb) + for line in open(template): + template = Template(line) + outline = template.safe_substitute(mirror=mirrorlines) + outfile.write(outline) + logging.debug("adding '%s' prerequists" % outline) + outfile.close() + return True + + def getRequiredBackports(self): + " download the backports specified in DistUpgrade.cfg " + logging.debug("getRequiredBackports()") + res = True + backportsdir = os.path.join(os.getcwd(),"backports") + if not os.path.exists(backportsdir): + os.mkdir(backportsdir) + backportslist = self.config.getlist("PreRequists","Packages") + + # FIXME: this needs to be ported + # if we have them on the CD we are fine + if self.aptcdrom and not self.useNetwork: + logging.debug("Searching for pre-requists on CDROM") + p = os.path.join(self.aptcdrom.cdrompath, + "dists/stable/main/dist-upgrader/binary-%s/" % apt_pkg.Config.find("APT::Architecture")) + found_pkgs = set() + for deb in glob.glob(p+"*_*.deb"): + logging.debug("found pre-req '%s' to '%s'" % (deb, backportsdir)) + found_pkgs.add(os.path.basename(deb).split("_")[0]) + # now check if we got all backports on the CD + if not set(backportslist).issubset(found_pkgs): + logging.error("Expected backports: '%s' but got '%s'" % (set(backportslist), found_pkgs)) + return False + # now install them + self.cache.releaseLock() + p = subprocess.Popen( + ["/usr/bin/dpkg", "-i", ] + glob.glob(p+"*_*.deb"), + stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + res = None + while res is None: + res = p.poll() + self._view.pulseProgress() + time.sleep(0.02) + self._view.pulseProgress(finished=True) + self.cache.getLock() + logging.info("installing backport debs exit code '%s'" % res) + logging.debug("dpkg output:\n%s" % p.communicate()[0]) + if res != 0: + return False + # and re-start itself when it done + return self.setupRequiredBackports() + + # we support PreRequists/SourcesList-$arch sections here too + # + # logic for mirror finding works list this: + # - use the mirror template from the config, then: [done] + # + # - try to find known mirror (isMirror) and prepend it [done] + # - archive.ubuntu.com is always a fallback at the end [done] + # + # see if we find backports with that + # - if not, try guessing based on URI, Trust and Dist [done] + # in existing sources.list (internal mirror with no + # outside connection maybe) + # + # make sure to remove file on cancel + + # FIXME: use the DistUpgradeFetcherCore logic + # in mirror_from_sources_list() here + # (and factor that code out into a helper) + + conf_option = "SourcesList" + if self.config.has_option("PreRequists",conf_option+"-%s" % self.arch): + conf_option = conf_option + "-%s" % self.arch + prereq_template = self.config.get("PreRequists",conf_option) + if not os.path.exists(prereq_template): + logging.error("sourceslist not found '%s'" % prereq_template) + return False + outpath = os.path.join(apt_pkg.Config.find_dir("Dir::Etc::sourceparts"), prereq_template) + outfile = os.path.join(apt_pkg.Config.find_dir("Dir::Etc::sourceparts"), prereq_template) + self._addPreRequistsSourcesList(prereq_template, outfile) + try: + self._verifyBackports() + except NoBackportsFoundException, e: + self._addPreRequistsSourcesList(prereq_template, outfile, dumb=True) + try: + self._verifyBackports() + except NoBackportsFoundException, e: + logging.warning("no backport for '%s' found" % e) + return False + + # FIXME: sanity check the origin (just for safety) + for pkgname in backportslist: + pkg = self.cache[pkgname] + # look for the right version (backport) + ver = self.cache._depcache.GetCandidateVer(pkg._pkg) + if not ver: + logging.error("No candidate for '%s'" % pkgname) + os.unlink(outpath) + return False + if ver.FileList == None: + logging.error("No ver.FileList for '%s'" % pkgname) + os.unlink(outpath) + return False + logging.debug("marking '%s' for install" % pkgname) + # mark install + pkg.mark_install(auto_inst=False, auto_fix=False) + + # now get it + res = False + try: + res = self.cache.commit(self._view.getFetchProgress(), + self._view.getInstallProgress(self.cache)) + except IOError, e: + logging.error("fetchArchives returned '%s'" % e) + res = False + except SystemError as e: + logging.error("installArchives returned '%s'" % e) + res = False + + if res == False: + logging.warning("_fetchArchives for backports returned False") + + # all backports done, remove the pre-requirests.list file again + try: + os.unlink(outfile) + except Exception as e: + logging.error("failed to unlink pre-requists file: '%s'" % e) + return self.setupRequiredBackports() + + # used by both cdrom/http fetcher + def setupRequiredBackports(self): + # ensure that the new release upgrader uses the latest python-apt + # from the backport path + os.environ["PYTHONPATH"] = "/usr/lib/release-upgrader-python-apt" + # copy log so that it gets not overwritten + logging.shutdown() + shutil.copy("/var/log/dist-upgrade/main.log", + "/var/log/dist-upgrade/main_pre_req.log") + # now exec self again + args = sys.argv + ["--have-prerequists"] + if self.useNetwork: + args.append("--with-network") + else: + args.append("--without-network") + logging.info("restarting upgrader") + #print "restarting upgrader to make use of the backports" + # work around kde being clever and removing the x bit + check_and_fix_xbit(sys.argv[0]) + os.execve(sys.argv[0],args, os.environ) + + # this is the core + def fullUpgrade(self): + # sanity check (check for ubuntu-desktop, brokenCache etc) + self._view.updateStatus(_("Checking package manager")) + self._view.setStep(DistUpgradeView.STEP_PREPARE) + + if not self.prepare(): + logging.error("self.prepared() failed") + self._view.error(_("Preparing the upgrade failed"), + _("Preparing the system for the upgrade " + "failed so a bug reporting process is " + "being started.")) + subprocess.Popen(["apport-bug", "update-manager"]) + sys.exit(1) + + # mvo: commented out for now, see #54234, this needs to be + # refactored to use a arch=any tarball + if (self.config.has_section("PreRequists") and + self.options and + self.options.havePrerequists == False): + logging.debug("need backports") + # get backported packages (if needed) + if not self.getRequiredBackports(): + self._view.error(_("Getting upgrade prerequisites failed"), + _("The system was unable to get the " + "prerequisites for the upgrade. " + "The upgrade will abort now and restore " + "the original system state.\n" + "\n" + "Additionally, a bug reporting process is " + "being started.")) + subprocess.Popen(["apport-bug", "update-manager"]) + self.abort() + + # run a "apt-get update" now, its ok to ignore errors, + # because + # a) we disable any third party sources later + # b) we check if we have valid ubuntu sources later + # after we rewrite the sources.list and do a + # apt-get update there too + # because the (unmodified) sources.list of the user + # may contain bad/unreachable entries we run only + # with a single retry + self.doUpdate(showErrors=False, forceRetries=1) + self.openCache() + + # do pre-upgrade stuff (calc list of obsolete pkgs etc) + if not self.doPostInitialUpdate(): + self.abort() + + # update sources.list + self._view.setStep(DistUpgradeView.STEP_MODIFY_SOURCES) + self._view.updateStatus(_("Updating repository information")) + if not self.updateSourcesList(): + self.abort() + + # add cdrom (if we have one) + if (self.aptcdrom and + not self.aptcdrom.add(self.sources_backup_ext)): + self._view.error(_("Failed to add the cdrom"), + _("Sorry, adding the cdrom was not successful.")) + sys.exit(1) + + # then update the package index files + if not self.doUpdate(): + self.abort() + + # then open the cache (again) + self._view.updateStatus(_("Checking package manager")) + self.openCache() + # re-check server mode because we got new packages (it may happen + # that the system had no sources.list entries and therefore no + # desktop file information) + self.serverMode = self.cache.needServerMode() + # do it here as we neeed to know if we are in server or client mode + self.quirks.ensure_recommends_are_installed_on_desktops() + # now check if we still have some key packages available/downloadable + # after the update - if not something went seriously wrong + # (this happend e.g. during the intrepid->jaunty upgrade for some + # users when de.archive.ubuntu.com was overloaded) + for pkg in self.config.getlist("Distro","BaseMetaPkgs"): + if (not self.cache.has_key(pkg) or + not self.cache.anyVersionDownloadable(self.cache[pkg])): + # FIXME: we could offer to add default source entries here, + # but we need to be careful to not duplicate them + # (i.e. the error here could be something else than + # missing sources entries but network errors etc) + logging.error("No '%s' available/downloadable after sources.list rewrite+update" % pkg) + self._view.error(_("Invalid package information"), + _("After updating your package ", + "information, the essential package '%s' " + "could not be located. This may be " + "because you have no official mirrors " + "listed in your software sources, or " + "because of excessive load on the mirror " + "you are using. See /etc/apt/sources.list " + "for the current list of configured " + "software sources." + "\n" + "In the case of an overloaded mirror, you " + "may want to try the upgrade again later.") + % pkg) + subprocess.Popen(["apport-bug", "update-manager"]) + self.abort() + + # calc the dist-upgrade and see if the removals are ok/expected + # do the dist-upgrade + self._view.updateStatus(_("Calculating the changes")) + if not self.askDistUpgrade(): + self.abort() + + # fetch the stuff + self._view.setStep(DistUpgradeView.STEP_FETCH) + self._view.updateStatus(_("Fetching")) + if not self.doDistUpgradeFetching(): + self.abort() + + # now do the upgrade + self._view.setStep(DistUpgradeView.STEP_INSTALL) + self._view.updateStatus(_("Upgrading")) + if not self.doDistUpgrade(): + # run the post install scripts (for stuff like UUID conversion) + self.runPostInstallScripts() + # don't abort here, because it would restore the sources.list + self._view.information(_("Upgrade complete"), + _("The upgrade has completed but there " + "were errors during the upgrade " + "process.")) + sys.exit(1) + + # do post-upgrade stuff + self._view.setStep(DistUpgradeView.STEP_CLEANUP) + self._view.updateStatus(_("Searching for obsolete software")) + self.doPostUpgrade() + + # comment out cdrom source + if self.aptcdrom: + self.aptcdrom.comment_out_cdrom_entry() + + # done, ask for reboot + self._view.setStep(DistUpgradeView.STEP_REBOOT) + self._view.updateStatus(_("System upgrade is complete.")) + # FIXME should we look into /var/run/reboot-required here? + if (not inside_chroot() and + self._view.confirmRestart()): + subprocess.Popen("/sbin/reboot") + sys.exit(0) + return True + + def run(self): + self._view.processEvents() + return self.fullUpgrade() + + def doPartialUpgrade(self): + " partial upgrade mode, useful for repairing " + from DistUpgrade.DistUpgradeView import STEP_PREPARE, STEP_MODIFY_SOURCES, STEP_FETCH, STEP_INSTALL, STEP_CLEANUP, STEP_REBOOT + self._view.setStep(STEP_PREPARE) + self._view.hideStep(STEP_MODIFY_SOURCES) + self._view.hideStep(STEP_REBOOT) + self._partialUpgrade = True + self.prepare() + if not self.doPostInitialUpdate(): + return False + if not self.askDistUpgrade(): + return False + self._view.setStep(STEP_FETCH) + self._view.updateStatus(_("Fetching")) + if not self.doDistUpgradeFetching(): + return False + self._view.setStep(STEP_INSTALL) + self._view.updateStatus(_("Upgrading")) + if not self.doDistUpgrade(): + self._view.information(_("Upgrade complete"), + _("The upgrade has completed but there " + "were errors during the upgrade " + "process.")) + return False + self._view.setStep(STEP_CLEANUP) + if not self.doPostUpgrade(): + self._view.information(_("Upgrade complete"), + _("The upgrade has completed but there " + "were errors during the upgrade " + "process.")) + return False + + if os.path.exists(REBOOT_REQUIRED_FILE): + # we can not talk to session management here, we run as root + if self._view.confirmRestart(): + subprocess.Popen("/sbin/reboot") + else: + self._view.information(_("Upgrade complete"), + _("The partial upgrade was completed.")) + return True + + +if __name__ == "__main__": + from DistUpgradeViewText import DistUpgradeViewText + logging.basicConfig(level=logging.DEBUG) + v = DistUpgradeViewText() + dc = DistUpgradeController(v) + #dc.openCache() + dc._disableAptCronJob() + dc._enableAptCronJob() + #dc._addRelatimeToFstab() + #dc.prepare() + #dc.askDistUpgrade() + #dc._checkFreeSpace() + #dc._rewriteFstab() + #dc._checkAdminGroup() + #dc._rewriteAptPeriodic(2) diff -Nru update-manager-17.10.11/DistUpgrade/DistUpgradeFetcherCore.py update-manager-0.156.14.15/DistUpgrade/DistUpgradeFetcherCore.py --- update-manager-17.10.11/DistUpgrade/DistUpgradeFetcherCore.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DistUpgradeFetcherCore.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,292 @@ +# DistUpgradeFetcherCore.py +# +# Copyright (c) 2006 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +from string import Template +import os +import apt_pkg +import logging +import tarfile +import tempfile +import shutil +import sys +import GnuPGInterface +from gettext import gettext as _ +from aptsources.sourceslist import SourcesList + +from utils import get_dist, url_downloadable, country_mirror + +class DistUpgradeFetcherCore(object): + " base class (without GUI) for the upgrade fetcher " + + DEFAULT_MIRROR="http://archive.ubuntu.com/ubuntu" + DEFAULT_COMPONENT="main" + DEBUG = "DEBUG_UPDATE_MANAGER" in os.environ + + def __init__(self, new_dist, progress): + self.new_dist = new_dist + self.current_dist_name = get_dist() + self._progress = progress + # options to pass to the release upgrader when it is run + self.run_options = [] + + def _debug(self, msg): + " helper to show debug information " + if self.DEBUG: + sys.stderr.write(msg+"\n") + + def showReleaseNotes(self): + return True + + def error(self, summary, message): + """ dummy implementation for error display, should be overwriten + by subclasses that want to more fancy method + """ + print summary + print message + return False + + def authenticate(self): + if self.new_dist.upgradeToolSig: + f = self.tmpdir+"/"+os.path.basename(self.new_dist.upgradeTool) + sig = self.tmpdir+"/"+os.path.basename(self.new_dist.upgradeToolSig) + print _("authenticate '%(file)s' against '%(signature)s' ") % { + 'file' : os.path.basename(f), + 'signature' : os.path.basename(sig)} + if self.gpgauthenticate(f, sig): + return True + return False + + def gpgauthenticate(self, file, signature, + keyring='/etc/apt/trusted.gpg'): + """ authenticated a file against a given signature, if no keyring + is given use the apt default keyring + """ + gpg = GnuPGInterface.GnuPG() + gpg.options.extra_args = ['--no-options', + '--homedir',self.tmpdir, + '--no-default-keyring', + '--ignore-time-conflict', + '--keyring', keyring] + proc = gpg.run(['--verify', signature, file], + create_fhs=['status','logger','stderr']) + gpgres = proc.handles['status'].read() + try: + proc.wait() + except IOError,e: + # gnupg returned a problem (non-zero exit) + print "exception from gpg: %s" % e + print "Debug information: " + print proc.handles['status'].read() + print proc.handles['stderr'].read() + print proc.handles['logger'].read() + return False + if "VALIDSIG" in gpgres: + return True + print "invalid result from gpg:" + print gpgres + return False + + def extractDistUpgrader(self): + # extract the tarbal + fname = os.path.join(self.tmpdir,os.path.basename(self.uri)) + print _("extracting '%s'") % os.path.basename(fname) + if not os.path.exists(fname): + return False + try: + tar = tarfile.open(self.tmpdir+"/"+os.path.basename(self.uri),"r") + for tarinfo in tar: + tar.extract(tarinfo) + tar.close() + except tarfile.ReadError, e: + logging.error("failed to open tarfile (%s)" % e) + return False + return True + + def verifyDistUprader(self): + # FIXME: check a internal dependency file to make sure + # that the script will run correctly + + # see if we have a script file that we can run + self.script = script = "%s/%s" % (self.tmpdir, self.new_dist.name) + if not os.path.exists(script): + return self.error(_("Could not run the upgrade tool"), + _("Could not run the upgrade tool") + ". " + _("This is most likely a bug in the upgrade tool. " + "Please report it as a bug using the command 'ubuntu-bug update-manager'.")) + return True + + def mirror_from_sources_list(self, uri, default_uri): + """ + try to figure what the mirror is from current sources.list + + do this by looing for matching DEFAULT_COMPONENT, current dist + in sources.list and then doing a http HEAD/ftp size request + to see if the uri is available on this server + """ + self._debug("mirror_from_sources_list: %s" % self.current_dist_name) + sources = SourcesList(withMatcher=False) + seen = set() + for e in sources.list: + if e.disabled or e.invalid or not e.type == "deb": + continue + # check if we probed this mirror already + if e.uri in seen: + continue + # we are using the main mirror already, so we are fine + if (e.uri.startswith(default_uri) and + e.dist == self.current_dist_name and + self.DEFAULT_COMPONENT in e.comps): + return uri + elif (e.dist == self.current_dist_name and + "main" in e.comps): + mirror_uri = e.uri+uri[len(default_uri):] + if url_downloadable(mirror_uri, self._debug): + return mirror_uri + seen.add(e.uri) + self._debug("no mirror found") + return "" + + def _expandUri(self, uri): + """ + expand the uri so that it uses a mirror if the url starts + with a well know string (like archive.ubuntu.com) + """ + # try to guess the mirror from the sources.list + if uri.startswith(self.DEFAULT_MIRROR): + self._debug("trying to find suitable mirror") + new_uri = self.mirror_from_sources_list(uri, self.DEFAULT_MIRROR) + if new_uri: + return new_uri + # if that fails, use old method + uri_template = Template(uri) + m = country_mirror() + new_uri = uri_template.safe_substitute(countrymirror=m) + # be paranoid and check if the given uri is really downloadable + try: + if not url_downloadable(new_uri, self._debug): + raise Exception("failed to download %s" % new_uri) + except Exception,e: + self._debug("url '%s' could not be downloaded" % e) + # else fallback to main server + new_uri = uri_template.safe_substitute(countrymirror='') + return new_uri + + def fetchDistUpgrader(self): + " download the tarball with the upgrade script " + self.tmpdir = tmpdir = tempfile.mkdtemp(prefix="update-manager-") + os.chdir(tmpdir) + logging.debug("using tmpdir: '%s'" % tmpdir) + # turn debugging on here (if required) + if self.DEBUG > 0: + apt_pkg.Config.Set("Debug::Acquire::http","1") + apt_pkg.Config.Set("Debug::Acquire::ftp","1") + #os.listdir(tmpdir) + fetcher = apt_pkg.Acquire(self._progress) + if self.new_dist.upgradeToolSig != None: + uri = self._expandUri(self.new_dist.upgradeToolSig) + af1 = apt_pkg.AcquireFile(fetcher, + uri, + descr=_("Upgrade tool signature")) + # reference it here to shut pyflakes up + af1 + if self.new_dist.upgradeTool != None: + self.uri = self._expandUri(self.new_dist.upgradeTool) + af2 = apt_pkg.AcquireFile(fetcher, + self.uri, + descr=_("Upgrade tool")) + # reference it here to shut pyflakes up + af2 + result = fetcher.run() + if result != fetcher.RESULT_CONTINUE: + logging.warn("fetch result != continue (%s)" % result) + return False + # check that both files are really there and non-null + for f in [os.path.basename(self.new_dist.upgradeToolSig), + os.path.basename(self.new_dist.upgradeTool)]: + if not (os.path.exists(f) and os.path.getsize(f) > 0): + logging.warn("file '%s' missing" % f) + return False + return True + return False + + def runDistUpgrader(self): + args = [self.script]+self.run_options + if os.getuid() != 0: + os.execv("/usr/bin/sudo",["sudo"]+args) + else: + os.execv(self.script,args) + + def cleanup(self): + # cleanup + os.chdir("..") + # del tmpdir + shutil.rmtree(self.tmpdir) + + def run(self): + # see if we have release notes + if not self.showReleaseNotes(): + return + if not self.fetchDistUpgrader(): + self.error(_("Failed to fetch"), + _("Fetching the upgrade failed. There may be a network " + "problem. ")) + return + if not self.authenticate(): + self.error(_("Authentication failed"), + _("Authenticating the upgrade failed. There may be a problem " + "with the network or with the server. ")) + self.cleanup() + return + if not self.extractDistUpgrader(): + self.error(_("Failed to extract"), + _("Extracting the upgrade failed. There may be a problem " + "with the network or with the server. ")) + + return + if not self.verifyDistUprader(): + self.error(_("Verification failed"), + _("Verifying the upgrade failed. There may be a problem " + "with the network or with the server. ")) + self.cleanup() + return + try: + # check if we can execute, if we run it via sudo we will + # not know otherwise, sudo/gksu will not raise a exception + if not os.access(self.script, os.X_OK): + ex = OSError("Can not execute '%s'" % self.script) + ex.errno = 13 + raise ex + self.runDistUpgrader() + except OSError, e: + if e.errno == 13: + self.error(_("Can not run the upgrade"), + _("This usually is caused by a system where /tmp " + "is mounted noexec. Please remount without " + "noexec and run the upgrade again.")) + return False + else: + self.error(_("Can not run the upgrade"), + _("The error message is '%s'.") % e.strerror) + return True + +if __name__ == "__main__": + d = DistUpgradeFetcherCore(None,None) +# print d.authenticate('/tmp/Release','/tmp/Release.gpg') + print "got mirror: '%s'" % d.mirror_from_sources_list("http://archive.ubuntu.com/ubuntu/dists/intrepid-proposed/main/dist-upgrader-all/0.93.34/intrepid.tar.gz", "http://archive.ubuntu.com/ubuntu") diff -Nru update-manager-17.10.11/DistUpgrade/DistUpgradeFetcherSelf.py update-manager-0.156.14.15/DistUpgrade/DistUpgradeFetcherSelf.py --- update-manager-17.10.11/DistUpgrade/DistUpgradeFetcherSelf.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DistUpgradeFetcherSelf.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,30 @@ +import logging +import shutil + +from DistUpgradeFetcherCore import DistUpgradeFetcherCore + +class DistUpgradeFetcherSelf(DistUpgradeFetcherCore): + def __init__(self, new_dist, progress, options, view): + DistUpgradeFetcherCore.__init__(self,new_dist,progress) + self.view = view + # user chose to use the network, otherwise it would not be + # possible to download self + self.run_options += ["--with-network"] + # make sure to run self with proper options + if options.cdromPath is not None: + self.run_options += ["--cdrom=%s" % options.cdromPath] + if options.frontend is not None: + self.run_options += ["--frontend=%s" % options.frontend] + + def error(self, summary, message): + return self.view.error(summary, message) + + def runDistUpgrader(self): + " overwrite to ensure that the log is copied " + # copy log so it isn't overwritten + logging.info("runDistUpgrader() called, re-exec self") + logging.shutdown() + shutil.copy("/var/log/dist-upgrade/main.log", + "/var/log/dist-upgrade/main_update_self.log") + # re-exec self + DistUpgradeFetcherCore.runDistUpgrader(self) diff -Nru update-manager-17.10.11/DistUpgrade/DistUpgradeGettext.py update-manager-0.156.14.15/DistUpgrade/DistUpgradeGettext.py --- update-manager-17.10.11/DistUpgrade/DistUpgradeGettext.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DistUpgradeGettext.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,59 @@ +# DistUpgradeGettext.py - safe wrapper around gettext +# +# Copyright (c) 2008 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import logging +import gettext as mygettext + +def _verify(message, translated): + """ + helper that verifies that the message and the translated + message have the same number (and type) of % args + """ + arguments_in_message = message.count("%") - message.count("\%") + arguments_in_translation = translated.count("%") - translated.count("\%") + return arguments_in_message == arguments_in_translation + +def gettext(message): + """ + version of gettext that logs errors but does not crash on incorrect + number of arguments + """ + if message == "": + return "" + translated_msg = mygettext.gettext(message) + if not _verify(message, translated_msg): + logging.error("incorrect translation for message '%s' to '%s' (wrong number of arguments)" % (message, translated_msg)) + return message + return translated_msg + +def ngettext(msgid1, msgid2, n): + """ + version of ngettext that logs errors but does not crash on incorrect + number of arguments + """ + translated_msg = mygettext.ngettext(msgid1, msgid2, n) + if not _verify(msgid1, translated_msg): + logging.error("incorrect translation for ngettext message '%s' plural: '%s' to '%s' (wrong number of arguments)" % (msgid1, msgid2, translated_msg)) + # dumb fallback to not crash + if n == 1: + return msgid1 + return msgid2 + return translated_msg diff -Nru update-manager-17.10.11/DistUpgrade/DistUpgradeMain.py update-manager-0.156.14.15/DistUpgrade/DistUpgradeMain.py --- update-manager-17.10.11/DistUpgrade/DistUpgradeMain.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DistUpgradeMain.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,229 @@ +# DistUpgradeMain.py +# +# Copyright (c) 2004-2008 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import warnings +warnings.filterwarnings("ignore", "Accessed deprecated", DeprecationWarning) + +import apt +import atexit +import glob +import logging +import os +import shutil +import subprocess +import sys + +from datetime import datetime +from optparse import OptionParser +from gettext import gettext as _ + +# dirs that the packages will touch, this is needed for AUFS/overlayfs +# and also for the sanity check before the upgrade +SYSTEM_DIRS = ["/bin", + "/boot", + "/etc", + "/initrd", + "/lib", + "/lib32", # ??? + "/lib64", # ??? + "/sbin", + "/usr", + "/var", + ] + + + +from DistUpgradeController import DistUpgradeController +from DistUpgradeConfigParser import DistUpgradeConfig + + +def do_commandline(): + " setup option parser and parse the commandline " + parser = OptionParser() + parser.add_option("-s", "--sandbox", dest="useAufs", default=False, + action="store_true", + help=_("Sandbox upgrade using aufs")) + parser.add_option("-c", "--cdrom", dest="cdromPath", default=None, + help=_("Use the given path to search for a cdrom with upgradable packages")) + parser.add_option("--have-prerequists", dest="havePrerequists", + action="store_true", default=False) + parser.add_option("--with-network", dest="withNetwork",action="store_true") + parser.add_option("--without-network", dest="withNetwork",action="store_false") + parser.add_option("--frontend", dest="frontend",default=None, + help=_("Use frontend. Currently available: \n"\ + "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE")) + parser.add_option("--mode", dest="mode",default="desktop", + help=_("*DEPRECATED* this option will be ignored")) + parser.add_option("--partial", dest="partial", default=False, + action="store_true", + help=_("Perform a partial upgrade only (no sources.list rewriting)")) + parser.add_option("--disable-gnu-screen", action="store_true", + default=False, + help=_("Disable GNU screen support")) + parser.add_option("--datadir", dest="datadir", default=None, + help=_("Set datadir")) + return parser.parse_args() + +def setup_logging(options, config): + " setup the logging " + logdir = config.getWithDefault("Files","LogDir","/var/log/dist-upgrade/") + if not os.path.exists(logdir): + os.mkdir(logdir) + # check if logs exists and move logs into place + if glob.glob(logdir+"/*.log"): + now = datetime.now() + backup_dir = logdir+"/%04i%02i%02i-%02i%02i" % (now.year,now.month,now.day,now.hour,now.minute) + if not os.path.exists(backup_dir): + os.mkdir(backup_dir) + for f in glob.glob(logdir+"/*.log"): + shutil.move(f, os.path.join(backup_dir,os.path.basename(f))) + fname = os.path.join(logdir,"main.log") + # do not overwrite the default main.log + if options.partial: + fname += ".partial" + with open(fname, "a"): + pass + logging.basicConfig(level=logging.DEBUG, + filename=fname, + format='%(asctime)s %(levelname)s %(message)s', + filemode='w') + # log what config files are in use here to detect user + # changes + logging.info("Using config files '%s'" % config.config_files) + logging.info("uname information: '%s'" % " ".join(os.uname())) + logging.info("apt version: '%s'" % apt.apt_pkg.VERSION) + return logdir + +def save_system_state(logdir): + # save package state to be able to re-create failures + try: + from apt_clone import AptClone + except ImportError: + logging.error("failed to import AptClone") + return + target = os.path.join(logdir, "apt-clone_system_state.tar.gz") + logging.debug("creating statefile: '%s'" % target) + # this file may contain sensitive data so ensure we create with the + # right umask + old_umask = os.umask(0066) + clone = AptClone() + clone.save_state(sourcedir="/", target=target, with_dpkg_status=True, + scrub_sources=True) + # reset umask + os.umask(old_umask) + # lspci output + try: + s=subprocess.Popen(["lspci","-nn"], stdout=subprocess.PIPE).communicate()[0] + open(os.path.join(logdir, "lspci.txt"), "w").write(s) + except OSError, e: + logging.debug("lspci failed: %s" % e) + +def setup_view(options, config, logdir): + " setup view based on the config and commandline " + + # the commandline overwrites the configfile + for requested_view in [options.frontend]+config.getlist("View","View"): + if not requested_view: + continue + try: + view_modul = __import__(requested_view) + view_class = getattr(view_modul, requested_view) + instance = view_class(logdir=logdir) + break + except Exception, e: + logging.warning("can't import view '%s' (%s)" % (requested_view,e)) + print "can't load %s (%s)" % (requested_view, e) + else: + logging.error("No view can be imported, aborting") + print "No view can be imported, aborting" + sys.exit(1) + return instance + +def run_new_gnu_screen_window_or_reattach(): + """ check if there is a upgrade already running inside gnu screen, + if so, reattach + if not, create new screen window + """ + SCREENNAME = "ubuntu-release-upgrade-screen-window" + # get the active screen sockets + try: + out = subprocess.Popen( + ["screen","-ls"], stdout=subprocess.PIPE).communicate()[0] + logging.debug("screen returned: '%s'" % out) + except OSError: + logging.info("screen could not be run") + return + # check if a release upgrade is among them + if SCREENNAME in out: + logging.info("found active screen session, re-attaching") + # if we have it, attach to it + os.execv("/usr/bin/screen", ["screen", "-d", "-r", "-p", SCREENNAME]) + # otherwise re-exec inside screen with (-L) for logging enabled + os.environ["RELEASE_UPGRADER_NO_SCREEN"]="1" + # unset escape key to avoid confusing people who are not used to + # screen. people who already run screen will not be affected by this + # unset escape key with -e, enable log with -L, set name with -S + cmd = ["screen", + "-e", "\\0\\0", + "-L", + "-c", "screenrc", + "-S", SCREENNAME]+sys.argv + logging.info("re-exec inside screen: '%s'" % cmd) + os.execv("/usr/bin/screen", cmd) + + +def main(): + """ main method """ + + # commandline setup and config + (options, args) = do_commandline() + config = DistUpgradeConfig(".") + logdir = setup_logging(options, config) + + from DistUpgradeVersion import VERSION + logging.info("release-upgrader version '%s' started" % VERSION) + + # create view and app objects + view = setup_view(options, config, logdir) + + # gnu screen support + if (view.needs_screen and + not "RELEASE_UPGRADER_NO_SCREEN" in os.environ and + not options.disable_gnu_screen): + run_new_gnu_screen_window_or_reattach() + + app = DistUpgradeController(view, options, datadir=options.datadir) + atexit.register(app._enableAptCronJob) + + # partial upgrade only + if options.partial: + if not app.doPartialUpgrade(): + sys.exit(1) + sys.exit(0) + + # save system state (only if not doing just a partial upgrade) + save_system_state(logdir) + + # full upgrade, return error code for success/failure + if app.run(): + return 0 + return 1 + diff -Nru update-manager-17.10.11/DistUpgrade/DistUpgradePatcher.py update-manager-0.156.14.15/DistUpgrade/DistUpgradePatcher.py --- update-manager-17.10.11/DistUpgrade/DistUpgradePatcher.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DistUpgradePatcher.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,106 @@ +# DistUpgradeEdPatcher.py +# +# Copyright (c) 2011 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import hashlib +import re +import string + + +class PatchError(Exception): + """ Error during the patch process """ + pass + +def patch(orig, edpatch, result_md5sum=None): + """ python implementation of enough "ed" to apply ed-style + patches. Note that this patches in memory so its *not* + suitable for big files + """ + + # we only have two states, waiting for command or reading data + (STATE_EXPECT_COMMAND, + STATE_EXPECT_DATA) = range(2) + + # this is inefficient for big files + orig_lines = open(orig).readlines() + start = end = 0 + + # we start in wait-for-commend state + state = STATE_EXPECT_COMMAND + for line in open(edpatch): + if state == STATE_EXPECT_COMMAND: + # in commands get rid of whitespace, + line = line.strip() + # check if we have a substitute command + if line.startswith("s/"): + # strip away the "s/" + line = line[2:] + # chop off the flags at the end + subs, flags = string.rsplit(line, sep="/", maxsplit=1) + if flags: + raise PatchError("flags for s// not supported yet") + # get the actual substitution regexp and replacement and + # execute it + regexp, sep, repl = subs.partition("/") + new, count = re.subn(regexp, repl, orig_lines[start], count=1) + orig_lines[start] = new + continue + # otherwise the last char is the command + command = line[-1] + # read address + (start_str, sep, end_str) = line[:-1].partition(",") + # ed starts with 1 while python with 0 + start = int(start_str) + start -= 1 + # if we don't have end, set it to the next line + if end_str is "": + end = start+1 + else: + end = int(end_str) + # interpret command + if command == "c": + del orig_lines[start:end] + state = STATE_EXPECT_DATA + start -= 1 + elif command == "a": + # not allowed to have a range in append + state = STATE_EXPECT_DATA + elif command == "d": + del orig_lines[start:end] + else: + raise PatchError("unknown command: '%s'" % line) + elif state == STATE_EXPECT_DATA: + # this is the data end marker + if line == ".\n": + state = STATE_EXPECT_COMMAND + else: + # copy line verbatim and increase position + start += 1 + orig_lines.insert(start, line) + + # done with the patching, (optional) verify and write result + result = "".join(orig_lines) + if result_md5sum: + md5 = hashlib.md5() + md5.update(result) + if md5.hexdigest() != result_md5sum: + raise PatchError("the md5sum after patching is not correct") + open(orig, "w").write(result) + return True diff -Nru update-manager-17.10.11/DistUpgrade/dist-upgrade.py update-manager-0.156.14.15/DistUpgrade/dist-upgrade.py --- update-manager-17.10.11/DistUpgrade/dist-upgrade.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/dist-upgrade.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,7 @@ +#!/usr/bin/python + +from DistUpgradeMain import main +import sys + +if __name__ == "__main__": + sys.exit(main()) diff -Nru update-manager-17.10.11/DistUpgrade/DistUpgradeQuirks.py update-manager-0.156.14.15/DistUpgrade/DistUpgradeQuirks.py --- update-manager-17.10.11/DistUpgrade/DistUpgradeQuirks.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DistUpgradeQuirks.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,1262 @@ +# DistUpgradeQuirks.py +# +# Copyright (c) 2004-2010 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import apt +import atexit +import glob +import logging +import os +import os.path +import re +import hashlib +import shutil +import string +import sys +import subprocess +from subprocess import PIPE, Popen +from hashlib import md5 +from utils import lsmod, get_arch + +from DistUpgradeGettext import gettext as _ +from computerjanitor.plugin import PluginManager + +class DistUpgradeQuirks(object): + """ + This class collects the various quirks handlers that can + be hooked into to fix/work around issues that the individual + releases have + """ + + def __init__(self, controller, config): + self.controller = controller + self._view = controller._view + self.config = config + self.uname = Popen(["uname","-r"],stdout=PIPE).communicate()[0].strip() + self.arch = get_arch() + self.plugin_manager = PluginManager(self.controller, ["./plugins"]) + + # the quirk function have the name: + # $Name (e.g. PostUpgrade) + # $todist$Name (e.g. intrepidPostUpgrade) + # $from_$fromdist$Name (e.g. from_dapperPostUpgrade) + def run(self, quirksName): + """ + Run the specific quirks handler, the follow handlers are supported: + - PreCacheOpen: run *before* the apt cache is opened the first time + to set options that affect the cache + - PostInitialUpdate: run *before* the sources.list is rewritten but + after a initial apt-get update + - PostDistUpgradeCache: run *after* the dist-upgrade was calculated + in the cache + - StartUpgrade: before the first package gets installed (but the + download is finished) + - PostUpgrade: run *after* the upgrade is finished successfully and + packages got installed + - PostCleanup: run *after* the cleanup (orphaned etc) is finished + """ + # we do not run any quirks in partialUpgrade mode + if self.controller._partialUpgrade: + logging.info("not running quirks in partialUpgrade mode") + return + # first check for matching plugins + for condition in [ + quirksName, + "%s%s" % (self.config.get("Sources","To"), quirksName), + "from_%s%s" % (self.config.get("Sources","From"), quirksName) + ]: + for plugin in self.plugin_manager.get_plugins(condition): + logging.debug("running quirks plugin %s" % plugin) + plugin.do_cleanup_cruft() + + # run the handler that is common to all dists + funcname = "%s" % quirksName + func = getattr(self, funcname, None) + if func is not None: + logging.debug("quirks: running %s" % funcname) + func() + + # run the quirksHandler to-dist + funcname = "%s%s" % (self.config.get("Sources","To"), quirksName) + func = getattr(self, funcname, None) + if func is not None: + logging.debug("quirks: running %s" % funcname) + func() + + # now run the quirksHandler from_${FROM-DIST}Quirks + funcname = "from_%s%s" % (self.config.get("Sources","From"), quirksName) + func = getattr(self, funcname, None) + if func is not None: + logging.debug("quirks: running %s" % funcname) + func() + + # individual quirks handler that run *before* the cache is opened + def PreCacheOpen(self): + """ run before the apt cache is opened the first time """ + logging.debug("running Quirks.PreCacheOpen") + + def oneiricPreCacheOpen(self): + logging.debug("running Quirks.oneiricPreCacheOpen") + # enable i386 multiach temporarely during the upgrade if on amd64 + # this needs to be done very early as libapt caches the result + # of the "getArchitectures()" call in aptconfig and its not possible + # currently to invalidate this cache + if apt.apt_pkg.config.find("Apt::Architecture") == "amd64": + logging.debug("multiarch: enabling i386 as a additional architecture") + apt.apt_pkg.config.set("Apt::Architectures::", "i386") + # increase case size to workaround bug in natty apt that + # may cause segfault on cache grow + apt.apt_pkg.config.set("APT::Cache-Start", str(48*1024*1024)) + + + # individual quirks handler when the dpkg run is finished --------- + def PostCleanup(self): + " run after cleanup " + logging.debug("running Quirks.PostCleanup") + + def from_dapperPostUpgrade(self): + " this works around quirks for dapper->hardy upgrades " + logging.debug("running Controller.from_dapperQuirks handler") + self._rewriteFstab() + self._checkAdminGroup() + + def intrepidPostUpgrade(self): + " this applies rules for the hardy->intrepid upgrade " + logging.debug("running Controller.intrepidQuirks handler") + self._addRelatimeToFstab() + + def gutsyPostUpgrade(self): + """ this function works around quirks in the feisty->gutsy upgrade """ + logging.debug("running Controller.gutsyQuirks handler") + + def feistyPostUpgrade(self): + """ this function works around quirks in the edgy->feisty upgrade """ + logging.debug("running Controller.feistyQuirks handler") + self._rewriteFstab() + self._checkAdminGroup() + + def karmicPostUpgrade(self): + """ this function works around quirks in the jaunty->karmic upgrade """ + logging.debug("running Controller.karmicPostUpgrade handler") + self._ntfsFstabFixup() + self._checkLanguageSupport() + + # quirks when run when the initial apt-get update was run ---------------- + def from_lucidPostInitialUpdate(self): + """ Quirks that are run before the sources.list is updated to the + new distribution when upgrading from a lucid system (either + to maverick or the new LTS) + """ + logging.debug("running %s" % sys._getframe().f_code.co_name) + # systems < i686 will not upgrade + self._test_and_fail_on_non_i686() + self._test_and_warn_on_i8xx() + + def oneiricPostInitialUpdate(self): + self._test_and_warn_on_i8xx() + + def lucidPostInitialUpdate(self): + """ quirks that are run before the sources.list is updated to lucid """ + logging.debug("running %s" % sys._getframe().f_code.co_name) + # upgrades on systems with < arvm6 CPUs will break + self._test_and_fail_on_non_arm_v6() + # vserver+upstart are problematic + self._test_and_warn_if_vserver() + # fglrx dropped support for some cards + self._test_and_warn_on_dropped_fglrx_support() + + # quirks when the cache upgrade calculation is finished ------------------- + def from_dapperPostDistUpgradeCache(self): + self.hardyPostDistUpgradeCache() + self.gutsyPostDistUpgradeCache() + self.feistyPostDistUpgradeCache() + self.edgyPostDistUpgradeCache() + + def from_hardyPostDistUpgradeCache(self): + """ this function works around quirks in upgrades from hardy """ + logging.debug("running %s" % sys._getframe().f_code.co_name) + # ensure 386 -> generic transition happens + self._kernel386TransitionCheck() + # ensure kubuntu-kde4-desktop transition + self._kubuntuDesktopTransition() + # evms got removed after hardy, warn and abort + if self._usesEvmsInMounts(): + logging.error("evms in use in /etc/fstab") + self._view.error(_("evms in use"), + _("Your system uses the 'evms' volume manager " + "in /proc/mounts. " + "The 'evms' software is no longer supported, " + "please switch it off and run the upgrade " + "again when this is done.")) + self.controller.abort() + # check if "wl" module is loaded and if so, install bcmwl-kernel-source + self._checkAndInstallBroadcom() + # langpacks got re-organized in 9.10 + self._dealWithLanguageSupportTransition() + # nvidia-71, nvidia-96 got dropped + self._test_and_warn_on_old_nvidia() + # new nvidia needs a CPU with sse support + self._test_and_warn_on_nvidia_and_no_sse() + + def nattyPostDistUpgradeCache(self): + """ + this function works around quirks in the + maverick -> natty cache upgrade calculation + """ + self._add_kdegames_card_extra_if_installed() + + def maverickPostDistUpgradeCache(self): + """ + this function works around quirks in the + lucid->maverick upgrade calculation + """ + self._add_extras_repository() + self._gutenprint_fixup() + + def karmicPostDistUpgradeCache(self): + """ + this function works around quirks in the + jaunty->karmic upgrade calculation + """ + # check if "wl" module is loaded and if so, install + # bcmwl-kernel-source (this is needed for lts->lts as well) + self._checkAndInstallBroadcom() + self._dealWithLanguageSupportTransition() + self._kernel386TransitionCheck() + self._mysqlClusterCheck() + + def jauntyPostDistUpgradeCache(self): + """ + this function works around quirks in the + intrepid->jaunty upgrade calculation + """ + logging.debug("running %s" % sys._getframe().f_code.co_name) + # bug 332328 - make sure pidgin-libnotify is upgraded + for pkg in ["pidgin-libnotify"]: + if (self.controller.cache.has_key(pkg) and + self.controller.cache[pkg].is_installed and + not self.controller.cache[pkg].marked_upgrade): + logging.debug("forcing '%s' upgrade" % pkg) + self.controller.cache[pkg].mark_upgrade() + # deal with kipi/gwenview/kphotoalbum + for pkg in ["gwenview","digikam"]: + if (self.controller.cache.has_key(pkg) and + self.controller.cache[pkg].is_installed and + not self.controller.cache[pkg].marked_upgrade): + logging.debug("forcing libkipi '%s' upgrade" % pkg) + if self.controller.cache.has_key("libkipi0"): + logging.debug("removing libkipi0)") + self.controller.cache["libkipi0"].mark_delete() + self.controller.cache[pkg].mark_upgrade() + + def intrepidPostDistUpgradeCache(self): + """ + this function works around quirks in the + hardy->intrepid upgrade + """ + logging.debug("running %s" % sys._getframe().f_code.co_name) + # kdelibs4-dev is unhappy (#279621) + fromp = "kdelibs4-dev" + to = "kdelibs5-dev" + if (self.controller.cache.has_key(fromp) and + self.controller.cache[fromp].is_installed and + self.controller.cache.has_key(to)): + self.controller.cache.mark_install(to, "kdelibs4-dev -> kdelibs5-dev transition") + + def hardyPostDistUpgradeCache(self): + """ + this function works around quirks in the + {dapper,gutsy}->hardy upgrade + """ + logging.debug("running %s" % sys._getframe().f_code.co_name) + # deal with gnome-translator and help apt with the breaks + if (self.controller.cache.has_key("nautilus") and + self.controller.cache["nautilus"].is_installed and + not self.controller.cache["nautilus"].marked_upgrade): + # uninstallable and gutsy apt is unhappy about this + # breaks because it wants to upgrade it and gives up + # if it can't + for broken in ("link-monitor-applet"): + if self.controller.cache.has_key(broken) and self.controller.cache[broken].is_installed: + self.controller.cache[broken].mark_delete() + self.controller.cache["nautilus"].mark_install() + # evms gives problems, remove it if it is not in use + self._checkAndRemoveEvms() + # give the language-support-* packages a extra kick + # (if we have network, otherwise this will not work) + if self.config.get("Options","withNetwork") == "True": + for pkg in self.controller.cache: + if (pkg.name.startswith("language-support-") and + pkg.is_installed and + not pkg.marked_upgrade): + self.controller.cache.mark_install(pkg.name,"extra language-support- kick") + + def gutsyPostDistUpgradeCache(self): + """ this function works around quirks in the feisty->gutsy upgrade """ + logging.debug("running %s" % sys._getframe().f_code.co_name) + # lowlatency kernel flavour vanished from feisty->gutsy + try: + (version, build, flavour) = self.uname.split("-") + if (flavour == 'lowlatency' or + flavour == '686' or + flavour == 'k7'): + kernel = "linux-image-generic" + if not (self.controller.cache[kernel].is_installed or self.controller.cache[kernel].marked_install): + logging.debug("Selecting new kernel '%s'" % kernel) + self.controller.cache[kernel].mark_install() + except Exception, e: + logging.warning("problem while transitioning lowlatency kernel (%s)" % e) + # fix feisty->gutsy utils-linux -> nfs-common transition (LP: #141559) + try: + for line in map(string.strip, open("/proc/mounts")): + if line == '' or line.startswith("#"): + continue + try: + (device, mount_point, fstype, options, a, b) = line.split() + except Exception, e: + logging.error("can't parse line '%s'" % line) + continue + if "nfs" in fstype: + logging.debug("found nfs mount in line '%s', marking nfs-common for install " % line) + self.controller.cache["nfs-common"].mark_install() + break + except Exception, e: + logging.warning("problem while transitioning util-linux -> nfs-common (%s)" % e) + + def feistyPostDistUpgradeCache(self): + """ this function works around quirks in the edgy->feisty upgrade """ + logging.debug("running %s" % sys._getframe().f_code.co_name) + # ndiswrapper changed again *sigh* + for (fr, to) in [("ndiswrapper-utils-1.8","ndiswrapper-utils-1.9")]: + if self.controller.cache.has_key(fr) and self.controller.cache.has_key(to): + if self.controller.cache[fr].is_installed and not self.controller.cache[to].marked_install: + try: + self.controller.cache.mark_install(to,"%s->%s quirk upgrade rule" % (fr, to)) + except SystemError, e: + logging.warning("Failed to apply %s->%s install (%s)" % (fr, to, e)) + + + def edgyPostDistUpgradeCache(self): + """ this function works around quirks in the dapper->edgy upgrade """ + logging.debug("running %s" % sys._getframe().f_code.co_name) + for pkg in self.controller.cache: + # deal with the python2.4-$foo -> python-$foo transition + if (pkg.name.startswith("python2.4-") and + pkg.is_installed and + not pkg.marked_upgrade): + basepkg = "python-"+pkg.name[len("python2.4-"):] + if (self.controller.cache.has_key(basepkg) and + self.controller.cache[basepkg].candidateDownloadable and + not self.controller.cache[basepkg].marked_install): + try: + self.controller.cache.mark_install(basepkg, + "python2.4->python upgrade rule") + except SystemError, e: + logging.debug("Failed to apply python2.4->python install: %s (%s)" % (basepkg, e)) + # xserver-xorg-input-$foo gives us trouble during the upgrade too + if (pkg.name.startswith("xserver-xorg-input-") and + pkg.is_installed and + not pkg.marked_upgrade): + try: + self.controller.cache.mark_install(pkg.name, "xserver-xorg-input fixup rule") + except SystemError, e: + logging.debug("Failed to apply fixup: %s (%s)" % (pkg.name, e)) + + # deal with held-backs that are unneeded + for pkgname in ["hpijs", "bzr", "tomboy"]: + if (self.controller.cache.has_key(pkgname) and self.controller.cache[pkgname].is_installed and + self.controller.cache[pkgname].isUpgradable and not self.controller.cache[pkgname].marked_upgrade): + try: + self.controller.cache.mark_install(pkgname,"%s quirk upgrade rule" % pkgname) + except SystemError, e: + logging.debug("Failed to apply %s install (%s)" % (pkgname,e)) + # libgl1-mesa-dri from xgl.compiz.info (and friends) breaks the + # upgrade, work around this here by downgrading the package + if self.controller.cache.has_key("libgl1-mesa-dri"): + pkg = self.controller.cache["libgl1-mesa-dri"] + # the version from the compiz repo has a "6.5.1+cvs20060824" ver + if (pkg.candidateVersion == pkg.installedVersion and + "+cvs2006" in pkg.candidateVersion): + for ver in pkg._pkg.VersionList: + # the "official" edgy version has "6.5.1~20060817-0ubuntu3" + if "~2006" in ver.VerStr: + # ensure that it is from a trusted repo + for (VerFileIter, index) in ver.FileList: + indexfile = self.controller.cache._list.FindIndex(VerFileIter) + if indexfile and indexfile.IsTrusted: + logging.info("Forcing downgrade of libgl1-mesa-dri for xgl.compz.info installs") + self.controller.cache._depcache.SetCandidateVer(pkg._pkg, ver) + break + + # deal with general if $foo is installed, install $bar + for (fr, to) in [("xserver-xorg-driver-all","xserver-xorg-video-all")]: + if self.controller.cache.has_key(fr) and self.controller.cache.has_key(to): + if self.controller.cache[fr].is_installed and not self.controller.cache[to].marked_install: + try: + self.controller.cache.mark_install(to,"%s->%s quirk upgrade rule" % (fr, to)) + except SystemError, e: + logging.debug("Failed to apply %s->%s install (%s)" % (fr, to, e)) + + def dapperPostDistUpgradeCache(self): + """ this function works around quirks in the breezy->dapper upgrade """ + logging.debug("running %s" % sys._getframe().f_code.co_name) + if (self.controller.cache.has_key("nvidia-glx") and self.controller.cache["nvidia-glx"].is_installed and + self.controller.cache.has_key("nvidia-settings") and self.controller.cache["nvidia-settings"].is_installed): + logging.debug("nvidia-settings and nvidia-glx is installed") + self.controller.cache.mark_remove("nvidia-settings") + self.controller.cache.mark_install("nvidia-glx") + + # run right before the first packages get installed + def StartUpgrade(self): + self._applyPatches() + self._removeOldApportCrashes() + self._removeBadMaintainerScripts() + self._killUpdateNotifier() + self._killKBluetooth() + self._killScreensaver() + self._pokeScreensaver() + self._stopDocvertConverter() + def oneiricStartUpgrade(self): + logging.debug("oneiric StartUpgrade quirks") + # fix grub issue + if (os.path.exists("/usr/sbin/update-grub") and + not os.path.exists("/etc/kernel/postinst.d/zz-update-grub")): + # create a version of zz-update-grub to avoid depending on + # the upgrade order. if that file is missing, we may end + # up generating a broken grub.cfg + targetdir = "/etc/kernel/postinst.d" + if not os.path.exists(targetdir): + os.makedirs(targetdir) + logging.debug("copying zz-update-grub into %s" % targetdir) + shutil.copy("zz-update-grub", targetdir) + os.chmod(os.path.join(targetdir, "zz-update-grub"), 0755) + # enable multiarch permanently + if apt.apt_pkg.config.find("Apt::Architecture") == "amd64": + self._enable_multiarch(foreign_arch="i386") + + def from_hardyStartUpgrade(self): + logging.debug("from_hardyStartUpgrade quirks") + self._stopApparmor() + def jauntyStartUpgrade(self): + self._createPycentralPkgRemove() + # hal/NM triggers problem, if the old (intrepid) hal gets + # triggered for a restart this causes NM to drop all connections + # because (old) hal thinks it has no devices anymore (LP: #327053) + ap = "/var/lib/dpkg/info/hal.postinst" + if os.path.exists(ap): + # intrepid md5 of hal.postinst (jaunty one is different) + # md5 jaunty 22c146857d751181cfe299a171fc11c9 + md5sum = "146145275900af343d990a4dea968d7c" + if md5(open(ap).read()).hexdigest() == md5sum: + logging.debug("removing bad script '%s'" % ap) + os.unlink(ap) + + # helpers + def _get_pci_ids(self): + """ return a set of pci ids of the system (using lspci -n) """ + lspci = set() + try: + p = subprocess.Popen(["lspci","-n"],stdout=subprocess.PIPE) + except OSError: + return lspci + for line in p.communicate()[0].split("\n"): + if line: + lspci.add(line.split()[2]) + return lspci + + def _test_and_warn_on_i8xx(self): + I8XX_PCI_IDS = ["8086:7121", # i810 + "8086:7125", # i810e + "8086:1132", # i815 + "8086:3577", # i830 + "8086:2562", # i845 + "8086:3582", # i855 + "8086:2572", # i865 + ] + lspci = self._get_pci_ids() + if set(I8XX_PCI_IDS).intersection(lspci): + res = self._view.askYesNoQuestion( + _("Your graphics hardware may not be fully supported in " + "Ubuntu 12.04 LTS."), + _("The support in Ubuntu 12.04 LTS for your Intel " + "graphics hardware is limited " + "and you may encounter problems after the upgrade. " + "For more information see " + "https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx " + "Do you want to continue with the upgrade?") + ) + if res == False: + self.controller.abort() + + def _test_and_warn_on_nvidia_and_no_sse(self): + """ The current + """ + # check if we have sse + cache = self.controller.cache + for pkgname in ["nvidia-glx-180", "nvidia-glx-185", "nvidia-glx-195"]: + if (cache.has_key(pkgname) and + cache[pkgname].marked_install and + self._checkVideoDriver("nvidia")): + logging.debug("found %s video driver" % pkgname) + if not self._cpuHasSSESupport(): + logging.warning("nvidia driver that needs SSE but cpu has no SSE support") + res = self._view.askYesNoQuestion(_("Upgrading may reduce desktop " + "effects, and performance in games " + "and other graphically intensive " + "programs."), + _("This computer is currently using " + "the NVIDIA 'nvidia' " + "graphics driver. " + "No version of this driver is " + "available that works with your " + "video card in Ubuntu " + "10.04 LTS.\n\nDo you want to continue?")) + if res == False: + self.controller.abort() + # if the user continue, do not install the broken driver + # so that we can transiton him to the free "nv" one after + # the upgrade + self.controller.cache[pkgname].mark_keep() + + + def _test_and_warn_on_old_nvidia(self): + """ nvidia-glx-71 and -96 are no longer in the archive since 8.10 """ + # now check for nvidia and show a warning if needed + cache = self.controller.cache + for pkgname in ["nvidia-glx-71","nvidia-glx-96"]: + if (cache.has_key(pkgname) and + cache[pkgname].marked_install and + self._checkVideoDriver("nvidia")): + logging.debug("found %s video driver" % pkgname) + res = self._view.askYesNoQuestion(_("Upgrading may reduce desktop " + "effects, and performance in games " + "and other graphically intensive " + "programs."), + _("This computer is currently using " + "the NVIDIA 'nvidia' " + "graphics driver. " + "No version of this driver is " + "available that works with your " + "video card in Ubuntu " + "10.04 LTS.\n\nDo you want to continue?")) + if res == False: + self.controller.abort() + # if the user continue, do not install the broken driver + # so that we can transiton him to the free "nv" one after + # the upgrade + self.controller.cache[pkgname].mark_keep() + + def _test_and_warn_on_dropped_fglrx_support(self): + """ + Some cards are no longer supported by fglrx. Check if that + is the case and warn + """ + # this is to deal with the fact that support for some of the cards + # that fglrx used to support got dropped + if (self._checkVideoDriver("fglrx") and + not self._supportInModaliases("fglrx")): + res = self._view.askYesNoQuestion(_("Upgrading may reduce desktop " + "effects, and performance in games " + "and other graphically intensive " + "programs."), + _("This computer is currently using " + "the AMD 'fglrx' graphics driver. " + "No version of this driver is " + "available that works with your " + "hardware in Ubuntu " + "10.04 LTS.\n\nDo you want to continue?")) + if res == False: + self.controller.abort() + # if the user wants to continue we remove the fglrx driver + # here because its no use (no support for this card) + logging.debug("remove xorg-driver-fglrx,xorg-driver-fglrx-envy,fglrx-kernel-source") + l=self.controller.config.getlist("Distro","PostUpgradePurge") + l.append("xorg-driver-fglrx") + l.append("xorg-driver-fglrx-envy") + l.append("fglrx-kernel-source") + l.append("fglrx-amdcccle") + l.append("xorg-driver-fglrx-dev") + l.append("libamdxvba1") + self.controller.config.set("Distro","PostUpgradePurge",",".join(l)) + + def _test_and_fail_on_non_i686(self): + """ + Test and fail if the cpu is not i686 or more or if its a newer + CPU but does not have the cmov feature (LP: #587186) + """ + # check on i386 only + if self.arch == "i386": + logging.debug("checking for i586 CPU") + if not self._cpu_is_i686_and_has_cmov(): + logging.error("not a i686 or no cmov") + summary = _("No i686 CPU") + msg = _("Your system uses an i586 CPU or a CPU that does " + "not have the 'cmov' extension. " + "All packages were built with " + "optimizations requiring i686 as the " + "minimal architecture. It is not possible to " + "upgrade your system to a new Ubuntu release " + "with this hardware.") + self._view.error(summary, msg) + self.controller.abort() + + def _cpu_is_i686_and_has_cmov(self, cpuinfo_path="/proc/cpuinfo"): + if not os.path.exists(cpuinfo_path): + logging.error("cannot open %s ?!?" % cpuinfo_path) + return True + cpuinfo = open(cpuinfo_path).read() + # check family + if re.search("^cpu family\s*:\s*[345]\s*", cpuinfo, re.MULTILINE): + logging.debug("found cpu family [345], no i686+") + return False + # check flags for cmov + match = re.search("^flags\s*:\s*(.*)", cpuinfo, re.MULTILINE) + if match: + if not "cmov" in match.group(1).split(): + logging.debug("found flags '%s'" % match.group(1)) + logging.debug("can not find cmov in flags") + return False + return True + + + def _test_and_fail_on_non_arm_v6(self): + """ + Test and fail if the cpu is not a arm v6 or greater, + from 9.10 on we do no longer support those CPUs + """ + if self.arch == "armel": + if not self._checkArmCPU(): + self._view.error(_("No ARMv6 CPU"), + _("Your system uses an ARM CPU that is older " + "than the ARMv6 architecture. " + "All packages in karmic were built with " + "optimizations requiring ARMv6 as the " + "minimal architecture. It is not possible to " + "upgrade your system to a new Ubuntu release " + "with this hardware.")) + self.controller.abort() + + def _test_and_warn_if_vserver(self): + """ + upstart and vserver environments are not a good match, warn + if we find one + """ + # verver test (LP: #454783), see if there is a init around + try: + os.kill(1, 0) + except: + logging.warn("no init found") + res = self._view.askYesNoQuestion( + _("No init available"), + _("Your system appears to be a virtualised environment " + "without an init daemon, e.g. Linux-VServer. " + "Ubuntu 10.04 LTS cannot function within this type of " + "environment, requiring an update to your virtual " + "machine configuration first.\n\n" + "Are you sure you want to continue?")) + if res == False: + self.controller.abort() + self._view.processEvents() + + def _kubuntuDesktopTransition(self): + """ + check if a key depends of kubuntu-kde4-desktop is installed + and transition in this case as well + """ + deps_found = False + frompkg = "kubuntu-kde4-desktop" + topkg = "kubuntu-desktop" + if self.config.getlist(frompkg,"KeyDependencies"): + deps_found = True + for pkg in self.config.getlist(frompkg,"KeyDependencies"): + deps_found &= (self.controller.cache.has_key(pkg) and + self.controller.cache[pkg].is_installed) + if deps_found: + logging.debug("transitioning %s to %s (via key depends)" % (frompkg, topkg)) + self.controller.cache[topkg].mark_install() + + def _mysqlClusterCheck(self): + """ + check if ndb clustering is used and do not upgrade mysql + if it is (LP: #450837) + """ + logging.debug("_mysqlClusterCheck") + if (self.controller.cache.has_key("mysql-server") and + self.controller.cache["mysql-server"].is_installed): + # taken from the mysql-server-5.1.preinst + ret = subprocess.call([ + "egrep", "-q", "-i", "-r", + "^[^#]*ndb.connectstring|^[:space:]*\[[:space:]*ndb_mgmd", + "/etc/mysql/"]) + logging.debug("egrep returned %s" % ret) + # if clustering is used, do not upgrade to 5.1 and + # remove mysql-{server,client} + # metapackage and upgrade the 5.0 packages + if ret == 0: + logging.debug("mysql clustering in use, do not upgrade to 5.1") + for pkg in ("mysql-server", "mysql-client"): + self.controller.cache.mark_remove(pkg, "clustering in use") + # mark mysql-{server,client}-5.0 as manual install (#453513) + depcache = self.controller.cache._depcache + for pkg in ["mysql-server-5.0", "mysql-client-5.0"]: + if pkg.is_installed and depcache.IsAutoInstalled(pkg._pkg): + logging.debug("marking '%s' manual installed" % pkg.name) + autoInstDeps = False + fromUser = True + depcache.Mark_install(pkg._pkg, autoInstDeps, fromUser) + else: + self.controller.cache.mark_upgrade("mysql-server", "no clustering in use") + + def _checkArmCPU(self): + """ + parse /proc/cpuinfo and search for ARMv6 or greater + """ + logging.debug("checking for ARM CPU version") + if not os.path.exists("/proc/cpuinfo"): + logging.error("cannot open /proc/cpuinfo ?!?") + return False + cpuinfo = open("/proc/cpuinfo") + if re.search("^Processor\s*:\s*ARMv[45]", cpuinfo.read(), re.MULTILINE): + return False + return True + + def _dealWithLanguageSupportTransition(self): + """ + In karmic the language-support-translations-* metapackages + are gone and the direct dependencies will get marked for + auto removal - mark them as manual instead + """ + logging.debug("language-support-translations-* transition") + for pkg in self.controller.cache: + depcache = self.controller.cache._depcache + if (pkg.name.startswith("language-support-translations") and + pkg.is_installed): + for dp_or in pkg.installedDependencies: + for dpname in dp_or.or_dependencies: + dp = self.controller.cache[dpname.name] + if dp.is_installed and depcache.IsAutoInstalled(dp._pkg): + logging.debug("marking '%s' manual installed" % dp.name) + autoInstDeps = False + fromUser = True + depcache.mark_install(dp._pkg, autoInstDeps, fromUser) + + def _checkLanguageSupport(self): + """ + check if the language support is fully installed and if + not generate a update-notifier note on next login + """ + if not os.path.exists("/usr/bin/check-language-support"): + logging.debug("no check-language-support available") + return + p = subprocess.Popen(["check-language-support"],stdout=subprocess.PIPE) + for pkgname in p.communicate()[0].split(): + if (self.controller.cache.has_key(pkgname) and + not self.controller.cache[pkgname].is_installed): + logging.debug("language support package '%s' missing" % pkgname) + # check if kde/gnome and copy language-selector note + base = "/usr/share/language-support/" + target = "/var/lib/update-notifier/user.d" + for p in ("incomplete-language-support-gnome.note", + "incomplete-language-support-qt.note"): + if os.path.exists(os.path.join(base,p)): + shutil.copy(os.path.join(base,p), target) + return + + def _checkAndInstallBroadcom(self): + """ + check for the 'wl' kernel module and install bcmwl-kernel-source + if the module is loaded + """ + logging.debug("checking for 'wl' module") + if "wl" in lsmod(): + self.controller.cache.mark_install("bcmwl-kernel-source", + "'wl' module found in lsmod") + + def _stopApparmor(self): + """ /etc/init.d/apparmor stop (see bug #559433)""" + if os.path.exists("/etc/init.d/apparmor"): + logging.debug("/etc/init.d/apparmor stop") + subprocess.call(["/etc/init.d/apparmor","stop"]) + def _stopDocvertConverter(self): + " /etc/init.d/docvert-converter stop (see bug #450569)" + if os.path.exists("/etc/init.d/docvert-converter"): + logging.debug("/etc/init.d/docvert-converter stop") + subprocess.call(["/etc/init.d/docvert-converter","stop"]) + def _killUpdateNotifier(self): + "kill update-notifier" + # kill update-notifier now to suppress reboot required + if os.path.exists("/usr/bin/killall"): + logging.debug("killing update-notifier") + subprocess.call(["killall","-q","update-notifier"]) + def _killKBluetooth(self): + """killall kblueplugd kbluetooth (riddel requested it)""" + if os.path.exists("/usr/bin/killall"): + logging.debug("killing kblueplugd kbluetooth4") + subprocess.call(["killall", "-q", "kblueplugd", "kbluetooth4"]) + def _killScreensaver(self): + """killall gnome-screensaver """ + if os.path.exists("/usr/bin/killall"): + logging.debug("killing gnome-screensaver") + subprocess.call(["killall", "-q", "gnome-screensaver"]) + def _pokeScreensaver(self): + if os.path.exists("/usr/bin/xdg-screensaver") and os.environ.get('DISPLAY') : + logging.debug("setup poke timer for the scrensaver") + try: + self._poke = subprocess.Popen( + "while true; do /usr/bin/xdg-screensaver reset >/dev/null 2>&1; sleep 30; done", + shell=True) + atexit.register(self._stopPokeScreensaver) + except: + logging.exception("failed to setup screensaver poke") + def _stopPokeScreensaver(self): + if self._poke: + res = False + try: + self._poke.terminate() + res = self._poke.wait() + except: + logging.exception("failed to stop screensaver poke") + self._poke = None + return res + def _removeBadMaintainerScripts(self): + " remove bad/broken maintainer scripts (last resort) " + # apache: workaround #95325 (edgy->feisty) + # pango-libthai #103384 (edgy->feisty) + bad_scripts = ["/var/lib/dpkg/info/apache2-common.prerm", + "/var/lib/dpkg/info/pango-libthai.postrm", + ] + for ap in bad_scripts: + if os.path.exists(ap): + logging.debug("removing bad script '%s'" % ap) + os.unlink(ap) + + def _createPycentralPkgRemove(self): + """ + intrepid->jaunty, create /var/lib/pycentral/pkgremove flag file + to help python-central so that it removes all preinst links + on upgrade + """ + logging.debug("adding pkgremove file") + if not os.path.exists("/var/lib/pycentral/"): + os.makedirs("/var/lib/pycentral") + open("/var/lib/pycentral/pkgremove","w") + + def _removeOldApportCrashes(self): + " remove old apport crash files " + try: + for f in glob.glob("/var/crash/*.crash"): + logging.debug("removing old crash file '%s'" % f) + os.unlink(f) + except Exception, e: + logging.warning("error during unlink of old crash files (%s)" % e) + + def _cpuHasSSESupport(self, cpuinfo="/proc/cpuinfo"): + " helper that checks if the given cpu has sse support " + if not os.path.exists(cpuinfo): + return False + for line in open(cpuinfo): + if line.startswith("flags") and not " sse" in line: + return False + return True + + def _usesEvmsInMounts(self): + " check if evms is used in /proc/mounts " + logging.debug("running _usesEvmsInMounts") + for line in open("/proc/mounts"): + line = line.strip() + if line == '' or line.startswith("#"): + continue + try: + (device, mount_point, fstype, options, a, b) = line.split() + except Exception: + logging.error("can't parse line '%s'" % line) + continue + if "evms" in device: + logging.debug("found evms device in line '%s', skipping " % line) + return True + return False + + def _checkAndRemoveEvms(self): + " check if evms is in use and if not, remove it " + logging.debug("running _checkAndRemoveEvms") + if self._usesEvmsInMounts(): + return False + # if not in use, nuke it + for pkg in ["evms","libevms-2.5","libevms-dev", + "evms-ncurses", "evms-ha", + "evms-bootdebug", + "evms-gui", "evms-cli", + "linux-patch-evms"]: + if self.controller.cache.has_key(pkg) and self.controller.cache[pkg].is_installed: + self.controller.cache[pkg].mark_delete() + return True + + def _addRelatimeToFstab(self): + " add the relatime option to ext2/ext3 filesystems on upgrade " + logging.debug("_addRelatime") + replaced = False + lines = [] + for line in open("/etc/fstab"): + line = line.strip() + if line == '' or line.startswith("#"): + lines.append(line) + continue + try: + (device, mount_point, fstype, options, a, b) = line.split() + except Exception: + logging.error("can't parse line '%s'" % line) + lines.append(line) + continue + if (("ext2" in fstype or + "ext3" in fstype) and + (not "noatime" in options) and + (not "relatime" in options) ): + logging.debug("adding 'relatime' to line '%s' " % line) + line = line.replace(options,"%s,relatime" % options) + logging.debug("replaced line is '%s' " % line) + replaced=True + lines.append(line) + # we have converted a line + if replaced: + logging.debug("writing new /etc/fstab") + f=open("/etc/fstab.intrepid","w") + f.write("\n".join(lines)) + # add final newline (see LP: #279093) + f.write("\n") + f.close() + os.rename("/etc/fstab.intrepid","/etc/fstab") + return True + + def _ntfsFstabFixup(self, fstab="/etc/fstab"): + """change PASS 1 to 0 for ntfs entries (#441242)""" + logging.debug("_ntfsFstabFixup") + replaced = False + lines = [] + for line in open(fstab): + line = line.strip() + if line == '' or line.startswith("#"): + lines.append(line) + continue + try: + (device, mount_point, fstype, options, fdump, fpass) = line.split() + except Exception: + logging.error("can't parse line '%s'" % line) + lines.append(line) + continue + if ("ntfs" in fstype and fpass == "1"): + logging.debug("changing PASS for ntfs to 0 for '%s' " % line) + if line[-1] == "1": + line = line[:-1] + "0" + else: + logging.error("unexpected value in line") + logging.debug("replaced line is '%s' " % line) + replaced=True + lines.append(line) + # we have converted a line + if replaced: + suffix = ".jaunty" + logging.debug("writing new /etc/fstab") + f=open(fstab + suffix, "w") + f.write("\n".join(lines)) + # add final newline (see LP: #279093) + f.write("\n") + f.close() + os.rename(fstab+suffix, fstab) + return True + + + def _rewriteFstab(self): + " convert /dev/{hd?,scd0} to /dev/cdrom for the feisty upgrade " + logging.debug("_rewriteFstab()") + replaced = 0 + lines = [] + # we have one cdrom to convert + for line in open("/etc/fstab"): + line = line.strip() + if line == '' or line.startswith("#"): + lines.append(line) + continue + try: + (device, mount_point, fstype, options, a, b) = line.split() + except Exception: + logging.error("can't parse line '%s'" % line) + lines.append(line) + continue + # edgy kernel has /dev/cdrom -> /dev/hd? + # feisty kernel (for a lot of chipsets) /dev/cdrom -> /dev/scd0 + # this breaks static mounting (LP#86424) + # + # we convert here to /dev/cdrom only if current /dev/cdrom + # points to the device in /etc/fstab already. this ensures + # that we don't break anything or that we get it wrong + # for systems with two (or more) cdroms. this is ok, because + # we convert under the old kernel + if ("iso9660" in fstype and + device != "/dev/cdrom" and + os.path.exists("/dev/cdrom") and + os.path.realpath("/dev/cdrom") == device + ): + logging.debug("replacing '%s' " % line) + line = line.replace(device,"/dev/cdrom") + logging.debug("replaced line is '%s' " % line) + replaced += 1 + lines.append(line) + # we have converted a line (otherwise we would have exited already) + if replaced > 0: + logging.debug("writing new /etc/fstab") + shutil.copy("/etc/fstab","/etc/fstab.edgy") + f=open("/etc/fstab","w") + f.write("\n".join(lines)) + # add final newline (see LP: #279093) + f.write("\n") + f.close() + return True + + def _checkAdminGroup(self): + " check if the current sudo user is in the admin group " + logging.debug("_checkAdminGroup") + import grp + try: + admin_group = grp.getgrnam("admin").gr_mem + except KeyError, e: + logging.warning("System has no admin group (%s)" % e) + subprocess.call(["addgroup","--system","admin"]) + # double paranoia + try: + admin_group = grp.getgrnam("admin").gr_mem + except KeyError, e: + logging.warning("adding the admin group failed (%s)" % e) + return + # if the current SUDO_USER is not in the admin group + # we add him - this is no security issue because + # the user is already root so adding him to the admin group + # does not change anything + if (os.environ.has_key("SUDO_USER") and + not os.environ["SUDO_USER"] in admin_group): + admin_user = os.environ["SUDO_USER"] + logging.info("SUDO_USER=%s is not in admin group" % admin_user) + cmd = ["usermod","-a","-G","admin",admin_user] + res = subprocess.call(cmd) + logging.debug("cmd: %s returned %i" % (cmd, res)) + + def _checkVideoDriver(self, name): + " check if the given driver is in use in xorg.conf " + XORG="/etc/X11/xorg.conf" + if not os.path.exists(XORG): + return False + for line in open(XORG): + s=line.split("#")[0].strip() + # check for fglrx driver entry + if (s.lower().startswith("driver") and + s.endswith('"%s"' % name)): + return True + return False + + def _applyPatches(self, patchdir="./patches"): + """ + helper that applies the patches in patchdir. the format is + _path_to_file.md5sum + + and it will apply the diff to that file if the md5sum + matches + """ + if not os.path.exists(patchdir): + logging.debug("no patchdir") + return + for f in os.listdir(patchdir): + # skip, not a patch file, they all end with .$md5sum + if not "." in f: + logging.debug("skipping '%s' (no '.')" % f) + continue + logging.debug("check if patch '%s' needs to be applied" % f) + (encoded_path, md5sum, result_md5sum) = string.rsplit(f, ".", 2) + # FIXME: this is not clever and needs quoting support for + # filenames with "_" in the name + path = encoded_path.replace("_","/") + logging.debug("target for '%s' is '%s' -> '%s'" % ( + f, encoded_path, path)) + # target does not exist + if not os.path.exists(path): + logging.debug("target '%s' does not exist" % path) + continue + # check the input md5sum, this is not strictly needed as patch() + # will verify the result md5sum and discard the result if that + # does not match but this will remove a misleading error in the + # logs + md5 = hashlib.md5() + md5.update(open(path).read()) + if md5.hexdigest() == result_md5sum: + logging.debug("already at target hash, skipping '%s'" % path) + continue + elif md5.hexdigest() != md5sum: + logging.warn("unexpected target md5sum, skipping: '%s'" % path) + continue + # patchable, do it + from DistUpgradePatcher import patch + try: + patch(path, os.path.join(patchdir, f), result_md5sum) + logging.info("applied '%s' successfully" % f) + except Exception: + logging.exception("ed failed for '%s'" % f) + + def _supportInModaliases(self, pkgname, lspci=None): + """ + Check if pkgname will work on this hardware + + This helper will check with the modaliasesdir if the given + pkg will work on this hardware (or the hardware given + via the lspci argument) + """ + # get lspci info (if needed) + if not lspci: + lspci = self._get_pci_ids() + # get pkg + if (not pkgname in self.controller.cache or + not self.controller.cache[pkgname].candidate): + logging.warn("can not find '%s' in cache") + return False + pkg = self.controller.cache[pkgname] + for (module, pciid_list) in self._parse_modaliases_from_pkg_header(pkg.candidate.record): + for pciid in pciid_list: + m = re.match("pci:v0000(.+)d0000(.+)sv.*", pciid) + if m: + matchid = "%s:%s" % (m.group(1), m.group(2)) + if matchid.lower() in lspci: + logging.debug("found system pciid '%s' in modaliases" % matchid) + return True + logging.debug("checking for %s support in modaliases but none found" % pkgname) + return False + + def _parse_modaliases_from_pkg_header(self, pkgrecord): + """ return a list of (module1, (pciid, ...), (module2, (pciid, ...)))""" + if not "Modaliases" in pkgrecord: + return [] + # split the string + modules = [] + for m in pkgrecord["Modaliases"].split(")"): + m = m.strip(", ") + if not m: + continue + (module, pciids) = m.split("(") + modules.append ((module, [x.strip() for x in pciids.split(",")])) + return modules + + def _kernel386TransitionCheck(self): + """ test if the current kernel is 386 and if the system is + capable of using a generic one instead (#353534) + """ + logging.debug("_kernel386TransitionCheck") + # we test first if one of 386 is installed + # if so, check if the system could also work with -generic + # (we get that from base-installer) and try to installed + # that) + for pkgname in ["linux-386", "linux-image-386"]: + if (self.controller.cache.has_key(pkgname) and + self.controller.cache[pkgname].is_installed): + working_kernels = self.controller.cache.getKernelsFromBaseInstaller() + upgrade_to = ["linux-generic", "linux-image-generic"] + for pkgname in upgrade_to: + if pkgname in working_kernels: + logging.debug("386 kernel installed, but generic kernel will work on this machine") + if self.controller.cache.mark_install(pkgname, "386 -> generic transition"): + return + + + def _add_extras_repository(self): + logging.debug("_add_extras_repository") + cache = self.controller.cache + if not "ubuntu-extras-keyring" in cache: + logging.debug("no ubuntu-extras-keyring, no need to add repo") + return + if not (cache["ubuntu-extras-keyring"].marked_install or + cache["ubuntu-extras-keyring"].installed): + logging.debug("ubuntu-extras-keyring not installed/marked_install") + return + try: + import aptsources.sourceslist + sources = aptsources.sourceslist.SourcesList() + for entry in sources: + if "extras.ubuntu.com" in entry.uri: + logging.debug("found extras.ubuntu.com, no need to add it") + break + else: + logging.info("no extras.ubuntu.com, adding it to sources.list") + sources.add("deb","http://extras.ubuntu.com/ubuntu", + self.controller.toDist, ["main"], + "Third party developers repository") + sources.save() + except: + logging.exception("error adding extras.ubuntu.com") + + def _gutenprint_fixup(self): + """ foomatic-db-gutenprint get removed during the upgrade, + replace it with the compressed ijsgutenprint-ppds + (context is foomatic-db vs foomatic-db-compressed-ppds) + """ + try: + cache = self.controller.cache + if ("foomatic-db-gutenprint" in cache and + cache["foomatic-db-gutenprint"].marked_delete and + "ijsgutenprint-ppds" in cache): + logging.info("installing ijsgutenprint-ppds") + cache.mark_install( + "ijsgutenprint-ppds", + "foomatic-db-gutenprint -> ijsgutenprint-ppds rule") + except: + logging.exception("_gutenprint_fixup failed") + + def _enable_multiarch(self, foreign_arch="i386"): + """ enable multiarch via /etc/dpkg/dpkg.cfg.d/multiarch """ + cfg = "/etc/dpkg/dpkg.cfg.d/multiarch" + if not os.path.exists(cfg): + try: + os.makedirs("/etc/dpkg/dpkg.cfg.d/") + except OSError: + pass + open(cfg, "w").write("foreign-architecture %s\n" % foreign_arch) + + def _add_kdegames_card_extra_if_installed(self): + """ test if kdegames-card-data is installed and if so, + add kdegames-card-data-extra so that users do not + loose functionality (LP: #745396) + """ + try: + cache = self.controller.cache + if not ("kdegames-card-data" in cache or + "kdegames-card-data-extra" in cache): + return + if (cache["kdegames-card-data"].is_installed or + cache["kdegames-card-data"].marked_install): + cache.mark_install( + "kdegames-card-data-extra", + "kdegames-card-data -> k-c-d-extra transition") + except: + logging.exception("_add_kdegames_card_extra_if_installed failed") + + def ensure_recommends_are_installed_on_desktops(self): + """ ensure that on a desktop install recommends are installed + (LP: #759262) + """ + import apt + if not self.controller.serverMode: + if not apt.apt_pkg.config.find_b("Apt::Install-Recommends"): + logging.warn("Apt::Install-Recommends was disabled, enabling it just for the upgrade") + apt.apt_pkg.config.set("Apt::Install-Recommends", "1") + diff -Nru update-manager-17.10.11/DistUpgrade/DistUpgrade.ui update-manager-0.156.14.15/DistUpgrade/DistUpgrade.ui --- update-manager-17.10.11/DistUpgrade/DistUpgrade.ui 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DistUpgrade.ui 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,1605 @@ + + + + + False + 6 + False + center-on-parent + dialog + True + True + True + + + True + False + 12 + + + True + False + end + + + _Cancel Upgrade + True + True + True + False + False + True + + + False + False + 0 + + + + + _Resume Upgrade + True + True + True + True + False + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + 6 + 12 + + + True + False + 0 + 0 + gtk-dialog-question + 6 + + + False + True + 0 + + + + + True + False + 0 + 0 + <b><big>Cancel the running upgrade?</big></b> + +The system could be in an unusable state if you cancel the upgrade. You are strongly adviced to resume the upgrade. + True + True + + + False + False + 1 + + + + + False + True + 1 + + + + + + button_cancel + button_resume + + + + False + 6 + center-on-parent + 500 + 550 + dialog + True + True + True + + + True + False + 6 + + + True + False + end + + + gtk-cancel + True + True + True + False + False + True + + + False + False + 0 + + + + + _Start Upgrade + True + True + True + False + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + 6 + 12 + + + True + False + 0 + 0 + gtk-dialog-question + 6 + + + False + True + 0 + + + + + True + False + 12 + + + True + True + 0 + True + True + True + + + False + True + 0 + + + + + True + False + 0 + True + True + + + False + True + 1 + + + + + True + True + 6 + + + 200 + True + True + in + + + True + True + False + + + + + + + True + False + Details + + + + + True + True + 2 + + + + + True + True + 1 + + + + + True + True + 1 + + + + + + button_cancel_changes + button_confirm_changes + + + + False + 5 + False + True + center-on-parent + dialog + + + True + False + 12 + + + True + False + end + + + True + True + True + True + False + False + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-cancel + + + False + False + 0 + + + + + True + False + _Keep + True + + + False + False + 1 + + + + + + + + + False + False + 0 + + + + + True + True + True + False + False + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-ok + + + False + False + 0 + + + + + True + False + _Replace + True + + + False + False + 1 + + + + + + + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + 6 + 12 + + + True + False + 0 + 0 + gtk-dialog-question + 6 + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 0 + True + True + + + False + False + 0 + + + + + True + True + 1 + + + + + False + True + 1 + + + + + True + True + + + True + False + + + True + True + in + + + 300 + True + True + False + False + + + + + False + False + 0 + + + + + + + True + False + Difference between the files + + + + + False + True + 2 + + + + + + button9 + button10 + + + + False + 6 + False + center-on-parent + dialog + True + True + True + + + True + False + 12 + + + True + False + end + + + _Report Bug + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-close + True + True + True + True + False + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + 6 + 12 + + + True + False + 0 + 0 + gtk-dialog-error + 6 + + + False + True + 0 + + + + + True + False + 12 + + + True + True + 0 + True + True + True + + + False + True + 0 + + + + + 400 + 200 + True + in + + + True + True + 4 + 4 + False + 4 + 4 + + + + + True + True + 1 + + + + + True + True + 1 + + + + + False + True + 1 + + + + + + button_bugreport + button6 + + + + False + 6 + False + center-on-parent + dialog + True + True + True + + + True + False + 12 + + + True + False + end + + + gtk-close + True + True + True + True + False + False + True + + + False + False + 0 + + + + + False + True + end + 0 + + + + + True + False + 6 + 12 + + + True + False + 0 + 0 + gtk-dialog-info + 6 + + + False + True + 0 + + + + + True + False + 12 + + + True + True + 0 + True + True + True + + + False + True + 0 + + + + + 400 + 200 + True + in + + + True + True + 4 + 4 + False + 4 + 4 + + + + + True + True + 1 + + + + + True + True + 1 + + + + + False + True + 1 + + + + + + button12 + + + + False + 6 + False + center-on-parent + 500 + 400 + dialog + True + True + True + + + True + False + 6 + + + True + False + end + + + gtk-cancel + True + True + True + False + False + True + + + False + False + 0 + + + + + _Continue + True + True + True + False + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + 6 + 12 + + + True + False + 12 + + + True + False + 0 + 0 + gtk-dialog-warning + 6 + + + False + True + 0 + + + + + True + False + 12 + + + True + False + 0 + 0 + <b><big>Start the upgrade?</big></b> + True + True + + + False + False + 0 + + + + + True + False + 0 + 0 + True + + + False + False + 1 + + + + + True + True + + + 400 + 200 + True + True + in + + + True + True + False + + + + + + + True + False + Details + + + + + False + False + 2 + + + + + False + False + 1 + + + + + False + False + 0 + + + + + False + True + 1 + + + + + + button7 + button8 + + + + False + 6 + False + center-on-parent + dialog + True + True + True + + + True + False + 12 + + + True + False + end + + + True + True + True + False + False + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-refresh + + + False + False + 0 + + + + + True + False + _Restart Now + True + + + False + False + 1 + + + + + + + + + False + False + 0 + + + + + gtk-close + True + True + True + False + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + 6 + 12 + + + True + False + 0 + 0 + gtk-dialog-info + 6 + + + False + True + 0 + + + + + True + False + 0 + 0 + <b><big>Restart the system to complete the upgrade</big></b> + +Please save your work before continuing. + True + + + False + False + 1 + + + + + False + True + 1 + + + + + + button_restart + button_restart1 + + + + True + False + 6 + Distribution Upgrade + False + center + True + + + + True + False + 12 + + + True + False + 6 + 12 + + + True + False + 0 + <b><big>Upgrading Ubuntu to version 12.04</big></b> + True + + + False + False + 0 + + + + + True + False + + + True + False + + + + False + False + 0 + + + + + True + False + 6 + 2 + 6 + 6 + + + True + False + 0 + Preparing to upgrade + + + 1 + 2 + GTK_FILL + + + + + + True + False + 0 + Setting new software channels + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + True + False + 0 + Getting new packages + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + True + False + + + False + + + True + True + 0 + + + + + 18 + 18 + False + + + True + True + 1 + + + + + GTK_FILL + GTK_FILL + + + + + True + False + + + False + + + True + True + 0 + + + + + 18 + 18 + False + + + True + True + 1 + + + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + False + + + False + + + True + True + 0 + + + + + 18 + 18 + False + + + True + True + 1 + + + + + 2 + 3 + GTK_FILL + GTK_FILL + + + + + True + False + 0 + Restarting the computer + + + 1 + 2 + 5 + 6 + GTK_FILL + + + + + + True + False + + + False + + + True + True + 0 + + + + + 18 + 18 + False + + + True + True + 1 + + + + + 5 + 6 + GTK_FILL + GTK_FILL + + + + + True + False + + + False + + + True + True + 0 + + + + + 18 + 18 + False + + + True + True + 1 + + + + + 4 + 5 + GTK_FILL + GTK_FILL + + + + + True + False + 0 + Cleaning up + + + 1 + 2 + 4 + 5 + GTK_FILL + + + + + + True + False + 0 + Installing the upgrades + + + 1 + 2 + 3 + 4 + GTK_FILL + + + + + + True + False + + + False + + + True + True + 0 + + + + + 18 + 18 + False + + + True + True + 1 + + + + + 3 + 4 + GTK_FILL + GTK_FILL + + + + + True + True + 1 + + + + + True + True + 1 + + + + + True + False + 4 + + + 350 + True + False + 0.10000000149 + + end + + + False + False + 0 + + + + + True + False + 0 + True + end + + + False + False + 1 + + + + + True + True + 2 + + + + + True + False + + + True + False + True + 4 + + + True + False + + + + + True + False + Terminal + + + + + True + True + 0 + + + + + gtk-cancel + True + False + False + True + + + False + False + 1 + + + + + True + True + 3 + + + + + True + True + 0 + + + + + + diff -Nru update-manager-17.10.11/DistUpgrade/DistUpgradeVersion.py update-manager-0.156.14.15/DistUpgrade/DistUpgradeVersion.py --- update-manager-17.10.11/DistUpgrade/DistUpgradeVersion.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DistUpgradeVersion.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1 @@ +VERSION='0.123' diff -Nru update-manager-17.10.11/DistUpgrade/DistUpgradeViewGtk3.py update-manager-0.156.14.15/DistUpgrade/DistUpgradeViewGtk3.py --- update-manager-17.10.11/DistUpgrade/DistUpgradeViewGtk3.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DistUpgradeViewGtk3.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,747 @@ +# DistUpgradeViewGtk3.py +# +# Copyright (c) 2011 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import gi +gi.require_version("Gtk", "3.0") +gi.require_version("Vte", "2.90") + +from gi.repository import Gtk +from gi.repository import Gdk +from gi.repository import Vte +from gi.repository import GLib +from gi.repository import GObject +from gi.repository import Pango + +import sys +import locale +import logging +import time +import subprocess + +import apt +import apt_pkg +import os + +from DistUpgradeApport import run_apport, apport_crash + +from DistUpgradeView import DistUpgradeView, FuzzyTimeToStr, InstallProgress, FetchProgress +from SimpleGtk3builderApp import SimpleGtkbuilderApp + +import gettext +from DistUpgradeGettext import gettext as _ + +GObject.threads_init() + +def utf8(str): + return unicode(str, 'latin1').encode('utf-8') + +class GtkCdromProgressAdapter(apt.progress.CdromProgress): + """ Report the cdrom add progress + Subclass this class to implement cdrom add progress reporting + """ + def __init__(self, parent): + self.status = parent.label_status + self.progress = parent.progressbar_cache + self.parent = parent + def update(self, text, step): + """ update is called regularly so that the gui can be redrawn """ + if text: + self.status.set_text(text) + self.progress.set_fraction(step/float(self.totalSteps)) + while Gtk.events_pending(): + Gtk.main_iteration() + def askCdromName(self): + return (False, "") + def changeCdrom(self): + return False + +class GtkOpProgress(apt.progress.base.OpProgress): + def __init__(self, progressbar): + self.progressbar = progressbar + #self.progressbar.set_pulse_step(0.01) + #self.progressbar.pulse() + self.fraction = 0.0 + + def update(self, percent): + #if percent > 99: + # self.progressbar.set_fraction(1) + #else: + # self.progressbar.pulse() + new_fraction = percent/100.0 + if abs(self.fraction-new_fraction) > 0.1: + self.fraction = new_fraction + self.progressbar.set_fraction(self.fraction) + while Gtk.events_pending(): + Gtk.main_iteration() + + def done(self): + self.progressbar.set_text(" ") + + +class GtkFetchProgressAdapter(FetchProgress): + # FIXME: we really should have some sort of "we are at step" + # xy in the gui + # FIXME2: we need to thing about mediaCheck here too + def __init__(self, parent): + super(GtkFetchProgressAdapter, self).__init__() + # if this is set to false the download will cancel + self.status = parent.label_status + self.progress = parent.progressbar_cache + self.parent = parent + self.canceled = False + self.button_cancel = parent.button_fetch_cancel + self.button_cancel.connect('clicked', self.cancelClicked) + def cancelClicked(self, widget): + logging.debug("cancelClicked") + self.canceled = True + def media_change(self, medium, drive): + #print "mediaChange %s %s" % (medium, drive) + msg = _("Please insert '%s' into the drive '%s'") % (medium,drive) + dialog = Gtk.MessageDialog(parent=self.parent.window_main, + flags=Gtk.DialogFlags.MODAL, + type=Gtk.MessageType.QUESTION, + buttons=Gtk.ButtonsType.OK_CANCEL) + dialog.set_markup(msg) + res = dialog.run() + dialog.set_title("") + dialog.destroy() + if res == Gtk.ResponseType.OK: + return True + return False + def start(self): + #logging.debug("start") + super(GtkFetchProgressAdapter, self).start() + self.progress.set_fraction(0) + self.status.show() + self.button_cancel.show() + def stop(self): + #logging.debug("stop") + self.progress.set_text(" ") + self.status.set_text(_("Fetching is complete")) + self.button_cancel.hide() + def pulse(self, owner): + super(GtkFetchProgressAdapter, self).pulse(owner) + # only update if there is a noticable change + if abs(self.percent-self.progress.get_fraction()*100.0) > 0.1: + self.progress.set_fraction(self.percent/100.0) + currentItem = self.current_items + 1 + if currentItem > self.total_items: + currentItem = self.total_items + if self.current_cps > 0: + self.status.set_text(_("Fetching file %li of %li at %sB/s") % ( + currentItem, self.total_items, + apt_pkg.size_to_str(self.current_cps))) + self.progress.set_text(_("About %s remaining") % FuzzyTimeToStr( + self.eta)) + else: + self.status.set_text(_("Fetching file %li of %li") % ( + currentItem, self.total_items)) + self.progress.set_text(" ") + while Gtk.events_pending(): + Gtk.main_iteration() + return (not self.canceled) + +class GtkInstallProgressAdapter(InstallProgress): + # timeout with no status change when the terminal is expanded + # automatically + TIMEOUT_TERMINAL_ACTIVITY = 300 + + def __init__(self,parent): + InstallProgress.__init__(self) + self._cache = None + self.label_status = parent.label_status + self.progress = parent.progressbar_cache + self.expander = parent.expander_terminal + self.term = parent._term + self.term.connect("child-exited", self.child_exited) + self.parent = parent + # setup the child waiting + # some options for dpkg to make it die less easily + apt_pkg.Config.set("DPkg::StopOnError","False") + + def start_update(self): + InstallProgress.start_update(self) + self.finished = False + # FIXME: add support for the timeout + # of the terminal (to display something useful then) + # -> longer term, move this code into python-apt + self.label_status.set_text(_("Applying changes")) + self.progress.set_fraction(0.0) + self.progress.set_text(" ") + self.expander.set_sensitive(True) + self.term.show() + self.term.connect("contents-changed", self._on_term_content_changed) + # if no libgtk2-perl is installed show the terminal + frontend= os.environ.get("DEBIAN_FRONTEND") or "gnome" + if frontend == "gnome" and self._cache: + if (not "libgtk2-perl" in self._cache or + not self._cache["libgtk2-perl"].is_installed): + frontend = "dialog" + self.expander.set_expanded(True) + self.env = ["VTE_PTY_KEEP_FD=%s"% self.writefd, + "APT_LISTCHANGES_FRONTEND=none"] + if not os.environ.has_key("DEBIAN_FRONTEND"): + self.env.append("DEBIAN_FRONTEND=%s" % frontend) + # do a bit of time-keeping + self.start_time = 0.0 + self.time_ui = 0.0 + self.last_activity = 0.0 + + def error(self, pkg, errormsg): + InstallProgress.error(self, pkg, errormsg) + logging.error("got an error from dpkg for pkg: '%s': '%s'" % (pkg, errormsg)) + # we do not report followup errors from earlier failures + if gettext.dgettext('dpkg', "dependency problems - leaving unconfigured") in errormsg: + return False + + #self.expander_terminal.set_expanded(True) + self.parent.dialog_error.set_transient_for(self.parent.window_main) + summary = _("Could not install '%s'") % pkg + msg = _("The upgrade will continue but the '%s' package may not " + "be in a working state. Please consider submitting a " + "bug report about it.") % pkg + markup="%s\n\n%s" % (summary, msg) + self.parent.dialog_error.realize() + self.parent.dialog_error.set_title("") + self.parent.dialog_error.get_window().set_functions(Gdk.WMFunction.MOVE) + self.parent.label_error.set_markup(markup) + self.parent.textview_error.get_buffer().set_text(utf8(errormsg)) + self.parent.scroll_error.show() + self.parent.dialog_error.run() + self.parent.dialog_error.hide() + + def conffile(self, current, new): + logging.debug("got a conffile-prompt from dpkg for file: '%s'" % current) + start = time.time() + #self.expander.set_expanded(True) + prim = _("Replace the customized configuration file\n'%s'?") % current + sec = _("You will lose any changes you have made to this " + "configuration file if you choose to replace it with " + "a newer version.") + markup = "%s \n\n%s" % (prim, sec) + self.parent.label_conffile.set_markup(markup) + self.parent.dialog_conffile.set_title("") + self.parent.dialog_conffile.set_transient_for(self.parent.window_main) + + # workaround silly dpkg + if not os.path.exists(current): + current = current+".dpkg-dist" + + # now get the diff + if os.path.exists("/usr/bin/diff"): + cmd = ["/usr/bin/diff", "-u", current, new] + diff = utf8(subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0]) + self.parent.textview_conffile.get_buffer().set_text(diff) + else: + self.parent.textview_conffile.get_buffer().set_text(_("The 'diff' command was not found")) + res = self.parent.dialog_conffile.run() + self.parent.dialog_conffile.hide() + self.time_ui += time.time() - start + # if replace, send this to the terminal + if res == Gtk.ResponseType.YES: + self.term.feed_child("y\n", -1) + else: + self.term.feed_child("n\n", -1) + + def fork(self): + pty = Vte.Pty.new(Vte.PtyFlags.DEFAULT) + pid = os.fork() + if pid == 0: + # WORKAROUND for broken feisty vte where envv does not work) + for env in self.env: + (key, value) = env.split("=") + os.environ[key] = value + # MUST be called + pty.child_setup() + # force dpkg terminal messages untranslated for better bug + # duplication detection + os.environ["DPKG_UNTRANSLATED_MESSAGES"] = "1" + else: + self.term.set_pty_object(pty) + self.term.watch_child(pid) + return pid + + def _on_term_content_changed(self, term): + """ helper function that is called when the terminal changed + to ensure that we have a accurate idea when something hangs + """ + self.last_activity = time.time() + self.activity_timeout_reported = False + + def status_change(self, pkg, percent, status): + # start the timer when the first package changes its status + if self.start_time == 0.0: + #print "setting start time to %s" % self.start_time + self.start_time = time.time() + # only update if there is a noticable change + if abs(percent-self.progress.get_fraction()*100.0) > 0.1: + self.progress.set_fraction(float(percent)/100.0) + self.label_status.set_text(status.strip()) + # start showing when we gathered some data + if percent > 1.0: + delta = self.last_activity - self.start_time + # time wasted in conffile questions (or other ui activity) + delta -= self.time_ui + time_per_percent = (float(delta)/percent) + eta = (100.0 - percent) * time_per_percent + # only show if we have some sensible data (60sec < eta < 2days) + if eta > 61.0 and eta < (60*60*24*2): + self.progress.set_text(_("About %s remaining") % FuzzyTimeToStr(eta)) + else: + self.progress.set_text(" ") + # 2 == WEBKIT_LOAD_FINISHED - the enums is not exposed via python + if (self.parent._webkit_view and + self.parent._webkit_view.get_property("load-status") == 2): + self.parent._webkit_view.execute_script('progress("%s")' % percent) + + def child_exited(self, term): + # we need to capture the full status here (not only the WEXITSTATUS) + self.apt_status = term.get_child_exit_status() + self.finished = True + + def wait_child(self): + while not self.finished: + self.update_interface() + return self.apt_status + + def finish_update(self): + self.label_status.set_text("") + + def update_interface(self): + InstallProgress.update_interface(self) + # check if we haven't started yet with packages, pulse then + if self.start_time == 0.0: + self.progress.pulse() + time.sleep(0.2) + # check about terminal activity + if self.last_activity > 0 and \ + (self.last_activity + self.TIMEOUT_TERMINAL_ACTIVITY) < time.time(): + if not self.activity_timeout_reported: + logging.warning("no activity on terminal for %s seconds (%s)" % (self.TIMEOUT_TERMINAL_ACTIVITY, self.label_status.get_text())) + self.activity_timeout_reported = True + self.parent.expander_terminal.set_expanded(True) + # process events + while Gtk.events_pending(): + Gtk.main_iteration() + time.sleep(0.01) + +class DistUpgradeVteTerminal(object): + def __init__(self, parent, term): + self.term = term + self.parent = parent + def call(self, cmd, hidden=False): + def wait_for_child(widget): + #print "wait for child finished" + self.finished=True + self.term.show() + self.term.connect("child-exited", wait_for_child) + self.parent.expander_terminal.set_sensitive(True) + if hidden==False: + self.parent.expander_terminal.set_expanded(True) + self.finished = False + (success, pid) = self.term.fork_command_full(Vte.PtyFlags.DEFAULT, + "/", + cmd, + None, + 0, # GLib.SpawnFlags + None, # child_setup + None, # child_setup_data + ) + if not success or pid < 0: + # error + return + while not self.finished: + while Gtk.events_pending(): + Gtk.main_iteration() + time.sleep(0.1) + del self.finished + +class HtmlView(object): + def __init__(self, webkit_view): + self._webkit_view = webkit_view + def open(self, url): + if not self._webkit_view: + return + self._webkit_view.open(url) + self._webkit_view.connect("load-finished", self._on_load_finished) + def show(self): + self._webkit_view.show() + def hide(self): + self._webkit_view.hide() + def _on_load_finished(self, view, frame): + view.show() + +class DistUpgradeViewGtk3(DistUpgradeView,SimpleGtkbuilderApp): + " gtk frontend of the distUpgrade tool " + def __init__(self, datadir=None, logdir=None): + DistUpgradeView.__init__(self) + self.logdir = logdir + if not datadir: + localedir=os.path.join(os.getcwd(),"mo") + gladedir=os.getcwd() + else: + localedir="/usr/share/locale/" + gladedir=os.path.join(datadir, "gtkbuilder") + + # check if we have a display etc + Gtk.init_check(sys.argv) + + try: + locale.bindtextdomain("update-manager",localedir) + gettext.textdomain("update-manager") + except Exception, e: + logging.warning("Error setting locales (%s)" % e) + + SimpleGtkbuilderApp.__init__(self, + gladedir+"/DistUpgrade.ui", + "update-manager") + + icons = Gtk.IconTheme.get_default() + try: + self.window_main.set_default_icon(icons.load_icon("system-software-update", 32, 0)) + except GObject.GError, e: + logging.debug("error setting default icon, ignoring (%s)" % e) + pass + + # terminal stuff + self.create_terminal() + + self.prev_step = 0 # keep a record of the latest step + # we don't use this currently + #self.window_main.set_keep_above(True) + self.icontheme = Gtk.IconTheme.get_default() + try: + from gi.repository import WebKit + self._webkit_view = WebKit.WebView() + self.vbox_main.pack_end(self._webkit_view, True, True, 0) + except: + logging.exception("html widget") + self._webkit_view = None + self.window_main.realize() + self.window_main.get_window().set_functions(Gdk.WMFunction.MOVE) + self._opCacheProgress = GtkOpProgress(self.progressbar_cache) + self._fetchProgress = GtkFetchProgressAdapter(self) + self._cdromProgress = GtkCdromProgressAdapter(self) + self._installProgress = GtkInstallProgressAdapter(self) + # details dialog + self.details_list = Gtk.TreeStore(GObject.TYPE_STRING) + column = Gtk.TreeViewColumn("") + render = Gtk.CellRendererText() + column.pack_start(render, True) + column.add_attribute(render, "markup", 0) + self.treeview_details.append_column(column) + self.details_list.set_sort_column_id(0, Gtk.SortType.ASCENDING) + self.treeview_details.set_model(self.details_list) + # FIXME: portme + # Use italic style in the status labels + #attrlist=Pango.AttrList() + #attr = Pango.AttrStyle(Pango.Style.ITALIC, 0, -1) + #attr = Pango.AttrScale(Pango.SCALE_SMALL, 0, -1) + #attrlist.insert(attr) + #self.label_status.set_property("attributes", attrlist) + # reasonable fault handler + sys.excepthook = self._handleException + + def _handleException(self, type, value, tb): + # we handle the exception here, hand it to apport and run the + # apport gui manually after it because we kill u-m during the upgrade + # to prevent it from poping up for reboot notifications or FF restart + # notifications or somesuch + import traceback + lines = traceback.format_exception(type, value, tb) + logging.error("not handled expection:\n%s" % "\n".join(lines)) + # we can't be sure that apport will run in the middle of a upgrade + # so we still show a error message here + apport_crash(type, value, tb) + if not run_apport(): + self.error(_("A fatal error occurred"), + _("Please report this as a bug (if you haven't already) and include the " + "files /var/log/dist-upgrade/main.log and " + "/var/log/dist-upgrade/apt.log " + "in your report. The upgrade has aborted.\n" + "Your original sources.list was saved in " + "/etc/apt/sources.list.distUpgrade."), + "\n".join(lines)) + sys.exit(1) + + def getTerminal(self): + return DistUpgradeVteTerminal(self, self._term) + def getHtmlView(self): + return HtmlView(self._webkit_view) + + def _key_press_handler(self, widget, keyev): + # user pressed ctrl-c + if len(keyev.string) == 1 and ord(keyev.string) == 3: + summary = _("Ctrl-c pressed") + msg = _("This will abort the operation and may leave the system " + "in a broken state. Are you sure you want to do that?") + res = self.askYesNoQuestion(summary, msg) + logging.warning("ctrl-c press detected, user decided to pass it " + "on: %s", res) + return not res + return False + + def create_terminal(self): + " helper to create a vte terminal " + self._term = Vte.Terminal() + self._term.connect("key-press-event", self._key_press_handler) + self._term.set_font_from_string("monospace 10") + self._terminal_lines = [] + self.hbox_custom.pack_start(self._term, True, True, 0) + self._term.realize() + self.vscrollbar_terminal = Gtk.VScrollbar() + self.vscrollbar_terminal.show() + self.hbox_custom.pack_start(self.vscrollbar_terminal, True, True, 0) + self.vscrollbar_terminal.set_adjustment(self._term.get_vadjustment()) + + try: + self._terminal_log = open(os.path.join(self.logdir,"term.log"),"w") + except Exception: + # if something goes wrong (permission denied etc), use stdout + self._terminal_log = sys.stdout + return self._term + + def getFetchProgress(self): + return self._fetchProgress + def getInstallProgress(self, cache): + self._installProgress._cache = cache + return self._installProgress + def getOpCacheProgress(self): + return self._opCacheProgress + def getCdromProgress(self): + return self._cdromProgress + def updateStatus(self, msg): + self.label_status.set_text("%s" % msg) + def hideStep(self, step): + image = getattr(self,"image_step%i" % step) + label = getattr(self,"label_step%i" % step) + #arrow = getattr(self,"arrow_step%i" % step) + image.hide() + label.hide() + def showStep(self, step): + image = getattr(self,"image_step%i" % step) + label = getattr(self,"label_step%i" % step) + image.show() + label.show() + def abort(self): + size = Gtk.IconSize.MENU + step = self.prev_step + if step > 0: + image = getattr(self,"image_step%i" % step) + arrow = getattr(self,"arrow_step%i" % step) + image.set_from_stock(Gtk.STOCK_CANCEL, size) + image.show() + arrow.hide() + def setStep(self, step): + if self.icontheme.rescan_if_needed(): + logging.debug("icon theme changed, re-reading") + # first update the "previous" step as completed + size = Gtk.IconSize.MENU + attrlist=Pango.AttrList() + if self.prev_step: + image = getattr(self,"image_step%i" % self.prev_step) + label = getattr(self,"label_step%i" % self.prev_step) + arrow = getattr(self,"arrow_step%i" % self.prev_step) + label.set_property("attributes",attrlist) + image.set_from_stock(Gtk.STOCK_APPLY, size) + image.show() + arrow.hide() + self.prev_step = step + # show the an arrow for the current step and make the label bold + image = getattr(self,"image_step%i" % step) + label = getattr(self,"label_step%i" % step) + arrow = getattr(self,"arrow_step%i" % step) + # check if that step was not hidden with hideStep() + if not label.get_property("visible"): + return + arrow.show() + image.hide() + # FIXME: portme + #attr = Pango.AttrWeight(Pango.Weight.BOLD, 0, -1) + #attrlist.insert(attr) + #label.set_property("attributes",attrlist) + + def information(self, summary, msg, extended_msg=None): + self.dialog_information.set_title("") + self.dialog_information.set_transient_for(self.window_main) + msg = "%s\n\n%s" % (summary,msg) + self.label_information.set_markup(msg) + if extended_msg != None: + buffer = self.textview_information.get_buffer() + buffer.set_text(extended_msg) + self.scroll_information.show() + else: + self.scroll_information.hide() + self.dialog_information.realize() + self.dialog_information.get_window().set_functions(Gdk.WMFunction.MOVE) + self.dialog_information.run() + self.dialog_information.hide() + while Gtk.events_pending(): + Gtk.main_iteration() + + def error(self, summary, msg, extended_msg=None): + self.dialog_error.set_title("") + self.dialog_error.set_transient_for(self.window_main) + #self.expander_terminal.set_expanded(True) + msg="%s\n\n%s" % (summary, msg) + self.label_error.set_markup(msg) + if extended_msg != None: + buffer = self.textview_error.get_buffer() + buffer.set_text(extended_msg) + self.scroll_error.show() + else: + self.scroll_error.hide() + self.dialog_error.realize() + self.dialog_error.get_window().set_functions(Gdk.WMFunction.MOVE) + self.dialog_error.run() + self.dialog_error.hide() + return False + + def confirmChanges(self, summary, changes, demotions, downloadSize, + actions=None, removal_bold=True): + # FIXME: add a whitelist here for packages that we expect to be + # removed (how to calc this automatically?) + if not DistUpgradeView.confirmChanges(self, summary, changes, + demotions, downloadSize): + return False + # append warning + self.confirmChangesMessage += "\n\n%s" % \ + _("To prevent data loss close all open " + "applications and documents.") + + if actions != None: + self.button_cancel_changes.set_use_stock(False) + self.button_cancel_changes.set_use_underline(True) + self.button_cancel_changes.set_label(actions[0]) + self.button_confirm_changes.set_label(actions[1]) + + self.label_summary.set_markup("%s" % summary) + self.label_changes.set_markup(self.confirmChangesMessage) + # fill in the details + self.details_list.clear() + for (parent_text, details_list) in ( + ( _("No longer supported by Canonical (%s)"), self.demotions), + ( _("Downgrade (%s)"), self.toDowngrade), + ( _("Remove (%s)"), self.toRemove), + ( _("No longer needed (%s)"), self.toRemoveAuto), + ( _("Install (%s)"), self.toInstall), + ( _("Upgrade (%s)"), self.toUpgrade), + ): + if details_list: + node = self.details_list.append(None, + [parent_text % len(details_list)]) + for pkg in details_list: + self.details_list.append(node, ["%s - %s" % ( + pkg.name, GLib.markup_escape_text(pkg.summary))]) + # prepare dialog + self.dialog_changes.realize() + self.dialog_changes.set_transient_for(self.window_main) + self.dialog_changes.set_title("") + self.dialog_changes.get_window().set_functions(Gdk.WMFunction.MOVE| + Gdk.WMFunction.RESIZE) + res = self.dialog_changes.run() + self.dialog_changes.hide() + if res == Gtk.ResponseType.YES: + return True + return False + + def askYesNoQuestion(self, summary, msg, default='No'): + msg = "%s\n\n%s" % (summary,msg) + dialog = Gtk.MessageDialog(parent=self.window_main, + flags=Gtk.DialogFlags.MODAL, + type=Gtk.MessageType.QUESTION, + buttons=Gtk.ButtonsType.YES_NO) + dialog.set_title("") + if default == 'No': + dialog.set_default_response(Gtk.ResponseType.NO) + else: + dialog.set_default_response(Gtk.ResponseType.YES) + dialog.set_markup(msg) + res = dialog.run() + dialog.destroy() + if res == Gtk.ResponseType.YES: + return True + return False + + def confirmRestart(self): + self.dialog_restart.set_transient_for(self.window_main) + self.dialog_restart.set_title("") + self.dialog_restart.realize() + self.dialog_restart.get_window().set_functions(Gdk.WMFunction.MOVE) + res = self.dialog_restart.run() + self.dialog_restart.hide() + if res == Gtk.ResponseType.YES: + return True + return False + + def processEvents(self): + while Gtk.events_pending(): + Gtk.main_iteration() + + def pulseProgress(self, finished=False): + self.progressbar_cache.pulse() + if finished: + self.progressbar_cache.set_fraction(1.0) + + def on_window_main_delete_event(self, widget, event): + self.dialog_cancel.set_transient_for(self.window_main) + self.dialog_cancel.set_title("") + self.dialog_cancel.realize() + self.dialog_cancel.get_window().set_functions(Gdk.WMFunction.MOVE) + res = self.dialog_cancel.run() + self.dialog_cancel.hide() + if res == Gtk.ResponseType.CANCEL: + sys.exit(1) + return True + +if __name__ == "__main__": + + view = DistUpgradeViewGtk3() + fp = GtkFetchProgressAdapter(view) + ip = GtkInstallProgressAdapter(view) + + view.getTerminal().call(["/usr/bin/dpkg","--configure","-a"]) + Gtk.main() + sys.exit(0) + + cache = apt.Cache() + for pkg in sys.argv[1:]: + if cache[pkg].is_installed: + cache[pkg].mark_delete() + else: + cache[pkg].mark_install() + cache.commit(fp,ip) + Gtk.main() + + #sys.exit(0) + ip.conffile("TODO","TODO~") + view.getTerminal().call(["/usr/bin/dpkg","--configure","-a"]) + #view.getTerminal().call(["ls","-R","/usr"]) + view.error("short","long", + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + ) + view.confirmChanges("xx",[], 100) diff -Nru update-manager-17.10.11/DistUpgrade/DistUpgradeViewGtk.py update-manager-0.156.14.15/DistUpgrade/DistUpgradeViewGtk.py --- update-manager-17.10.11/DistUpgrade/DistUpgradeViewGtk.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DistUpgradeViewGtk.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,748 @@ +# DistUpgradeViewGtk.py +# +# Copyright (c) 2004-2006 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import pygtk +pygtk.require('2.0') +import glib +import gtk +import gtk.gdk +import vte +import gobject +import pango +import sys +import locale +import logging +import time +import subprocess + +import apt +import apt_pkg +import os + +from DistUpgradeApport import run_apport, apport_crash + +from DistUpgradeView import DistUpgradeView, FuzzyTimeToStr, InstallProgress, FetchProgress +from SimpleGtkbuilderApp import SimpleGtkbuilderApp + +import gettext +from DistUpgradeGettext import gettext as _ + +gobject.threads_init() + +def utf8(str): + return unicode(str, 'latin1').encode('utf-8') + +class GtkCdromProgressAdapter(apt.progress.CdromProgress): + """ Report the cdrom add progress + Subclass this class to implement cdrom add progress reporting + """ + def __init__(self, parent): + self.status = parent.label_status + self.progress = parent.progressbar_cache + self.parent = parent + def update(self, text, step): + """ update is called regularly so that the gui can be redrawn """ + if text: + self.status.set_text(text) + self.progress.set_fraction(step/float(self.totalSteps)) + while gtk.events_pending(): + gtk.main_iteration() + def askCdromName(self): + return (False, "") + def changeCdrom(self): + return False + +class GtkOpProgress(apt.progress.base.OpProgress): + def __init__(self, progressbar): + self.progressbar = progressbar + #self.progressbar.set_pulse_step(0.01) + #self.progressbar.pulse() + self.fraction = 0.0 + + def update(self, percent): + #if percent > 99: + # self.progressbar.set_fraction(1) + #else: + # self.progressbar.pulse() + new_fraction = percent/100.0 + if abs(self.fraction-new_fraction) > 0.1: + self.fraction = new_fraction + self.progressbar.set_fraction(self.fraction) + while gtk.events_pending(): + gtk.main_iteration() + + def done(self): + self.progressbar.set_text(" ") + + +class GtkFetchProgressAdapter(FetchProgress): + # FIXME: we really should have some sort of "we are at step" + # xy in the gui + # FIXME2: we need to thing about mediaCheck here too + def __init__(self, parent): + super(GtkFetchProgressAdapter, self).__init__() + # if this is set to false the download will cancel + self.status = parent.label_status + self.progress = parent.progressbar_cache + self.parent = parent + self.canceled = False + self.button_cancel = parent.button_fetch_cancel + self.button_cancel.connect('clicked', self.cancelClicked) + def cancelClicked(self, widget): + logging.debug("cancelClicked") + self.canceled = True + def media_change(self, medium, drive): + #print "mediaChange %s %s" % (medium, drive) + msg = _("Please insert '%s' into the drive '%s'") % (medium,drive) + dialog = gtk.MessageDialog(parent=self.parent.window_main, + flags=gtk.DIALOG_MODAL, + type=gtk.MESSAGE_QUESTION, + buttons=gtk.BUTTONS_OK_CANCEL) + dialog.set_markup(msg) + res = dialog.run() + dialog.set_title("") + dialog.destroy() + if res == gtk.RESPONSE_OK: + return True + return False + def start(self): + #logging.debug("start") + super(GtkFetchProgressAdapter, self).start() + self.progress.set_fraction(0) + self.status.show() + self.button_cancel.show() + def stop(self): + #logging.debug("stop") + self.progress.set_text(" ") + self.status.set_text(_("Fetching is complete")) + self.button_cancel.hide() + def pulse(self, owner): + super(GtkFetchProgressAdapter, self).pulse(owner) + # only update if there is a noticable change + if abs(self.percent-self.progress.get_fraction()*100.0) > 0.1: + self.progress.set_fraction(self.percent/100.0) + currentItem = self.current_items + 1 + if currentItem > self.total_items: + currentItem = self.total_items + if self.current_cps > 0: + self.status.set_text(_("Fetching file %li of %li at %sB/s") % ( + currentItem, self.total_items, + apt_pkg.size_to_str(self.current_cps))) + self.progress.set_text(_("About %s remaining") % FuzzyTimeToStr( + self.eta)) + else: + self.status.set_text(_("Fetching file %li of %li") % ( + currentItem, self.total_items)) + self.progress.set_text(" ") + while gtk.events_pending(): + gtk.main_iteration() + return (not self.canceled) + +class GtkInstallProgressAdapter(InstallProgress): + # timeout with no status change when the terminal is expanded + # automatically + TIMEOUT_TERMINAL_ACTIVITY = 240 + + def __init__(self,parent): + InstallProgress.__init__(self) + self._cache = None + self.label_status = parent.label_status + self.progress = parent.progressbar_cache + self.expander = parent.expander_terminal + self.term = parent._term + self.term.connect("child-exited", self.child_exited) + self.parent = parent + # setup the child waiting + # some options for dpkg to make it die less easily + apt_pkg.Config.set("DPkg::StopOnError","False") + + def start_update(self): + InstallProgress.start_update(self) + self.finished = False + # FIXME: add support for the timeout + # of the terminal (to display something useful then) + # -> longer term, move this code into python-apt + self.label_status.set_text(_("Applying changes")) + self.progress.set_fraction(0.0) + self.progress.set_text(" ") + self.expander.set_sensitive(True) + self.term.show() + # if no libgtk2-perl is installed show the terminal + frontend= os.environ.get("DEBIAN_FRONTEND") or "gnome" + if frontend == "gnome" and self._cache: + if (not "libgtk2-perl" in self._cache or + not self._cache["libgtk2-perl"].is_installed): + frontend = "dialog" + self.expander.set_expanded(True) + self.env = ["VTE_PTY_KEEP_FD=%s"% self.writefd, + "APT_LISTCHANGES_FRONTEND=none"] + if not os.environ.has_key("DEBIAN_FRONTEND"): + self.env.append("DEBIAN_FRONTEND=%s" % frontend) + # do a bit of time-keeping + self.start_time = 0.0 + self.time_ui = 0.0 + self.last_activity = 0.0 + + def error(self, pkg, errormsg): + InstallProgress.error(self, pkg, errormsg) + logging.error("got an error from dpkg for pkg: '%s': '%s'" % (pkg, errormsg)) + # we do not report followup errors from earlier failures + if gettext.dgettext('dpkg', "dependency problems - leaving unconfigured") in errormsg: + return False + + #self.expander_terminal.set_expanded(True) + self.parent.dialog_error.set_transient_for(self.parent.window_main) + summary = _("Could not install '%s'") % pkg + msg = _("The upgrade will continue but the '%s' package may not " + "be in a working state. Please consider submitting a " + "bug report about it.") % pkg + markup="%s\n\n%s" % (summary, msg) + self.parent.dialog_error.realize() + self.parent.dialog_error.set_title("") + self.parent.dialog_error.window.set_functions(gtk.gdk.FUNC_MOVE) + self.parent.label_error.set_markup(markup) + self.parent.textview_error.get_buffer().set_text(utf8(errormsg)) + self.parent.scroll_error.show() + self.parent.dialog_error.run() + self.parent.dialog_error.hide() + + def conffile(self, current, new): + logging.debug("got a conffile-prompt from dpkg for file: '%s'" % current) + start = time.time() + #self.expander.set_expanded(True) + prim = _("Replace the customized configuration file\n'%s'?") % current + sec = _("You will lose any changes you have made to this " + "configuration file if you choose to replace it with " + "a newer version.") + markup = "%s \n\n%s" % (prim, sec) + self.parent.label_conffile.set_markup(markup) + self.parent.dialog_conffile.set_title("") + self.parent.dialog_conffile.set_transient_for(self.parent.window_main) + + # workaround silly dpkg + if not os.path.exists(current): + current = current+".dpkg-dist" + + # now get the diff + if os.path.exists("/usr/bin/diff"): + cmd = ["/usr/bin/diff", "-u", current, new] + diff = utf8(subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0]) + self.parent.textview_conffile.get_buffer().set_text(diff) + else: + self.parent.textview_conffile.get_buffer().set_text(_("The 'diff' command was not found")) + res = self.parent.dialog_conffile.run() + self.parent.dialog_conffile.hide() + self.time_ui += time.time() - start + # if replace, send this to the terminal + if res == gtk.RESPONSE_YES: + self.term.feed_child("y\n", -1) + else: + self.term.feed_child("n\n", -1) + + def fork(self): + pid = self.term.forkpty(envv=self.env) + if pid == 0: + # WORKAROUND for broken feisty vte where envv does not work) + for env in self.env: + (key, value) = env.split("=") + os.environ[key] = value + # force dpkg terminal messages untranslated for better bug + # duplication detection + os.environ["DPKG_UNTRANSLATED_MESSAGES"] = "1" + # HACK to work around bug in python/vte and unregister the logging + # atexit func in the child + sys.exitfunc = lambda: True + return pid + + def status_change(self, pkg, percent, status): + # start the timer when the first package changes its status + if self.start_time == 0.0: + #print "setting start time to %s" % self.start_time + self.start_time = time.time() + # only update if there is a noticable change + if abs(percent-self.progress.get_fraction()*100.0) > 0.1: + self.progress.set_fraction(float(percent)/100.0) + self.label_status.set_text(status.strip()) + # start showing when we gathered some data + if percent > 1.0: + self.last_activity = time.time() + self.activity_timeout_reported = False + delta = self.last_activity - self.start_time + # time wasted in conffile questions (or other ui activity) + delta -= self.time_ui + time_per_percent = (float(delta)/percent) + eta = (100.0 - percent) * time_per_percent + # only show if we have some sensible data (60sec < eta < 2days) + if eta > 61.0 and eta < (60*60*24*2): + self.progress.set_text(_("About %s remaining") % FuzzyTimeToStr(eta)) + else: + self.progress.set_text(" ") + # 2 == WEBKIT_LOAD_FINISHED - the enums is not exposed via python + if (self.parent._webkit_view and + self.parent._webkit_view.get_property("load-status") == 2): + self.parent._webkit_view.execute_script('progress("%s")' % percent) + + def child_exited(self, term): + # we need to capture the full status here (not only the WEXITSTATUS) + self.apt_status = term.get_child_exit_status() + self.finished = True + + def wait_child(self): + while not self.finished: + self.update_interface() + return self.apt_status + + def finish_update(self): + self.label_status.set_text("") + + def update_interface(self): + InstallProgress.update_interface(self) + # check if we haven't started yet with packages, pulse then + if self.start_time == 0.0: + self.progress.pulse() + time.sleep(0.2) + # check about terminal activity + if self.last_activity > 0 and \ + (self.last_activity + self.TIMEOUT_TERMINAL_ACTIVITY) < time.time(): + if not self.activity_timeout_reported: + logging.warning("no activity on terminal for %s seconds (%s)" % (self.TIMEOUT_TERMINAL_ACTIVITY, self.label_status.get_text())) + self.activity_timeout_reported = True + self.parent.expander_terminal.set_expanded(True) + # process events + while gtk.events_pending(): + gtk.main_iteration() + time.sleep(0.01) + +class DistUpgradeVteTerminal(object): + def __init__(self, parent, term): + self.term = term + self.parent = parent + def call(self, cmd, hidden=False): + def wait_for_child(widget): + #print "wait for child finished" + self.finished=True + self.term.show() + self.term.connect("child-exited", wait_for_child) + self.parent.expander_terminal.set_sensitive(True) + if hidden==False: + self.parent.expander_terminal.set_expanded(True) + self.finished = False + pid = self.term.fork_command(command=cmd[0],argv=cmd) + if pid < 0: + # error + return + while not self.finished: + while gtk.events_pending(): + gtk.main_iteration() + time.sleep(0.1) + del self.finished + +class HtmlView(object): + def __init__(self, webkit_view): + self._webkit_view = webkit_view + def open(self, url): + if not self._webkit_view: + return + self._webkit_view.open(url) + self._webkit_view.connect("load-finished", self._on_load_finished) + def show(self): + self._webkit_view.show() + def hide(self): + self._webkit_view.hide() + def _on_load_finished(self, view, frame): + view.show() + +class DistUpgradeViewGtk(DistUpgradeView,SimpleGtkbuilderApp): + " gtk frontend of the distUpgrade tool " + def __init__(self, datadir=None, logdir=None): + DistUpgradeView.__init__(self) + self.logdir = logdir + if not datadir: + localedir=os.path.join(os.getcwd(),"mo") + gladedir=os.getcwd() + else: + localedir="/usr/share/locale/" + gladedir=os.path.join(datadir, "gtkbuilder") + + # check if we have a display etc + gtk.init_check() + + try: + locale.bindtextdomain("update-manager",localedir) + gettext.textdomain("update-manager") + except Exception, e: + logging.warning("Error setting locales (%s)" % e) + + icons = gtk.icon_theme_get_default() + try: + gtk.window_set_default_icon(icons.load_icon("system-software-update", 32, 0)) + except gobject.GError, e: + logging.debug("error setting default icon, ignoring (%s)" % e) + pass + SimpleGtkbuilderApp.__init__(self, + gladedir+"/DistUpgrade.ui", + "update-manager") + # terminal stuff + self.create_terminal() + + self.prev_step = 0 # keep a record of the latest step + # we don't use this currently + #self.window_main.set_keep_above(True) + self.icontheme = gtk.icon_theme_get_default() + # we keep a reference pngloader around so that its in memory + # -> this avoid the issue that during the dapper->edgy upgrade + # the loaders move from /usr/lib/gtk/2.4.0/loaders to 2.10.0 + self.pngloader = gtk.gdk.PixbufLoader("png") + try: + self.svgloader = gtk.gdk.PixbufLoader("svg") + self.svgloader.close() + except gobject.GError, e: + logging.debug("svg pixbuf loader failed (%s)" % e) + pass + try: + import webkit + self._webkit_view = webkit.WebView() + self.vbox_main.pack_end(self._webkit_view) + except: + logging.exception("html widget") + self._webkit_view = None + self.window_main.realize() + self.window_main.window.set_functions(gtk.gdk.FUNC_MOVE) + self._opCacheProgress = GtkOpProgress(self.progressbar_cache) + self._fetchProgress = GtkFetchProgressAdapter(self) + self._cdromProgress = GtkCdromProgressAdapter(self) + self._installProgress = GtkInstallProgressAdapter(self) + # details dialog + self.details_list = gtk.TreeStore(gobject.TYPE_STRING) + column = gtk.TreeViewColumn("") + render = gtk.CellRendererText() + column.pack_start(render, True) + column.add_attribute(render, "markup", 0) + self.treeview_details.append_column(column) + self.details_list.set_sort_column_id(0, gtk.SORT_ASCENDING) + self.treeview_details.set_model(self.details_list) + # Use italic style in the status labels + attrlist=pango.AttrList() + #attr = pango.AttrStyle(pango.STYLE_ITALIC, 0, -1) + attr = pango.AttrScale(pango.SCALE_SMALL, 0, -1) + attrlist.insert(attr) + self.label_status.set_property("attributes", attrlist) + # reasonable fault handler + sys.excepthook = self._handleException + + def _handleException(self, type, value, tb): + # we handle the exception here, hand it to apport and run the + # apport gui manually after it because we kill u-m during the upgrade + # to prevent it from poping up for reboot notifications or FF restart + # notifications or somesuch + import traceback + lines = traceback.format_exception(type, value, tb) + logging.error("not handled expection:\n%s" % "\n".join(lines)) + # we can't be sure that apport will run in the middle of a upgrade + # so we still show a error message here + apport_crash(type, value, tb) + if not run_apport(): + self.error(_("A fatal error occurred"), + _("Please report this as a bug (if you haven't already) and include the " + "files /var/log/dist-upgrade/main.log and " + "/var/log/dist-upgrade/apt.log " + "in your report. The upgrade has aborted.\n" + "Your original sources.list was saved in " + "/etc/apt/sources.list.distUpgrade."), + "\n".join(lines)) + sys.exit(1) + + def getTerminal(self): + return DistUpgradeVteTerminal(self, self._term) + def getHtmlView(self): + return HtmlView(self._webkit_view) + + def _key_press_handler(self, widget, keyev): + # user pressed ctrl-c + if len(keyev.string) == 1 and ord(keyev.string) == 3: + summary = _("Ctrl-c pressed") + msg = _("This will abort the operation and may leave the system " + "in a broken state. Are you sure you want to do that?") + res = self.askYesNoQuestion(summary, msg) + logging.warning("ctrl-c press detected, user decided to pass it " + "on: %s", res) + return not res + return False + + def create_terminal(self): + " helper to create a vte terminal " + self._term = vte.Terminal() + self._term.connect("key-press-event", self._key_press_handler) + self._term.set_font_from_string("monospace 10") + self._term.connect("contents-changed", self._term_content_changed) + self._terminal_lines = [] + self.hbox_custom.pack_start(self._term) + self._term.realize() + self.vscrollbar_terminal = gtk.VScrollbar() + self.vscrollbar_terminal.show() + self.hbox_custom.pack_start(self.vscrollbar_terminal) + self.vscrollbar_terminal.set_adjustment(self._term.get_adjustment()) + try: + self._terminal_log = open(os.path.join(self.logdir,"term.log"),"w") + except Exception: + # if something goes wrong (permission denied etc), use stdout + self._terminal_log = sys.stdout + return self._term + + def _term_content_changed(self, term): + " called when the *visible* part of the terminal changes " + # get the current visible text, + current_text = self._term.get_text(lambda a,b,c,d: True) + # see what we have currently and only print stuff that wasn't + # visible last time + new_lines = [] + for line in current_text.split("\n"): + new_lines.append(line) + if not line in self._terminal_lines: + self._terminal_log.write(line+"\n") + try: + self._terminal_log.flush() + except IOError: + logging.exception("flush()") + self._terminal_lines = new_lines + def getFetchProgress(self): + return self._fetchProgress + def getInstallProgress(self, cache): + self._installProgress._cache = cache + return self._installProgress + def getOpCacheProgress(self): + return self._opCacheProgress + def getCdromProgress(self): + return self._cdromProgress + def updateStatus(self, msg): + self.label_status.set_text("%s" % msg) + def hideStep(self, step): + image = getattr(self,"image_step%i" % step) + label = getattr(self,"label_step%i" % step) + #arrow = getattr(self,"arrow_step%i" % step) + image.hide() + label.hide() + def showStep(self, step): + image = getattr(self,"image_step%i" % step) + label = getattr(self,"label_step%i" % step) + image.show() + label.show() + def abort(self): + size = gtk.ICON_SIZE_MENU + step = self.prev_step + if step > 0: + image = getattr(self,"image_step%i" % step) + arrow = getattr(self,"arrow_step%i" % step) + image.set_from_stock(gtk.STOCK_CANCEL, size) + image.show() + arrow.hide() + def setStep(self, step): + if self.icontheme.rescan_if_needed(): + logging.debug("icon theme changed, re-reading") + # first update the "previous" step as completed + size = gtk.ICON_SIZE_MENU + attrlist=pango.AttrList() + if self.prev_step: + image = getattr(self,"image_step%i" % self.prev_step) + label = getattr(self,"label_step%i" % self.prev_step) + arrow = getattr(self,"arrow_step%i" % self.prev_step) + label.set_property("attributes",attrlist) + image.set_from_stock(gtk.STOCK_APPLY, size) + image.show() + arrow.hide() + self.prev_step = step + # show the an arrow for the current step and make the label bold + image = getattr(self,"image_step%i" % step) + label = getattr(self,"label_step%i" % step) + arrow = getattr(self,"arrow_step%i" % step) + # check if that step was not hidden with hideStep() + if not label.get_property("visible"): + return + arrow.show() + image.hide() + attr = pango.AttrWeight(pango.WEIGHT_BOLD, 0, -1) + attrlist.insert(attr) + label.set_property("attributes",attrlist) + + def information(self, summary, msg, extended_msg=None): + self.dialog_information.set_title("") + self.dialog_information.set_transient_for(self.window_main) + msg = "%s\n\n%s" % (summary,msg) + self.label_information.set_markup(msg) + if extended_msg != None: + buffer = self.textview_information.get_buffer() + buffer.set_text(extended_msg) + self.scroll_information.show() + else: + self.scroll_information.hide() + self.dialog_information.realize() + self.dialog_information.window.set_functions(gtk.gdk.FUNC_MOVE) + self.dialog_information.run() + self.dialog_information.hide() + while gtk.events_pending(): + gtk.main_iteration() + + def error(self, summary, msg, extended_msg=None): + self.dialog_error.set_title("") + self.dialog_error.set_transient_for(self.window_main) + #self.expander_terminal.set_expanded(True) + msg="%s\n\n%s" % (summary, msg) + self.label_error.set_markup(msg) + if extended_msg != None: + buffer = self.textview_error.get_buffer() + buffer.set_text(extended_msg) + self.scroll_error.show() + else: + self.scroll_error.hide() + self.dialog_error.realize() + self.dialog_error.window.set_functions(gtk.gdk.FUNC_MOVE) + self.dialog_error.run() + self.dialog_error.hide() + return False + + def confirmChanges(self, summary, changes, demotions, downloadSize, + actions=None, removal_bold=True): + # FIXME: add a whitelist here for packages that we expect to be + # removed (how to calc this automatically?) + if not DistUpgradeView.confirmChanges(self, summary, changes, + demotions, downloadSize): + return False + # append warning + self.confirmChangesMessage += "\n\n%s" % \ + _("To prevent data loss close all open " + "applications and documents.") + + if actions != None: + self.button_cancel_changes.set_use_stock(False) + self.button_cancel_changes.set_use_underline(True) + self.button_cancel_changes.set_label(actions[0]) + self.button_confirm_changes.set_label(actions[1]) + + self.label_summary.set_markup("%s" % summary) + self.label_changes.set_markup(self.confirmChangesMessage) + # fill in the details + self.details_list.clear() + for (parent_text, details_list) in ( + ( _("No longer supported by Canonical (%s)"), self.demotions), + ( _("Downgrade (%s)"), self.toDowngrade), + ( _("Remove (%s)"), self.toRemove), + ( _("No longer needed (%s)"), self.toRemoveAuto), + ( _("Install (%s)"), self.toInstall), + ( _("Upgrade (%s)"), self.toUpgrade), + ): + if details_list: + node = self.details_list.append(None, + [parent_text % len(details_list)]) + for pkg in details_list: + self.details_list.append(node, ["%s - %s" % ( + pkg.name, glib.markup_escape_text(pkg.summary))]) + # prepare dialog + self.dialog_changes.realize() + self.dialog_changes.set_transient_for(self.window_main) + self.dialog_changes.set_title("") + self.dialog_changes.window.set_functions(gtk.gdk.FUNC_MOVE| + gtk.gdk.FUNC_RESIZE) + res = self.dialog_changes.run() + self.dialog_changes.hide() + if res == gtk.RESPONSE_YES: + return True + return False + + def askYesNoQuestion(self, summary, msg, default='No'): + msg = "%s\n\n%s" % (summary,msg) + dialog = gtk.MessageDialog(parent=self.window_main, + flags=gtk.DIALOG_MODAL, + type=gtk.MESSAGE_QUESTION, + buttons=gtk.BUTTONS_YES_NO) + dialog.set_title("") + if default == 'No': + dialog.set_default_response(gtk.RESPONSE_NO) + else: + dialog.set_default_response(gtk.RESPONSE_YES) + dialog.set_markup(msg) + res = dialog.run() + dialog.destroy() + if res == gtk.RESPONSE_YES: + return True + return False + + def confirmRestart(self): + self.dialog_restart.set_transient_for(self.window_main) + self.dialog_restart.set_title("") + self.dialog_restart.realize() + self.dialog_restart.window.set_functions(gtk.gdk.FUNC_MOVE) + res = self.dialog_restart.run() + self.dialog_restart.hide() + if res == gtk.RESPONSE_YES: + return True + return False + + def processEvents(self): + while gtk.events_pending(): + gtk.main_iteration() + + def pulseProgress(self, finished=False): + self.progressbar_cache.pulse() + if finished: + self.progressbar_cache.set_fraction(1.0) + + def on_window_main_delete_event(self, widget, event): + self.dialog_cancel.set_transient_for(self.window_main) + self.dialog_cancel.set_title("") + self.dialog_cancel.realize() + self.dialog_cancel.window.set_functions(gtk.gdk.FUNC_MOVE) + res = self.dialog_cancel.run() + self.dialog_cancel.hide() + if res == gtk.RESPONSE_CANCEL: + sys.exit(1) + return True + +if __name__ == "__main__": + + view = DistUpgradeViewGtk() + fp = GtkFetchProgressAdapter(view) + ip = GtkInstallProgressAdapter(view) + + cache = apt.Cache() + for pkg in sys.argv[1:]: + if cache[pkg].is_installed: + cache[pkg].mark_delete() + else: + cache[pkg].mark_install() + cache.commit(fp,ip) + gtk.main() + sys.exit(0) + + #sys.exit(0) + ip.conffile("TODO","TODO~") + view.getTerminal().call(["dpkg","--configure","-a"]) + #view.getTerminal().call(["ls","-R","/usr"]) + view.error("short","long", + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + ) + view.confirmChanges("xx",[], 100) + diff -Nru update-manager-17.10.11/DistUpgrade/DistUpgradeViewKDE.py update-manager-0.156.14.15/DistUpgrade/DistUpgradeViewKDE.py --- update-manager-17.10.11/DistUpgrade/DistUpgradeViewKDE.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DistUpgradeViewKDE.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,863 @@ +# DistUpgradeViewKDE.py +# +# Copyright (c) 2007 Canonical Ltd +# +# Author: Jonathan Riddell +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +from PyQt4.QtCore import QUrl, Qt, SIGNAL, QTimer +from PyQt4.QtGui import ( + QDesktopServices, QDialog, QPixmap, QTreeWidgetItem, QMessageBox, + QApplication, QTextEdit, QTextOption, QTextCursor, QPushButton, + QWidget, QIcon, QHBoxLayout, QLabel + ) +from PyQt4 import uic + +import sys +import logging +import time +import subprocess +import traceback +import tempfile + +import apt +import apt_pkg +import os +import shutil + +import pty + +from DistUpgradeApport import run_apport, apport_crash + +from DistUpgradeView import DistUpgradeView, FuzzyTimeToStr, InstallProgress, FetchProgress + +import select +import gettext +from DistUpgradeGettext import gettext as gett + +def _(str): + return unicode(gett(str), 'UTF-8') + +def utf8(str): + if isinstance(str, unicode): + return str + return unicode(str, 'UTF-8') + +def loadUi(file, parent): + if os.path.exists(file): + uic.loadUi(file, parent) + else: + #FIXME find file + print "error, can't find file: " + file + +class DumbTerminal(QTextEdit): + """ A very dumb terminal """ + def __init__(self, installProgress, parent_frame): + " really dumb terminal with simple editing support " + QTextEdit.__init__(self, "", parent_frame) + self.installProgress = installProgress + self.setFontFamily("Monospace") + self.setFontPointSize(8) + self.setWordWrapMode(QTextOption.NoWrap) + self.setUndoRedoEnabled(False) + self.setOverwriteMode(True) + self._block = False + #self.connect(self, SIGNAL("cursorPositionChanged()"), + # self.onCursorPositionChanged) + + def fork(self): + """pty voodoo""" + (self.child_pid, self.installProgress.master_fd) = pty.fork() + if self.child_pid == 0: + os.environ["TERM"] = "dumb" + return self.child_pid + + def update_interface(self): + (rlist, wlist, xlist) = select.select([self.installProgress.master_fd],[],[], 0) + if len(rlist) > 0: + line = os.read(self.installProgress.master_fd, 255) + self.insertWithTermCodes(utf8(line)) + QApplication.processEvents() + + def insertWithTermCodes(self, text): + """ support basic terminal codes """ + display_text = "" + for c in text: + # \b - backspace - this seems to comes as "^H" now ??! + if ord(c) == 8: + self.insertPlainText(display_text) + self.textCursor().deletePreviousChar() + display_text="" + # \r - is filtered out + elif c == chr(13): + pass + # \a - bell - ignore for now + elif c == chr(7): + pass + else: + display_text += c + self.insertPlainText(display_text) + + def keyPressEvent(self, ev): + """ send (ascii) key events to the pty """ + # no master_fd yet + if not hasattr(self.installProgress, "master_fd"): + return + # special handling for backspace + if ev.key() == Qt.Key_Backspace: + #print "sent backspace" + os.write(self.installProgress.master_fd, chr(8)) + return + # do nothing for events like "shift" + if not ev.text(): + return + # now sent the key event to the termianl as utf-8 + os.write(self.installProgress.master_fd, ev.text().toUtf8()) + + def onCursorPositionChanged(self): + """ helper that ensures that the cursor is always at the end """ + if self._block: + return + # block signals so that we do not run into a recursion + self._block = True + self.moveCursor(QTextCursor.End) + self._block = False + +class KDECdromProgressAdapter(apt.progress.CdromProgress): + """ Report the cdrom add progress """ + def __init__(self, parent): + self.status = parent.window_main.label_status + self.progressbar = parent.window_main.progressbar_cache + self.parent = parent + + def update(self, text, step): + """ update is called regularly so that the gui can be redrawn """ + if text: + self.status.setText(text) + self.progressbar.setValue(step/float(self.totalSteps)) + QApplication.processEvents() + + def askCdromName(self): + return (False, "") + + def changeCdrom(self): + return False + +class KDEOpProgress(apt.progress.base.OpProgress): + """ methods on the progress bar """ + def __init__(self, progressbar, progressbar_label): + self.progressbar = progressbar + self.progressbar_label = progressbar_label + #self.progressbar.set_pulse_step(0.01) + #self.progressbar.pulse() + + def update(self, percent): + #if percent > 99: + # self.progressbar.set_fraction(1) + #else: + # self.progressbar.pulse() + #self.progressbar.set_fraction(percent/100.0) + self.progressbar.setValue(percent) + QApplication.processEvents() + + def done(self): + self.progressbar_label.setText("") + +class KDEFetchProgressAdapter(FetchProgress): + """ methods for updating the progress bar while fetching packages """ + # FIXME: we really should have some sort of "we are at step" + # xy in the gui + # FIXME2: we need to thing about mediaCheck here too + def __init__(self, parent): + FetchProgress.__init__(self) + # if this is set to false the download will cancel + self.status = parent.window_main.label_status + self.progress = parent.window_main.progressbar_cache + self.parent = parent + + def media_change(self, medium, drive): + msg = _("Please insert '%s' into the drive '%s'") % (medium,drive) + change = QMessageBox.question(self.parent.window_main, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) + if change == QMessageBox.Ok: + return True + return False + + def start(self): + FetchProgress.start(self) + #self.progress.show() + self.progress.setValue(0) + self.status.show() + + def stop(self): + self.parent.window_main.progress_text.setText(" ") + self.status.setText(_("Fetching is complete")) + + def pulse(self, owner): + """ we don't have a mainloop in this application, we just call processEvents here and elsewhere""" + # FIXME: move the status_str and progress_str into python-apt + # (python-apt need i18n first for this) + FetchProgress.pulse(self, owner) + self.progress.setValue(self.percent) + current_item = self.current_items + 1 + if current_item > self.total_items: + current_item = self.total_items + + if self.current_cps > 0: + self.status.setText(_("Fetching file %li of %li at %sB/s") % (current_item, self.total_items, apt_pkg.size_to_str(self.current_cps))) + self.parent.window_main.progress_text.setText("" + _("About %s remaining") % unicode(FuzzyTimeToStr(self.eta), 'utf-8') + "") + else: + self.status.setText(_("Fetching file %li of %li") % (current_item, self.total_items)) + self.parent.window_main.progress_text.setText(" ") + + QApplication.processEvents() + return True + +class KDEInstallProgressAdapter(InstallProgress): + """methods for updating the progress bar while installing packages""" + # timeout with no status change when the terminal is expanded + # automatically + TIMEOUT_TERMINAL_ACTIVITY = 240 + + def __init__(self,parent): + InstallProgress.__init__(self) + self._cache = None + self.label_status = parent.window_main.label_status + self.progress = parent.window_main.progressbar_cache + self.progress_text = parent.window_main.progress_text + self.parent = parent + try: + self._terminal_log = open("/var/log/dist-upgrade/term.log","w") + except Exception, e: + # if something goes wrong (permission denied etc), use stdout + logging.error("Can not open terminal log: '%s'" % e) + self._terminal_log = sys.stdout + # some options for dpkg to make it die less easily + apt_pkg.config.set("DPkg::StopOnError","False") + + def start_update(self): + InstallProgress.start_update(self) + self.finished = False + # FIXME: add support for the timeout + # of the terminal (to display something useful then) + # -> longer term, move this code into python-apt + self.label_status.setText(_("Applying changes")) + self.progress.setValue(0) + self.progress_text.setText(" ") + # do a bit of time-keeping + self.start_time = 0.0 + self.time_ui = 0.0 + self.last_activity = 0.0 + self.parent.window_main.showTerminalButton.setEnabled(True) + + def error(self, pkg, errormsg): + InstallProgress.error(self, pkg, errormsg) + logging.error("got an error from dpkg for pkg: '%s': '%s'" % (pkg, errormsg)) + # we do not report followup errors from earlier failures + if gettext.dgettext('dpkg', "dependency problems - leaving unconfigured") in errormsg: + return False + summary = _("Could not install '%s'") % pkg + msg = _("The upgrade will continue but the '%s' package may not " + "be in a working state. Please consider submitting a " + "bug report about it.") % pkg + msg = "%s
%s" % (summary, msg) + + dialogue = QDialog(self.parent.window_main) + loadUi("dialog_error.ui", dialogue) + self.parent.translate_widget_children(dialogue) + dialogue.label_error.setText(utf8(msg)) + if errormsg != None: + dialogue.textview_error.setText(utf8(errormsg)) + dialogue.textview_error.show() + else: + dialogue.textview_error.hide() + dialogue.connect(dialogue.button_bugreport, SIGNAL("clicked()"), self.parent.reportBug) + dialogue.exec_() + + def conffile(self, current, new): + """ask question in case conffile has been changed by user""" + logging.debug("got a conffile-prompt from dpkg for file: '%s'" % current) + start = time.time() + prim = _("Replace the customized configuration file\n'%s'?") % current + sec = _("You will lose any changes you have made to this " + "configuration file if you choose to replace it with " + "a newer version.") + markup = "%s \n\n%s" % (prim, sec) + self.confDialogue = QDialog(self.parent.window_main) + loadUi("dialog_conffile.ui", self.confDialogue) + self.confDialogue.label_conffile.setText(markup) + self.confDialogue.textview_conffile.hide() + #FIXME, below to be tested + #self.confDialogue.resize(self.confDialogue.minimumSizeHint()) + self.confDialogue.connect(self.confDialogue.show_difference_button, SIGNAL("clicked()"), self.showConffile) + + # workaround silly dpkg + if not os.path.exists(current): + current = current+".dpkg-dist" + + # now get the diff + if os.path.exists("/usr/bin/diff"): + cmd = ["/usr/bin/diff", "-u", current, new] + diff = utf8(subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0]) + self.confDialogue.textview_conffile.setText(diff) + else: + self.confDialogue.textview_conffile.setText(_("The 'diff' command was not found")) + result = self.confDialogue.exec_() + self.time_ui += time.time() - start + # if replace, send this to the terminal + if result == QDialog.Accepted: + os.write(self.master_fd, "y\n") + else: + os.write(self.master_fd, "n\n") + + def showConffile(self): + if self.confDialogue.textview_conffile.isVisible(): + self.confDialogue.textview_conffile.hide() + self.confDialogue.show_difference_button.setText(_("Show Difference >>>")) + else: + self.confDialogue.textview_conffile.show() + self.confDialogue.show_difference_button.setText(_("<<< Hide Difference")) + + def fork(self): + """pty voodoo""" + (self.child_pid, self.master_fd) = pty.fork() + if self.child_pid == 0: + os.environ["TERM"] = "dumb" + if (not os.environ.has_key("DEBIAN_FRONTEND") or + os.environ["DEBIAN_FRONTEND"] == "kde"): + os.environ["DEBIAN_FRONTEND"] = "noninteractive" + os.environ["APT_LISTCHANGES_FRONTEND"] = "none" + logging.debug(" fork pid is: %s" % self.child_pid) + return self.child_pid + + def status_change(self, pkg, percent, status): + """update progress bar and label""" + # start the timer when the first package changes its status + if self.start_time == 0.0: + #print "setting start time to %s" % self.start_time + self.start_time = time.time() + self.progress.setValue(self.percent) + self.label_status.setText(unicode(status.strip(), 'UTF-8')) + # start showing when we gathered some data + if percent > 1.0: + self.last_activity = time.time() + self.activity_timeout_reported = False + delta = self.last_activity - self.start_time + # time wasted in conffile questions (or other ui activity) + delta -= self.time_ui + time_per_percent = (float(delta)/percent) + eta = (100.0 - self.percent) * time_per_percent + # only show if we have some sensible data (60sec < eta < 2days) + if eta > 61.0 and eta < (60*60*24*2): + self.progress_text.setText(_("About %s remaining") % FuzzyTimeToStr(eta)) + else: + self.progress_text.setText(" ") + + def finish_update(self): + self.label_status.setText("") + + def update_interface(self): + """ + no mainloop in this application, just call processEvents lots here + it's also important to sleep for a minimum amount of time + """ + # log the output of dpkg (on the master_fd) to the terminal log + while True: + try: + (rlist, wlist, xlist) = select.select([self.master_fd],[],[], 0) + if len(rlist) > 0: + line = os.read(self.master_fd, 255) + self._terminal_log.write(line) + self.parent.terminal_text.insertWithTermCodes(utf8(line)) + else: + break + except Exception, e: + print e + logging.debug("error reading from self.master_fd '%s'" % e) + break + + # now update the GUI + try: + InstallProgress.update_interface(self) + except ValueError, e: + logging.error("got ValueError from InstallProgress.update_interface. Line was '%s' (%s)" % (self.read, e)) + # reset self.read so that it can continue reading and does not loop + self.read = "" + # check about terminal activity + if self.last_activity > 0 and \ + (self.last_activity + self.TIMEOUT_TERMINAL_ACTIVITY) < time.time(): + if not self.activity_timeout_reported: + #FIXME bug 95465, I can't recreate this, so here's a hacky fix + try: + logging.warning("no activity on terminal for %s seconds (%s)" % (self.TIMEOUT_TERMINAL_ACTIVITY, self.label_status.text())) + except UnicodeEncodeError: + logging.warning("no activity on terminal for %s seconds" % (self.TIMEOUT_TERMINAL_ACTIVITY)) + self.activity_timeout_reported = True + self.parent.window_main.konsole_frame.show() + QApplication.processEvents() + time.sleep(0.02) + + def wait_child(self): + while True: + self.update_interface() + (pid, res) = os.waitpid(self.child_pid,os.WNOHANG) + if pid == self.child_pid: + break + # we need the full status here (not just WEXITSTATUS) + return res + +# inherit from the class created in window_main.ui +# to add the handler for closing the window +class UpgraderMainWindow(QWidget): + + def __init__(self): + QWidget.__init__(self) + #uic.loadUi("window_main.ui", self) + loadUi("window_main.ui", self) + + def setParent(self, parentRef): + self.parent = parentRef + + def closeEvent(self, event): + close = self.parent.on_window_main_delete_event() + if close: + event.accept() + else: + event.ignore() + +class DistUpgradeViewKDE(DistUpgradeView): + """KDE frontend of the distUpgrade tool""" + def __init__(self, datadir=None, logdir=None): + DistUpgradeView.__init__(self) + # silence the PyQt4 logger + logger = logging.getLogger("PyQt4") + logger.setLevel(logging.INFO) + if not datadir: + localedir=os.path.join(os.getcwd(),"mo") + else: + localedir="/usr/share/locale/update-manager" + + # FIXME: i18n must be somewhere relative do this dir + try: + gettext.bindtextdomain("update-manager", localedir) + gettext.textdomain("update-manager") + except Exception, e: + logging.warning("Error setting locales (%s)" % e) + + #about = KAboutData("adept_manager","Upgrader","0.1","Dist Upgrade Tool for Kubuntu",KAboutData.License_GPL,"(c) 2007 Canonical Ltd", + #"http://wiki.kubuntu.org/KubuntuUpdateManager", "jriddell@ubuntu.com") + #about.addAuthor("Jonathan Riddell", None,"jriddell@ubuntu.com") + #about.addAuthor("Michael Vogt", None,"michael.vogt@ubuntu.com") + #KCmdLineArgs.init(["./dist-upgrade.py"],about) + + # we test for DISPLAY here, QApplication does not throw a + # exception when run without DISPLAY but dies instead + if not "DISPLAY" in os.environ: + raise Exception, "No DISPLAY in os.environ found" + self.app = QApplication(["update-manager"]) + + if os.path.exists("/usr/share/icons/oxygen/48x48/apps/system-software-update.png"): + messageIcon = QPixmap("/usr/share/icons/oxygen/48x48/apps/system-software-update.png") + else: + messageIcon = QPixmap("/usr/share/icons/hicolor/48x48/apps/adept_manager.png") + self.app.setWindowIcon(QIcon(messageIcon)) + + self.window_main = UpgraderMainWindow() + self.window_main.setParent(self) + self.window_main.show() + + self.prev_step = 0 # keep a record of the latest step + + self._opCacheProgress = KDEOpProgress(self.window_main.progressbar_cache, self.window_main.progress_text) + self._fetchProgress = KDEFetchProgressAdapter(self) + self._cdromProgress = KDECdromProgressAdapter(self) + + self._installProgress = KDEInstallProgressAdapter(self) + + # reasonable fault handler + sys.excepthook = self._handleException + + self.window_main.showTerminalButton.setEnabled(False) + self.app.connect(self.window_main.showTerminalButton, SIGNAL("clicked()"), self.showTerminal) + + #kdesu requires us to copy the xauthority file before it removes it when Adept is killed + fd, copyXauth = tempfile.mkstemp("", "adept") + if 'XAUTHORITY' in os.environ and os.environ['XAUTHORITY'] != copyXauth: + shutil.copy(os.environ['XAUTHORITY'], copyXauth) + os.environ["XAUTHORITY"] = copyXauth + + # Note that with kdesudo this needs --nonewdcop + ## create a new DCOP-Client: + #client = DCOPClient() + ## connect the client to the local DCOP-server: + #client.attach() + + #for qcstring_app in client.registeredApplications(): + # app = str(qcstring_app) + # if app.startswith("adept"): + # adept = DCOPApp(qcstring_app, client) + # adeptInterface = adept.object("MainApplication-Interface") + # adeptInterface.quit() + + # This works just as well + subprocess.call(["killall", "adept_manager"]) + subprocess.call(["killall", "adept_updater"]) + + # init gettext + gettext.bindtextdomain("update-manager",localedir) + gettext.textdomain("update-manager") + self.translate_widget_children() + self.window_main.label_title.setText(self.window_main.label_title.text().replace("Ubuntu", "Kubuntu")) + + # setup terminal text in hidden by default spot + self.window_main.konsole_frame.hide() + self.konsole_frame_layout = QHBoxLayout(self.window_main.konsole_frame) + self.window_main.konsole_frame.setMinimumSize(600, 400) + self.terminal_text = DumbTerminal(self._installProgress, self.window_main.konsole_frame) + self.konsole_frame_layout.addWidget(self.terminal_text) + self.terminal_text.show() + + # for some reason we need to start the main loop to get everything displayed + # this app mostly works with processEvents but run main loop briefly to keep it happily displaying all widgets + QTimer.singleShot(10, self.exitMainLoop) + self.app.exec_() + + def exitMainLoop(self): + print "exitMainLoop" + self.app.exit() + + def translate_widget_children(self, parentWidget=None): + if parentWidget == None: + parentWidget = self.window_main + if isinstance(parentWidget, QDialog) or isinstance(parentWidget, QWidget): + if str(parentWidget.windowTitle()) == "Error": + parentWidget.setWindowTitle( gettext.dgettext("kdelibs", "Error")) + else: + parentWidget.setWindowTitle(_( str(parentWidget.windowTitle()) )) + + if parentWidget.children() != None: + for widget in parentWidget.children(): + self.translate_widget(widget) + self.translate_widget_children(widget) + + def translate_widget(self, widget): + if isinstance(widget, QLabel) or isinstance(widget, QPushButton): + if str(widget.text()) == "&Cancel": + widget.setText(unicode(gettext.dgettext("kdelibs", "&Cancel"), 'UTF-8')) + elif str(widget.text()) == "&Close": + widget.setText(unicode(gettext.dgettext("kdelibs", "&Close"), 'UTF-8')) + elif str(widget.text()) != "": + widget.setText( _(str(widget.text())).replace("_", "&") ) + + def _handleException(self, exctype, excvalue, exctb): + """Crash handler.""" + + if (issubclass(exctype, KeyboardInterrupt) or + issubclass(exctype, SystemExit)): + return + + # we handle the exception here, hand it to apport and run the + # apport gui manually after it because we kill u-m during the upgrade + # to prevent it from popping up for reboot notifications or FF restart + # notifications or somesuch + lines = traceback.format_exception(exctype, excvalue, exctb) + logging.error("not handled exception in KDE frontend:\n%s" % "\n".join(lines)) + # we can't be sure that apport will run in the middle of a upgrade + # so we still show a error message here + apport_crash(exctype, excvalue, exctb) + if not run_apport(): + tbtext = ''.join(traceback.format_exception(exctype, excvalue, exctb)) + dialog = QDialog(self.window_main) + loadUi("dialog_error.ui", dialog) + self.translate_widget_children(self.dialog) + #FIXME make URL work + #dialog.connect(dialog.beastie_url, SIGNAL("leftClickedURL(const QString&)"), self.openURL) + dialog.crash_detail.setText(tbtext) + dialog.exec_() + sys.exit(1) + + def openURL(self, url): + """start konqueror""" + #need to run this else kdesu can't run Konqueror + #subprocess.call(['su', 'ubuntu', 'xhost', '+localhost']) + QDesktopServices.openUrl(QUrl(url)) + + def reportBug(self): + """start konqueror""" + #need to run this else kdesu can't run Konqueror + #subprocess.call(['su', 'ubuntu', 'xhost', '+localhost']) + QDesktopServices.openUrl(QUrl("https://launchpad.net/ubuntu/+source/update-manager/+filebug")) + + def showTerminal(self): + if self.window_main.konsole_frame.isVisible(): + self.window_main.konsole_frame.hide() + self.window_main.showTerminalButton.setText(_("Show Terminal >>>")) + else: + self.window_main.konsole_frame.show() + self.window_main.showTerminalButton.setText(_("<<< Hide Terminal")) + self.window_main.resize(self.window_main.sizeHint()) + + def getFetchProgress(self): + return self._fetchProgress + + def getInstallProgress(self, cache): + self._installProgress._cache = cache + return self._installProgress + + def getOpCacheProgress(self): + return self._opCacheProgress + + def getCdromProgress(self): + return self._cdromProgress + + def update_status(self, msg): + self.window_main.label_status.setText(utf8(msg)) + + def hideStep(self, step): + image = getattr(self.window_main,"image_step%i" % step) + label = getattr(self.window_main,"label_step%i" % step) + image.hide() + label.hide() + + def abort(self): + step = self.prev_step + if step > 0: + image = getattr(self.window_main,"image_step%i" % step) + if os.path.exists("/usr/share/icons/oxygen/16x16/actions/dialog-cancel.png"): + cancelIcon = QPixmap("/usr/share/icons/oxygen/16x16/actions/dialog-cancel.png") + elif os.path.exists("/usr/lib/kde4/share/icons/oxygen/16x16/actions/dialog-cancel.png"): + cancelIcon = QPixmap("/usr/lib/kde4/share/icons/oxygen/16x16/actions/dialog-cancel.png") + else: + cancelIcon = QPixmap("/usr/share/icons/crystalsvg/16x16/actions/cancel.png") + image.setPixmap(cancelIcon) + image.show() + + def setStep(self, step): + if os.path.exists("/usr/share/icons/oxygen/16x16/actions/dialog-ok.png"): + okIcon = QPixmap("/usr/share/icons/oxygen/16x16/actions/dialog-ok.png") + elif os.path.exists("/usr/lib/kde4/share/icons/oxygen/16x16/actions/dialog-ok.png"): + okIcon = QPixmap("/usr/lib/kde4/share/icons/oxygen/16x16/actions/dialog-ok.png") + else: + okIcon = QPixmap("/usr/share/icons/crystalsvg/16x16/actions/ok.png") + + if os.path.exists("/usr/share/icons/oxygen/16x16/actions/arrow-right.png"): + arrowIcon = QPixmap("/usr/share/icons/oxygen/16x16/actions/arrow-right.png") + elif os.path.exists("/usr/lib/kde4/share/icons/oxygen/16x16/actions/arrow-right.png"): + arrowIcon = QPixmap("/usr/lib/kde4/share/icons/oxygen/16x16/actions/arrow-right.png") + else: + arrowIcon = QPixmap("/usr/share/icons/crystalsvg/16x16/actions/1rightarrow.png") + + if self.prev_step: + image = getattr(self.window_main,"image_step%i" % self.prev_step) + label = getattr(self.window_main,"label_step%i" % self.prev_step) + image.setPixmap(okIcon) + image.show() + ##arrow.hide() + self.prev_step = step + # show the an arrow for the current step and make the label bold + image = getattr(self.window_main,"image_step%i" % step) + label = getattr(self.window_main,"label_step%i" % step) + image.setPixmap(arrowIcon) + image.show() + label.setText("" + label.text() + "") + + def information(self, summary, msg, extended_msg=None): + msg = "%s
%s" % (summary,msg) + + dialogue = QDialog(self.window_main) + loadUi("dialog_error.ui", dialogue) + self.translate_widget_children(dialogue) + dialogue.label_error.setText(utf8(msg)) + if extended_msg != None: + dialogue.textview_error.setText(utf8(extended_msg)) + dialogue.textview_error.show() + else: + dialogue.textview_error.hide() + dialogue.button_bugreport.hide() + dialogue.setWindowTitle(_("Information")) + + if os.path.exists("/usr/share/icons/oxygen/48x48/status/dialog-information.png"): + messageIcon = QPixmap("/usr/share/icons/oxygen/48x48/status/dialog-information.png") + elif os.path.exists("/usr/lib/kde4/share/icons/oxygen/48x48/status/dialog-information.png"): + messageIcon = QPixmap("/usr/lib/kde4/share/icons/oxygen/48x48/status/dialog-information.png") + else: + messageIcon = QPixmap("/usr/share/icons/crystalsvg/32x32/actions/messagebox_info.png") + dialogue.image.setPixmap(messageIcon) + dialogue.exec_() + + def error(self, summary, msg, extended_msg=None): + msg="%s
%s" % (summary, msg) + + dialogue = QDialog(self.window_main) + loadUi("dialog_error.ui", dialogue) + self.translate_widget_children(dialogue) + dialogue.label_error.setText(utf8(msg)) + if extended_msg != None: + dialogue.textview_error.setText(utf8(extended_msg)) + dialogue.textview_error.show() + else: + dialogue.textview_error.hide() + dialogue.button_close.show() + self.app.connect(dialogue.button_bugreport, SIGNAL("clicked()"), self.reportBug) + + if os.path.exists("/usr/share/icons/oxygen/48x48/status/dialog-error.png"): + messageIcon = QPixmap("/usr/share/icons/oxygen/48x48/status/dialog-error.png") + elif os.path.exists("/usr/lib/kde4/share/icons/oxygen/48x48/status/dialog-error.png"): + messageIcon = QPixmap("/usr/lib/kde4/share/icons/oxygen/48x48/status/dialog-error.png") + else: + messageIcon = QPixmap("/usr/share/icons/crystalsvg/32x32/actions/messagebox_critical.png") + dialogue.image.setPixmap(messageIcon) + dialogue.exec_() + + return False + + def confirmChanges(self, summary, changes, demotions, downloadSize, + actions=None, removal_bold=True): + """show the changes dialogue""" + # FIXME: add a whitelist here for packages that we expect to be + # removed (how to calc this automatically?) + DistUpgradeView.confirmChanges(self, summary, changes, demotions, + downloadSize) + msg = unicode(self.confirmChangesMessage, 'UTF-8') + self.changesDialogue = QDialog(self.window_main) + loadUi("dialog_changes.ui", self.changesDialogue) + + self.changesDialogue.treeview_details.hide() + self.changesDialogue.connect(self.changesDialogue.show_details_button, SIGNAL("clicked()"), self.showChangesDialogueDetails) + self.translate_widget_children(self.changesDialogue) + self.changesDialogue.show_details_button.setText(_("Details") + " >>>") + self.changesDialogue.resize(self.changesDialogue.sizeHint()) + + if os.path.exists("/usr/share/icons/oxygen/48x48/status/dialog-warning.png"): + warningIcon = QPixmap("/usr/share/icons/oxygen/48x48/status/dialog-warning.png") + elif os.path.exists("/usr/lib/kde4/share/icons/oxygen/48x48/status/dialog-warning.png"): + warningIcon = QPixmap("/usr/lib/kde4/share/icons/oxygen/48x48/status/dialog-warning.png") + else: + warningIcon = QPixmap("/usr/share/icons/crystalsvg/32x32/actions/messagebox_warning.png") + + self.changesDialogue.question_pixmap.setPixmap(warningIcon) + + if actions != None: + cancel = actions[0].replace("_", "") + self.changesDialogue.button_cancel_changes.setText(cancel) + confirm = actions[1].replace("_", "") + self.changesDialogue.button_confirm_changes.setText(confirm) + + summaryText = unicode("%s" % summary, 'UTF-8') + self.changesDialogue.label_summary.setText(summaryText) + self.changesDialogue.label_changes.setText(msg) + # fill in the details + self.changesDialogue.treeview_details.clear() + self.changesDialogue.treeview_details.setHeaderLabels(["Packages"]) + self.changesDialogue.treeview_details.header().hide() + for demoted in self.demotions: + self.changesDialogue.treeview_details.insertTopLevelItem(0, QTreeWidgetItem(self.changesDialogue.treeview_details, [_("No longer supported %s") % demoted.name]) ) + for rm in self.toRemove: + self.changesDialogue.treeview_details.insertTopLevelItem(0, QTreeWidgetItem(self.changesDialogue.treeview_details, [_("Remove %s") % rm.name]) ) + for rm in self.toRemoveAuto: + self.changesDialogue.treeview_details.insertTopLevelItem(0, QTreeWidgetItem(self.changesDialogue.treeview_details, [_("Remove (was auto installed) %s") % rm.name]) ) + for inst in self.toInstall: + self.changesDialogue.treeview_details.insertTopLevelItem(0, QTreeWidgetItem(self.changesDialogue.treeview_details, [_("Install %s") % inst.name]) ) + for up in self.toUpgrade: + self.changesDialogue.treeview_details.insertTopLevelItem(0, QTreeWidgetItem(self.changesDialogue.treeview_details, [_("Upgrade %s") % up.name]) ) + + #FIXME resize label, stop it being shrinkable + res = self.changesDialogue.exec_() + if res == QDialog.Accepted: + return True + return False + + def showChangesDialogueDetails(self): + if self.changesDialogue.treeview_details.isVisible(): + self.changesDialogue.treeview_details.hide() + self.changesDialogue.show_details_button.setText(_("Details") + " >>>") + else: + self.changesDialogue.treeview_details.show() + self.changesDialogue.show_details_button.setText("<<< " + _("Details")) + self.changesDialogue.resize(self.changesDialogue.sizeHint()) + + def askYesNoQuestion(self, summary, msg, default='No'): + answer = QMessageBox.question(self.window_main, unicode(summary, 'UTF-8'), unicode("") + unicode(msg, 'UTF-8'), QMessageBox.Yes|QMessageBox.No, QMessageBox.No) + if answer == QMessageBox.Yes: + return True + return False + + def confirmRestart(self): + messageBox = QMessageBox(QMessageBox.Question, _("Restart required"), _("Restart the system to complete the upgrade"), QMessageBox.NoButton, self.window_main) + yesButton = messageBox.addButton(QMessageBox.Yes) + noButton = messageBox.addButton(QMessageBox.No) + yesButton.setText(_("_Restart Now").replace("_", "&")) + noButton.setText(gettext.dgettext("kdelibs", "&Close")) + answer = messageBox.exec_() + if answer == QMessageBox.Yes: + return True + return False + + def processEvents(self): + QApplication.processEvents() + + def pulseProgress(self, finished=False): + # FIXME: currently we do nothing here because this is + # run in a different python thread and QT explodes if the UI is + # touched from a non QThread + pass + + def on_window_main_delete_event(self): + #FIXME make this user friendly + text = _("""Cancel the running upgrade? + +The system could be in an unusable state if you cancel the upgrade. You are strongly advised to resume the upgrade.""") + text = text.replace("\n", "
") + cancel = QMessageBox.warning(self.window_main, _("Cancel Upgrade?"), text, QMessageBox.Yes, QMessageBox.No) + if cancel == QMessageBox.Yes: + return True + return False + +if __name__ == "__main__": + + view = DistUpgradeViewKDE() + view.askYesNoQuestion("input box test","bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar ") + + if sys.argv[1] == "--test-term": + pid = view.terminal_text.fork() + if pid == 0: + subprocess.call(["bash"]) + sys.exit() + while True: + view.terminal_text.update_interface() + QApplication.processEvents() + time.sleep(0.01) + + if sys.argv[1] == "--show-in-terminal": + for c in open(sys.argv[2]).read(): + view.terminal_text.insertWithTermCodes( c ) + #print c, ord(c) + QApplication.processEvents() + time.sleep(0.05) + while True: + QApplication.processEvents() + + cache = apt.Cache() + for pkg in sys.argv[1:]: + if cache[pkg].is_installed and not cache[pkg].isUpgradable: + cache[pkg].mark_delete(purge=True) + else: + cache[pkg].mark_install() + cache.commit(view._fetchProgress,view._installProgress) + + # keep the window open + while True: + QApplication.processEvents() diff -Nru update-manager-17.10.11/DistUpgrade/DistUpgradeViewNonInteractive.py update-manager-0.156.14.15/DistUpgrade/DistUpgradeViewNonInteractive.py --- update-manager-17.10.11/DistUpgrade/DistUpgradeViewNonInteractive.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DistUpgradeViewNonInteractive.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,320 @@ +# DistUpgradeView.py +# +# Copyright (c) 2004,2005 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import apt +import apt_pkg +import logging +import time +import sys +import os +import pty +import select +import subprocess +import copy +import apt.progress + +from ConfigParser import NoSectionError, NoOptionError +from subprocess import PIPE, Popen + +from DistUpgradeView import DistUpgradeView, InstallProgress, FetchProgress +from DistUpgradeConfigParser import DistUpgradeConfig + +class NonInteractiveFetchProgress(FetchProgress): + def update_status(self, uri, descr, shortDescr, status): + FetchProgress.update_status(self, uri, descr, shortDescr, status) + #logging.debug("Fetch: updateStatus %s %s" % (uri, status)) + if status == apt_pkg.STAT_DONE: + print "fetched %s (%.2f/100) at %sb/s" % ( + uri, self.percent, apt_pkg.size_to_str(int(self.current_cps))) + if sys.stdout.isatty(): + sys.stdout.flush() + + +class NonInteractiveInstallProgress(InstallProgress): + """ + Non-interactive version of the install progress class + + This ensures that conffile prompts are handled and that + hanging scripts are killed after a (long) timeout via ctrl-c + """ + + def __init__(self, logdir): + InstallProgress.__init__(self) + logging.debug("setting up environ for non-interactive use") + if not os.environ.has_key("DEBIAN_FRONTEND"): + os.environ["DEBIAN_FRONTEND"] = "noninteractive" + os.environ["APT_LISTCHANGES_FRONTEND"] = "none" + os.environ["RELEASE_UPRADER_NO_APPORT"] = "1" + self.config = DistUpgradeConfig(".") + self.logdir = logdir + self.install_run_number = 0 + try: + if self.config.getWithDefault("NonInteractive","ForceOverwrite", False): + apt_pkg.config.set("DPkg::Options::","--force-overwrite") + except (NoSectionError, NoOptionError): + pass + # more debug + #apt_pkg.Config.Set("Debug::pkgOrderList","true") + #apt_pkg.Config.Set("Debug::pkgDPkgPM","true") + # default to 2400 sec timeout + self.timeout = 2400 + try: + self.timeout = self.config.getint("NonInteractive","TerminalTimeout") + except Exception: + pass + + def error(self, pkg, errormsg): + logging.error("got a error from dpkg for pkg: '%s': '%s'" % (pkg, errormsg)) + # check if re-run of maintainer script is requested + if not self.config.getWithDefault( + "NonInteractive","DebugBrokenScripts", False): + return + # re-run maintainer script with sh -x/perl debug to get a better + # idea what went wrong + # + # FIXME: this is just a approximation for now, we also need + # to pass: + # - a version after remove (if upgrade to new version) + # + # not everything is a shell or perl script + # + # if the new preinst fails, its not yet in /var/lib/dpkg/info + # so this is inaccurate as well + environ = copy.copy(os.environ) + environ["PYCENTRAL"] = "debug" + cmd = [] + + # find what maintainer script failed + if "post-installation" in errormsg: + prefix = "/var/lib/dpkg/info/" + name = "postinst" + argument = "configure" + maintainer_script = "%s/%s.%s" % (prefix, pkg, name) + elif "pre-installation" in errormsg: + prefix = "/var/lib/dpkg/tmp.ci/" + #prefix = "/var/lib/dpkg/info/" + name = "preinst" + argument = "install" + maintainer_script = "%s/%s" % (prefix, name) + elif "pre-removal" in errormsg: + prefix = "/var/lib/dpkg/info/" + name = "prerm" + argument = "remove" + maintainer_script = "%s/%s.%s" % (prefix, pkg, name) + elif "post-removal" in errormsg: + prefix = "/var/lib/dpkg/info/" + name = "postrm" + argument = "remove" + maintainer_script = "%s/%s.%s" % (prefix, pkg, name) + else: + print "UNKNOWN (trigger?) dpkg/script failure for %s (%s) " % (pkg, errormsg) + return + + # find out about the interpreter + if not os.path.exists(maintainer_script): + logging.error("can not find failed maintainer script '%s' " % maintainer_script) + return + interp = open(maintainer_script).readline()[2:].strip().split()[0] + if ("bash" in interp) or ("/bin/sh" in interp): + debug_opts = ["-ex"] + elif ("perl" in interp): + debug_opts = ["-d"] + environ["PERLDB_OPTS"] = "AutoTrace NonStop" + else: + logging.warning("unknown interpreter: '%s'" % interp) + + # check if debconf is used and fiddle a bit more if it is + if ". /usr/share/debconf/confmodule" in open(maintainer_script).read(): + environ["DEBCONF_DEBUG"] = "developer" + environ["DEBIAN_HAS_FRONTEND"] = "1" + interp = "/usr/share/debconf/frontend" + debug_opts = ["sh","-ex"] + + # build command + cmd.append(interp) + cmd.extend(debug_opts) + cmd.append(maintainer_script) + cmd.append(argument) + + # check if we need to pass a version + if name == "postinst": + version = Popen("dpkg-query -s %s|grep ^Config-Version" % pkg,shell=True, stdout=PIPE).communicate()[0] + if version: + cmd.append(version.split(":",1)[1].strip()) + elif name == "preinst": + pkg = os.path.basename(pkg) + pkg = pkg.split("_")[0] + version = Popen("dpkg-query -s %s|grep ^Version" % pkg,shell=True, stdout=PIPE).communicate()[0] + if version: + cmd.append(version.split(":",1)[1].strip()) + + logging.debug("re-running '%s' (%s)" % (cmd, environ)) + ret = subprocess.call(cmd, env=environ) + logging.debug("%s script returned: %s" % (name,ret)) + + def conffile(self, current, new): + logging.warning("got a conffile-prompt from dpkg for file: '%s'" % current) + # looks like we have a race here *sometimes* + time.sleep(5) + try: + # don't overwrite + os.write(self.master_fd,"n\n") + except Exception, e: + logging.error("error '%s' when trying to write to the conffile"%e) + + def start_update(self): + InstallProgress.start_update(self) + self.last_activity = time.time() + progress_log = self.config.getWithDefault("NonInteractive","DpkgProgressLog", False) + if progress_log: + fullpath = os.path.join(self.logdir, "dpkg-progress.%s.log" % self.install_run_number) + logging.debug("writing dpkg progress log to '%s'" % fullpath) + self.dpkg_progress_log = open(fullpath, "w") + else: + self.dpkg_progress_log = open(os.devnull, "w") + self.dpkg_progress_log.write("%s: Start\n" % time.time()) + def finish_update(self): + InstallProgress.finish_update(self) + self.dpkg_progress_log.write("%s: Finished\n" % time.time()) + self.dpkg_progress_log.close() + self.install_run_number += 1 + def status_change(self, pkg, percent, status_str): + self.dpkg_progress_log.write("%s:%s:%s:%s\n" % (time.time(), + percent, + pkg, + status_str)) + def update_interface(self): + InstallProgress.update_interface(self) + if self.statusfd == None: + return + if (self.last_activity + self.timeout) < time.time(): + logging.warning("no activity %s seconds (%s) - sending ctrl-c" % ( + self.timeout, self.status)) + # ctrl-c + os.write(self.master_fd,chr(3)) + # read master fd and write to stdout so that terminal output + # actualy works + res = select.select([self.master_fd],[],[],0.1) + while len(res[0]) > 0: + self.last_activity = time.time() + try: + s = os.read(self.master_fd, 1) + sys.stdout.write("%s" % s) + except OSError: + # happens after we are finished because the fd is closed + return + res = select.select([self.master_fd],[],[],0.1) + sys.stdout.flush() + + + def fork(self): + logging.debug("doing a pty.fork()") + # some maintainer scripts fail without + os.environ["TERM"] = "dumb" + # unset PAGER so that we can do "diff" in the dpkg prompt + os.environ["PAGER"] = "true" + (self.pid, self.master_fd) = pty.fork() + if self.pid != 0: + logging.debug("pid is: %s" % self.pid) + return self.pid + +class DistUpgradeViewNonInteractive(DistUpgradeView): + " non-interactive version of the upgrade view " + def __init__(self, datadir=None, logdir=None): + DistUpgradeView.__init__(self) + self.config = DistUpgradeConfig(".") + self._fetchProgress = NonInteractiveFetchProgress() + self._installProgress = NonInteractiveInstallProgress(logdir) + self._opProgress = apt.progress.base.OpProgress() + sys.__excepthook__ = self.excepthook + def excepthook(self, type, value, traceback): + " on uncaught exceptions -> print error and reboot " + logging.exception("got exception '%s': %s " % (type, value)) + #sys.excepthook(type, value, traceback) + self.confirmRestart() + def getOpCacheProgress(self): + " return a OpProgress() subclass for the given graphic" + return self._opProgress + def getFetchProgress(self): + " return a fetch progress object " + return self._fetchProgress + def getInstallProgress(self, cache=None): + " return a install progress object " + return self._installProgress + def updateStatus(self, msg): + """ update the current status of the distUpgrade based + on the current view + """ + pass + def setStep(self, step): + """ we have 5 steps current for a upgrade: + 1. Analyzing the system + 2. Updating repository information + 3. Performing the upgrade + 4. Post upgrade stuff + 5. Complete + """ + pass + def confirmChanges(self, summary, changes, demotions, downloadSize, + actions=None, removal_bold=True): + DistUpgradeView.confirmChanges(self, summary, changes, demotions, + downloadSize, actions) + logging.debug("toinstall: '%s'" % [p.name for p in self.toInstall]) + logging.debug("toupgrade: '%s'" % [p.name for p in self.toUpgrade]) + logging.debug("toremove: '%s'" % [p.name for p in self.toRemove]) + return True + def askYesNoQuestion(self, summary, msg, default='No'): + " ask a Yes/No question and return True on 'Yes' " + # if this gets enabled upgrades over ssh with the non-interactive + # frontend will no longer work + #if default.lower() == "no": + # return False + return True + def confirmRestart(self): + " generic ask about the restart, can be overridden " + logging.debug("confirmRestart() called") + # rebooting here makes sense if we run e.g. in qemu + return self.config.getWithDefault("NonInteractive","RealReboot", False) + def error(self, summary, msg, extended_msg=None): + " display a error " + logging.error("%s %s (%s)" % (summary, msg, extended_msg)) + def abort(self): + logging.error("view.abort called") + + +if __name__ == "__main__": + + view = DistUpgradeViewNonInteractive() + fp = NonInteractiveFetchProgress() + ip = NonInteractiveInstallProgress() + + #ip.error("linux-image-2.6.17-10-generic","post-installation script failed") + ip.error("xserver-xorg","pre-installation script failed") + + cache = apt.Cache() + for pkg in sys.argv[1:]: + #if cache[pkg].is_installed: + # cache[pkg].markDelete() + #else: + cache[pkg].mark_install() + cache.commit(fp,ip) + time.sleep(2) + sys.exit(0) diff -Nru update-manager-17.10.11/DistUpgrade/DistUpgradeView.py update-manager-0.156.14.15/DistUpgrade/DistUpgradeView.py --- update-manager-17.10.11/DistUpgrade/DistUpgradeView.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DistUpgradeView.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,432 @@ +# DistUpgradeView.py +# +# Copyright (c) 2004,2005 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +from DistUpgradeGettext import gettext as _ +from DistUpgradeGettext import ngettext +import apt +import errno +import os +import apt_pkg +import logging +import signal +import select + +from DistUpgradeAufs import doAufsChroot, doAufsChrootRsync +from DistUpgradeApport import apport_pkgfailure + + +def FuzzyTimeToStr(sec): + " return the time a bit fuzzy (no seconds if time > 60 secs " + #print "FuzzyTimeToStr: ", sec + sec = int(sec) + + days = sec/(60*60*24) + hours = sec/(60*60) % 24 + minutes = (sec/60) % 60 + seconds = sec % 60 + # 0 seonds remaining looks wrong and its "fuzzy" anyway + if seconds == 0: + seconds = 1 + + # string map to make the re-ordering possible + map = { "str_days" : "", + "str_hours" : "", + "str_minutes" : "", + "str_seconds" : "" + } + + # get the fragments, this is not ideal i18n wise, but its + # difficult to do it differently + if days > 0: + map["str_days"] = ngettext("%li day","%li days", days) % days + if hours > 0: + map["str_hours"] = ngettext("%li hour","%li hours", hours) % hours + if minutes > 0: + map["str_minutes"] = ngettext("%li minute","%li minutes", minutes) % minutes + map["str_seconds"] = ngettext("%li second","%li seconds", seconds) % seconds + + # now assemble the string + if days > 0: + # Don't print str_hours if it's an empty string, see LP: #288912 + if map["str_hours"] == '': + return map["str_days"] + # TRANSLATORS: you can alter the ordering of the remaining time + # information here if you shuffle %(str_days)s %(str_hours)s %(str_minutes)s + # around. Make sure to keep all '$(str_*)s' in the translated string + # and do NOT change anything appart from the ordering. + # + # %(str_hours)s will be either "1 hour" or "2 hours" depending on the + # plural form + # + # Note: most western languages will not need to change this + return _("%(str_days)s %(str_hours)s") % map + # display no minutes for time > 3h, see LP: #144455 + elif hours > 3: + return map["str_hours"] + # when we are near the end, become more precise again + elif hours > 0: + # Don't print str_minutes if it's an empty string, see LP: #288912 + if map["str_minutes"] == '': + return map["str_hours"] + # TRANSLATORS: you can alter the ordering of the remaining time + # information here if you shuffle %(str_hours)s %(str_minutes)s + # around. Make sure to keep all '$(str_*)s' in the translated string + # and do NOT change anything appart from the ordering. + # + # %(str_hours)s will be either "1 hour" or "2 hours" depending on the + # plural form + # + # Note: most western languages will not need to change this + return _("%(str_hours)s %(str_minutes)s") % map + elif minutes > 0: + return map["str_minutes"] + return map["str_seconds"] + + +class FetchProgress(apt.progress.base.AcquireProgress): + + def __init__(self): + super(FetchProgress, self).__init__() + self.est_speed = 0.0 + def start(self): + super(FetchProgress, self).start() + self.est_speed = 0.0 + self.eta = 0.0 + self.percent = 0.0 + self.release_file_download_error = False + def update_status(self, uri, descr, shortDescr, status): + super(FetchProgress, self).update_status(uri, descr, shortDescr, status) + # FIXME: workaround issue in libapt/python-apt that does not + # raise a exception if *all* files fails to download + if status == apt_pkg.STAT_FAILED: + logging.warn("update_status: dlFailed on '%s' " % uri) + if uri.endswith("Release.gpg") or uri.endswith("Release"): + # only care about failures from network, not gpg, bzip, those + # are different issues + for net in ["http","ftp","mirror"]: + if uri.startswith(net): + self.release_file_download_error = True + break + # required, otherwise the lucid version of python-apt gets really + # unhappy, its expecting this function for apt.progress.base.AcquireProgress + def pulse_items(self, arg): + return True + def pulse(self, owner=None): + super(FetchProgress, self).pulse(owner) + self.percent = (((self.current_bytes + self.current_items) * 100.0) / + float(self.total_bytes + self.total_items)) + if self.current_cps > self.est_speed: + self.est_speed = (self.est_speed+self.current_cps)/2.0 + if self.current_cps > 0: + self.eta = ((self.total_bytes - self.current_bytes) / + float(self.current_cps)) + return True + def isDownloadSpeedEstimated(self): + return (self.est_speed != 0) + def estimatedDownloadTime(self, requiredDownload): + """ get the estimated download time """ + if self.est_speed == 0: + timeModem = requiredDownload/(56*1024/8) # 56 kbit + timeDSL = requiredDownload/(1024*1024/8) # 1Mbit = 1024 kbit + s= _("This download will take about %s with a 1Mbit DSL connection " + "and about %s with a 56k modem.") % (FuzzyTimeToStr(timeDSL), FuzzyTimeToStr(timeModem)) + return s + # if we have a estimated speed, use it + s = _("This download will take about %s with your connection. ") % FuzzyTimeToStr(requiredDownload/self.est_speed) + return s + + + +class InstallProgress(apt.progress.base.InstallProgress): + """ Base class for InstallProgress that supports some fancy + stuff like apport integration + """ + def __init__(self): + apt.progress.base.InstallProgress.__init__(self) + self.master_fd = None + + def wait_child(self): + """Wait for child progress to exit. + + The return values is the full status returned from os.waitpid() + (not only the return code). + """ + while True: + try: + select.select([self.statusfd], [], [], self.select_timeout) + except select.error, (errno_, errstr): + if errno_ != errno.EINTR: + raise + self.update_interface() + try: + (pid, res) = os.waitpid(self.child_pid, os.WNOHANG) + if pid == self.child_pid: + break + except OSError, (errno_, errstr): + if errno_ != errno.EINTR: + raise + if errno_ == errno.ECHILD: + break + return res + + def run(self, pm): + pid = self.fork() + if pid == 0: + # check if we need to setup/enable the aufs chroot stuff + if "RELEASE_UPGRADE_USE_AUFS_CHROOT" in os.environ: + if not doAufsChroot(os.environ["RELEASE_UPGRADE_AUFS_RWDIR"], + os.environ["RELEASE_UPGRADE_USE_AUFS_CHROOT"]): + print "ERROR: failed to setup aufs chroot overlay" + os._exit(1) + # child, ignore sigpipe, there are broken scripts out there + # like etckeeper (LP: #283642) + signal.signal(signal.SIGPIPE,signal.SIG_IGN) + try: + res = pm.do_install(self.writefd) + except Exception, e: + print "Exception during pm.DoInstall(): ", e + logging.exception("Exception during pm.DoInstall()") + open("/var/run/update-manager-apt-exception","w").write(str(e)) + os._exit(pm.ResultFailed) + os._exit(res) + self.child_pid = pid + res = os.WEXITSTATUS(self.wait_child()) + # check if we want to sync the changes back, *only* do that + # if res is positive + if (res == 0 and + "RELEASE_UPGRADE_RSYNC_AUFS_CHROOT" in os.environ): + logging.info("doing rsync commit of the update") + if not doAufsChrootRsync(os.environ["RELEASE_UPGRADE_USE_AUFS_CHROOT"]): + logging.error("FATAL ERROR: doAufsChrootRsync() returned FALSE") + return pm.ResultFailed + return res + + def error(self, pkg, errormsg): + " install error from a package " + apt.progress.base.InstallProgress.error(self, pkg, errormsg) + logging.error("got an error from dpkg for pkg: '%s': '%s'" % (pkg, errormsg)) + if "/" in pkg: + pkg = os.path.basename(pkg) + if "_" in pkg: + pkg = pkg.split("_")[0] + # now run apport + apport_pkgfailure(pkg, errormsg) + +class DumbTerminal(object): + def call(self, cmd, hidden=False): + " expects a command in the subprocess style (as a list) " + import subprocess + subprocess.call(cmd) + +class DummyHtmlView(object): + def open(self, url): + pass + def show(self): + pass + def hide(self): + pass + +(STEP_PREPARE, + STEP_MODIFY_SOURCES, + STEP_FETCH, + STEP_INSTALL, + STEP_CLEANUP, + STEP_REBOOT, + STEP_N) = range(1,8) + +( _("Preparing to upgrade"), + _("Getting new software channels"), + _("Getting new packages"), + _("Installing the upgrades"), + _("Cleaning up"), +) + +class DistUpgradeView(object): + " abstraction for the upgrade view " + def __init__(self): + self.needs_screen = False + pass + def getOpCacheProgress(self): + " return a OpProgress() subclass for the given graphic" + return apt.progress.base.OpProgress() + def getFetchProgress(self): + " return a fetch progress object " + return FetchProgress() + def getInstallProgress(self, cache=None): + " return a install progress object " + return InstallProgress() + def getTerminal(self): + return DumbTerminal() + def getHtmlView(self): + return DummyHtmlView() + def updateStatus(self, msg): + """ update the current status of the distUpgrade based + on the current view + """ + pass + def abort(self): + """ provide a visual feedback that the upgrade was aborted """ + pass + def setStep(self, step): + """ we have 6 steps current for a upgrade: + 1. Analyzing the system + 2. Updating repository information + 3. fetch packages + 3. Performing the upgrade + 4. Post upgrade stuff + 5. Complete + """ + pass + def hideStep(self, step): + " hide a certain step from the GUI " + pass + def showStep(self, step): + " show a certain step from the GUI " + pass + def confirmChanges(self, summary, changes, demotions, downloadSize, + actions=None, removal_bold=True): + """ display the list of changed packages (apt.Package) and + return if the user confirms them + """ + self.confirmChangesMessage = "" + self.demotions = demotions + self.toInstall = [] + self.toUpgrade = [] + self.toRemove = [] + self.toRemoveAuto = [] + self.toDowngrade = [] + for pkg in changes: + if pkg.marked_install: + self.toInstall.append(pkg) + elif pkg.marked_upgrade: + self.toUpgrade.append(pkg) + elif pkg.marked_delete: + if pkg._pcache._depcache.is_auto_installed(pkg._pkg): + self.toRemoveAuto.append(pkg) + else: + self.toRemove.append(pkg) + elif pkg.marked_downgrade: + self.toDowngrade.append(pkg) + # sort it + self.toInstall.sort() + self.toUpgrade.sort() + self.toRemove.sort() + self.toRemoveAuto.sort() + self.toDowngrade.sort() + # no re-installs + assert(len(self.toInstall)+len(self.toUpgrade)+len(self.toRemove)+len(self.toRemoveAuto)+len(self.toDowngrade) == len(changes)) + # now build the message (the same for all frontends) + msg = "\n" + pkgs_remove = len(self.toRemove) + len(self.toRemoveAuto) + pkgs_inst = len(self.toInstall) + pkgs_upgrade = len(self.toUpgrade) + # FIXME: show detailed packages + if len(self.demotions) > 0: + msg += ngettext( + "%(amount)d installed package is no longer supported by Canonical. " + "You can still get support from the community.", + "%(amount)d installed packages are no longer supported by " + "Canonical. You can still get support from the community.", + len(self.demotions)) % { 'amount' : len(self.demotions) } + msg += "\n\n" + if pkgs_remove > 0: + # FIXME: make those two separate lines to make it clear + # that the "%" applies to the result of ngettext + msg += ngettext("%d package is going to be removed.", + "%d packages are going to be removed.", + pkgs_remove) % pkgs_remove + msg += " " + if pkgs_inst > 0: + msg += ngettext("%d new package is going to be " + "installed.", + "%d new packages are going to be " + "installed.",pkgs_inst) % pkgs_inst + msg += " " + if pkgs_upgrade > 0: + msg += ngettext("%d package is going to be upgraded.", + "%d packages are going to be upgraded.", + pkgs_upgrade) % pkgs_upgrade + msg +=" " + if downloadSize > 0: + msg += _("\n\nYou have to download a total of %s. ") %\ + apt_pkg.SizeToStr(downloadSize) + msg += self.getFetchProgress().estimatedDownloadTime(downloadSize) + if ((pkgs_upgrade + pkgs_inst) > 0) and ((pkgs_upgrade + pkgs_inst + pkgs_remove) > 100): + if self.getFetchProgress().isDownloadSpeedEstimated(): + msg += "\n\n%s" % _( "Installing the upgrade " + "can take several hours. Once the download " + "has finished, the process cannot be canceled.") + else: + msg += "\n\n%s" % _( "Fetching and installing the upgrade " + "can take several hours. Once the download " + "has finished, the process cannot be canceled.") + else: + if pkgs_remove > 100: + msg += "\n\n%s" % _( "Removing the packages " + "can take several hours. ") + # Show an error if no actions are planned + if (pkgs_upgrade + pkgs_inst + pkgs_remove) < 1: + # FIXME: this should go into DistUpgradeController + summary = _("The software on this computer is up to date.") + msg = _("There are no upgrades available for your system. " + "The upgrade will now be canceled.") + self.error(summary, msg) + return False + # set the message + self.confirmChangesMessage = msg + return True + + def askYesNoQuestion(self, summary, msg, default='No'): + " ask a Yes/No question and return True on 'Yes' " + pass + def confirmRestart(self): + " generic ask about the restart, can be overridden " + summary = _("Reboot required") + msg = _("The upgrade is finished and " + "a reboot is required. " + "Do you want to do this " + "now?") + return self.askYesNoQuestion(summary, msg) + def error(self, summary, msg, extended_msg=None): + " display a error " + pass + def information(self, summary, msg, extended_msg=None): + " display a information msg" + pass + def processEvents(self): + """ process gui events (to keep the gui alive during a long + computation """ + pass + def pulseProgress(self, finished=False): + """ do a progress pulse (e.g. bounce a bar back and forth, show + a spinner) + """ + pass + def showDemotions(self, summary, msg, demotions): + """ + show demoted packages to the user, default implementation + is to just show a information dialog + """ + self.information(summary, msg, "\n".join(demotions)) + +if __name__ == "__main__": + fp = FetchProgress() + fp.pulse() diff -Nru update-manager-17.10.11/DistUpgrade/DistUpgradeViewText.py update-manager-0.156.14.15/DistUpgrade/DistUpgradeViewText.py --- update-manager-17.10.11/DistUpgrade/DistUpgradeViewText.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/DistUpgradeViewText.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,276 @@ +# DistUpgradeViewText.py +# +# Copyright (c) 2004-2006 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import sys +import logging +import subprocess + +import apt +import os + +from DistUpgradeView import DistUpgradeView, InstallProgress, FetchProgress +import apt.progress + +import gettext +from DistUpgradeGettext import gettext as _ +from utils import twrap + +class TextFetchProgress(FetchProgress, apt.progress.text.AcquireProgress): + def __init__(self): + apt.progress.text.AcquireProgress.__init__(self) + FetchProgress.__init__(self) + def pulse(self, owner): + apt.progress.text.AcquireProgress.pulse(self, owner) + FetchProgress.pulse(self, owner) + return True + +class TextCdromProgressAdapter(apt.progress.base.CdromProgress): + """ Report the cdrom add progress """ + def update(self, text, step): + """ update is called regularly so that the gui can be redrawn """ + if text: + print "%s (%f)" % (text, step/float(self.totalSteps)*100) + def askCdromName(self): + return (False, "") + def changeCdrom(self): + return False + + +class DistUpgradeViewText(DistUpgradeView): + " text frontend of the distUpgrade tool " + def __init__(self, datadir=None, logdir=None): + # indicate that we benefit from using gnu screen + self.needs_screen = True + # its important to have a debconf frontend for + # packages like "quagga" + if not os.environ.has_key("DEBIAN_FRONTEND"): + os.environ["DEBIAN_FRONTEND"] = "dialog" + if not datadir: + localedir=os.path.join(os.getcwd(),"mo") + else: + localedir="/usr/share/locale/update-manager" + + try: + gettext.bindtextdomain("update-manager", localedir) + gettext.textdomain("update-manager") + except Exception, e: + logging.warning("Error setting locales (%s)" % e) + + self.last_step = 0 # keep a record of the latest step + self._opCacheProgress = apt.progress.text.OpProgress() + self._fetchProgress = TextFetchProgress() + self._cdromProgress = TextCdromProgressAdapter() + self._installProgress = InstallProgress() + sys.excepthook = self._handleException + #self._process_events_tick = 0 + + def _handleException(self, type, value, tb): + import traceback + print + lines = traceback.format_exception(type, value, tb) + logging.error("not handled exception:\n%s" % "\n".join(lines)) + self.error(_("A fatal error occurred"), + _("Please report this as a bug and include the " + "files /var/log/dist-upgrade/main.log and " + "/var/log/dist-upgrade/apt.log " + "in your report. The upgrade has aborted.\n" + "Your original sources.list was saved in " + "/etc/apt/sources.list.distUpgrade."), + "\n".join(lines)) + sys.exit(1) + + def getFetchProgress(self): + return self._fetchProgress + def getInstallProgress(self, cache): + self._installProgress._cache = cache + return self._installProgress + def getOpCacheProgress(self): + return self._opCacheProgress + def getCdromProgress(self): + return self._cdromProgress + def updateStatus(self, msg): + print + print msg + sys.stdout.flush() + def abort(self): + print + print _("Aborting") + def setStep(self, step): + self.last_step = step + def showDemotions(self, summary, msg, demotions): + self.information(summary, msg, + _("Demoted:\n")+twrap(", ".join(demotions))) + def information(self, summary, msg, extended_msg=None): + print + print twrap(summary) + print twrap(msg) + if extended_msg: + print twrap(extended_msg) + print _("To continue please press [ENTER]") + sys.stdin.readline() + def error(self, summary, msg, extended_msg=None): + print + print twrap(summary) + print twrap(msg) + if extended_msg: + print twrap(extended_msg) + return False + def showInPager(self, output): + " helper to show output in a pager" + for pager in ["/usr/bin/sensible-pager", "/bin/more"]: + if os.path.exists(pager): + p = subprocess.Popen([pager,"-"],stdin=subprocess.PIPE) + p.stdin.write(output) + p.stdin.close() + p.wait() + return + # if we don't have a pager, just print + print output + + def confirmChanges(self, summary, changes, demotions, downloadSize, + actions=None, removal_bold=True): + DistUpgradeView.confirmChanges(self, summary, changes, demotions, + downloadSize, actions) + print + print twrap(summary) + print twrap(self.confirmChangesMessage) + print " %s %s" % (_("Continue [yN] "), _("Details [d]")), + while True: + res = sys.stdin.readline() + # TRANSLATORS: the "y" is "yes" + if res.strip().lower().startswith(_("y")): + return True + # TRANSLATORS: the "n" is "no" + elif res.strip().lower().startswith(_("n")): + return False + # TRANSLATORS: the "d" is "details" + elif res.strip().lower().startswith(_("d")): + output = "" + if len(self.demotions) > 0: + output += "\n" + output += twrap( + _("No longer supported: %s\n") % " ".join([p.name for p in self.demotions]), + subsequent_indent=' ') + if len(self.toRemove) > 0: + output += "\n" + output += twrap( + _("Remove: %s\n") % " ".join([p.name for p in self.toRemove]), + subsequent_indent=' ') + if len(self.toRemoveAuto) > 0: + output += twrap( + _("Remove (was auto installed) %s") % " ".join([p.name for p in self.toRemoveAuto]), + subsequent_indent=' ') + output += "\n" + if len(self.toInstall) > 0: + output += "\n" + output += twrap( + _("Install: %s\n") % " ".join([p.name for p in self.toInstall]), + subsequent_indent=' ') + if len(self.toUpgrade) > 0: + output += "\n" + output += twrap( + _("Upgrade: %s\n") % " ".join([p.name for p in self.toUpgrade]), + subsequent_indent=' ') + self.showInPager(output) + print "%s %s" % (_("Continue [yN] "), _("Details [d]")), + + def askYesNoQuestion(self, summary, msg, default='No'): + print + print twrap(summary) + print twrap(msg) + if default == 'No': + print _("Continue [yN] "), + res = sys.stdin.readline() + # TRANSLATORS: first letter of a positive (yes) answer + if res.strip().lower().startswith(_("y")): + return True + return False + else: + print _("Continue [Yn] "), + res = sys.stdin.readline() + # TRANSLATORS: first letter of a negative (no) answer + if res.strip().lower().startswith(_("n")): + return False + return True + +# FIXME: when we need this most the resolver is writing debug logs +# and we redirect stdout/stderr +# def processEvents(self): +# #time.sleep(0.2) +# anim = [".","o","O","o"] +# anim = ["\\","|","/","-","\\","|","/","-"] +# self._process_events_tick += 1 +# if self._process_events_tick >= len(anim): +# self._process_events_tick = 0 +# sys.stdout.write("[%s]" % anim[self._process_events_tick]) +# sys.stdout.flush() + + def confirmRestart(self): + return self.askYesNoQuestion(_("Restart required"), + _("To finish the upgrade, a restart is " + "required.\n" + "If you select 'y' the system " + "will be restarted."), default='No') + + +if __name__ == "__main__": + view = DistUpgradeViewText() + + #while True: + # view.processEvents() + + print twrap("89 packages are going to be upgraded.\nYou have to download a total of 82.7M.\nThis download will take about 10 minutes with a 1Mbit DSL connection and about 3 hours 12 minutes with a 56k modem.", subsequent_indent=" ") + #sys.exit(1) + + view = DistUpgradeViewText() + print view.askYesNoQuestion("hello", "Icecream?", "No") + print view.askYesNoQuestion("hello", "Icecream?", "Yes") + + + #view.confirmChangesMessage = "89 packages are going to be upgraded.\n You have to download a total of 82.7M.\n This download will take about 10 minutes with a 1Mbit DSL connection and about 3 hours 12 minutes with a 56k modem." + #view.confirmChanges("xx",[], 100) + sys.exit(0) + + view.confirmRestart() + + cache = apt.Cache() + fp = view.getFetchProgress() + ip = view.getInstallProgress(cache) + + + for pkg in sys.argv[1:]: + cache[pkg].mark_install() + cache.commit(fp,ip) + + sys.exit(0) + view.getTerminal().call(["dpkg","--configure","-a"]) + #view.getTerminal().call(["ls","-R","/usr"]) + view.error("short","long", + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + "asfds afsdj af asdf asdf asf dsa fadsf asdf as fasf sextended\n" + ) + view.confirmChanges("xx",[], 100) + print view.askYesNoQuestion("hello", "Icecream?") diff -Nru update-manager-17.10.11/DistUpgrade/EOLReleaseAnnouncement update-manager-0.156.14.15/DistUpgrade/EOLReleaseAnnouncement --- update-manager-17.10.11/DistUpgrade/EOLReleaseAnnouncement 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/EOLReleaseAnnouncement 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,62 @@ += Ubuntu 12.04 'Precise Pangolin' is no longer supported = + +You are about to upgrade to a version of Ubuntu that is no longer +supported. + +This release of Ubuntu is '''no longer supported''' by Canonical. The +support timeframe is between 18 month and 5 years after the initial +release. You will not receive security updates or critical +bugfixes. See http://www.ubuntu.com/releaseendoflife for details. + +It is still possible to upgrade this version and eventually you will +be able to upgrade to a supported release of Ubuntu. + +Alternatively you may want to consider to reinstall the machine to the +latest version, for more information on this, visit: +http://www.ubuntu.com/desktop/get-ubuntu + +For pre-installed system you may want to contact the manufacturer +for instructions. + +== Feedback and Helping == + +If you would like to help shape Ubuntu, take a look at the list of +ways you can participate at + + http://www.ubuntu.com/community/participate/ + +Your comments, bug reports, patches and suggestions will help ensure +that our next release is the best release of Ubuntu ever. If you feel +that you have found a bug please read: + + http://help.ubuntu.com/community/ReportingBugs + +Then report bugs using apport in Ubuntu. For example: + + ubuntu-bug linux + +will open a bug report in Launchpad regarding the linux package. + +If you have a question, or if you think you may have found a bug but +aren't sure, first try asking on the #ubuntu or #ubuntu-bugs IRC +channels on Freenode, on the Ubuntu Users mailing list, or on the +Ubuntu forums: + + http://help.ubuntu.com/community/InternetRelayChat + http://lists.ubuntu.com/mailman/listinfo/ubuntu-users + http://www.ubuntuforums.org/ + + +== More Information == + +You can find out more about Ubuntu on our website, IRC channel and wiki. +If you're new to Ubuntu, please visit: + + http://www.ubuntu.com/ + + +To sign up for future Ubuntu announcements, please subscribe to Ubuntu's +very low volume announcement list at: + + http://lists.ubuntu.com/mailman/listinfo/ubuntu-announce + diff -Nru update-manager-17.10.11/DistUpgrade/etc-default-apport update-manager-0.156.14.15/DistUpgrade/etc-default-apport --- update-manager-17.10.11/DistUpgrade/etc-default-apport 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/etc-default-apport 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,7 @@ +# set this to 0 to disable apport, or to 1 to enable it +# you can temporarily override this with +# sudo force_start=1 /etc/init.d/apport start +enabled=1 + +# set maximum core dump file size (default: 209715200 bytes == 200 MB) +maxsize=209715200 diff -Nru update-manager-17.10.11/DistUpgrade/get_kernel_list.sh update-manager-0.156.14.15/DistUpgrade/get_kernel_list.sh --- update-manager-17.10.11/DistUpgrade/get_kernel_list.sh 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/get_kernel_list.sh 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,29 @@ +#!/bin/sh + +# check for required base-installer dir (this will be get automatically +# from the build-tarball script) +if [ ! -d ./base-installer ]; then + echo "required directory "base-installer" missing" + echo "get it with:" + echo "bzr co --lightweight lp:~ubuntu-core-dev/base-installer/ubuntu base-installer" + exit 1 +fi + +# setup vars +ARCH=$(dpkg --print-architecture) +CPUINFO=/proc/cpuinfo +MACHINE=$(uname -m) +KERNEL_MAJOR=2.6 + +# source arch +. base-installer/kernel/$ARCH.sh + +# get flavour +FLAVOUR=$(arch_get_kernel_flavour) + +# get kernel for flavour +KERNELS=$(arch_get_kernel $FLAVOUR) + +for kernel in $KERNELS; do + echo $kernel +done diff -Nru update-manager-17.10.11/DistUpgrade/imported/invoke-rc.d update-manager-0.156.14.15/DistUpgrade/imported/invoke-rc.d --- update-manager-17.10.11/DistUpgrade/imported/invoke-rc.d 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/imported/invoke-rc.d 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,455 @@ +#!/bin/sh +# +# invoke-rc.d.sysvinit - Executes initscript actions +# +# SysVinit /etc/rc?.d version for Debian's sysvinit package +# +# Copyright (C) 2000,2001 Henrique de Moraes Holschuh +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the Free +# Software Foundation; either version 2 of the License, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +# Constants +RUNLEVEL=/sbin/runlevel +POLICYHELPER=/usr/sbin/policy-rc.d +INITDPREFIX=/etc/init.d/ +RCDPREFIX=/etc/rc + +# Options +BEQUIET= +MODE= +ACTION= +FALLBACK= +NOFALLBACK= +FORCE= +RETRY= +RETURNFAILURE= +RC= + +# Shell options +set +e + +dohelp () { + # + # outputs help and usage + # +cat < + +Usage: + invoke-rc.d [options] [extra parameters] + + basename - Initscript ID, as per update-rc.d(8) + action - Initscript action. Known actions are: + start, [force-]stop, restart, + [force-]reload, status + WARNING: not all initscripts implement all of the above actions. + + extra parameters are passed as is to the initscript, following + the action (first initscript parameter). + +Options: + --quiet + Quiet mode, no error messages are generated. + --force + Try to run the initscript regardless of policy and subsystem + non-fatal errors. + --try-anyway + Try to run init script even if a non-fatal error is found. + --disclose-deny + Return status code 101 instead of status code 0 if + initscript action is denied by local policy rules or + runlevel constrains. + --query + Returns one of status codes 100-106, does not run + the initscript. Implies --disclose-deny and --no-fallback. + --no-fallback + Ignores any fallback action requests by the policy layer. + Warning: this is usually a very *bad* idea for any actions + other than "start". + --help + Outputs help message to stdout + +EOF +} + +printerror () { + # + # prints an error message + # $* - error message + # +if test x${BEQUIET} = x ; then + echo `basename $0`: "$*" >&2 +fi +} + +formataction () { + # + # formats a list in $* into $printaction + # for human-friendly printing to stderr + # and sets $naction to action or actions + # +printaction=`echo $* | sed 's/ /, /g'` +if test $# -eq 1 ; then + naction=action +else + naction=actions +fi +} + +querypolicy () { + # + # queries policy database + # returns: $RC = 104 - ok, run + # $RC = 101 - ok, do not run + # other - exit with status $RC, maybe run if $RETRY + # initial status of $RC is taken into account. + # + +policyaction="${ACTION}" +if test x${RC} = "x101" ; then + if test "${ACTION}" = "start" || test "${ACTION}" = "restart" ; then + policyaction="(${ACTION})" + fi +fi + +if test "x${POLICYHELPER}" != x && test -x "${POLICYHELPER}" ; then + FALLBACK=`${POLICYHELPER} ${BEQUIET} ${INITSCRIPTID} "${policyaction}" ${RL}` + RC=$? + formataction ${ACTION} + case ${RC} in + 0) RC=104 + ;; + 1) RC=105 + ;; + 101) if test x${FORCE} != x ; then + printerror Overriding policy-rc.d denied execution of ${printaction}. + RC=104 + fi + ;; + esac + if test x${MODE} != xquery ; then + case ${RC} in + 105) printerror policy-rc.d query returned \"behaviour undefined\", + printerror assuming \"${printaction}\" is allowed. + RC=104 + ;; + 106) formataction ${FALLBACK} + if test x${FORCE} = x ; then + if test x${NOFALLBACK} = x ; then + ACTION="${FALLBACK}" + printerror executing ${naction} \"${printaction}\" instead due to policy-rc.d request. + RC=104 + else + printerror ignoring policy-rc.d fallback request: ${printaction}. + RC=101 + fi + else + printerror ignoring policy-rc.d fallback request: ${printaction}. + RC=104 + fi + ;; + esac + fi + case ${RC} in + 100|101|102|103|104|105|106) ;; + *) printerror WARNING: policy-rc.d returned unexpected error status ${RC}, 102 used instead. + RC=102 + ;; + esac +else + if test x${RC} = x ; then + RC=104 + fi +fi +return +} + +verifyparameter () { + # + # Verifies if $1 is not null, and $# = 1 + # +if test $# -eq 0 ; then + printerror syntax error: invalid empty parameter + exit 103 +elif test $# -ne 1 ; then + printerror syntax error: embedded blanks are not allowed in \"$*\" + exit 103 +fi +return +} + +## +## main +## + +## Verifies command line arguments + +if test $# -eq 0 ; then + printerror syntax error: missing required parameter, --help assumed + dohelp + exit 103 +fi + +state=I +while test $# -gt 0 && test ${state} != III ; do + case "$1" in + --help) dohelp + exit 0 + ;; + --quiet) BEQUIET=--quiet + ;; + --force) FORCE=yes + RETRY=yes + ;; + --try-anyway) + RETRY=yes + ;; + --disclose-deny) + RETURNFAILURE=yes + ;; + --query) MODE=query + RETURNFAILURE=yes + ;; + --no-fallback) + NOFALLBACK=yes + ;; + --*) printerror syntax error: unknown option \"$1\" + exit 103 + ;; + *) case ${state} in + I) verifyparameter $1 + INITSCRIPTID=$1 + ;; + II) verifyparameter $1 + ACTION=$1 + ;; + esac + state=${state}I + ;; + esac + shift +done + +if test ${state} != III ; then + printerror syntax error: missing required parameter + exit 103 +fi + +#NOTE: It may not be obvious, but "$@" from this point on must expand +#to the extra initscript parameters, except inside functions. + +## sanity checks and just-in-case warnings. +case ${ACTION} in + start|stop|force-stop|restart|reload|force-reload|status) + ;; + *) + if test "x${POLICYHELPER}" != x && test -x "${POLICYHELPER}" ; then + printerror action ${ACTION} is unknown, but proceeding anyway. + fi + ;; +esac + +## Verifies if the given initscript ID is known +## For sysvinit, this error is critical +if test ! -f "${INITDPREFIX}${INITSCRIPTID}" ; then + printerror unknown initscript, ${INITDPREFIX}${INITSCRIPTID} not found. + exit 100 +fi + +## Queries sysvinit for the current runlevel +RL=`${RUNLEVEL} | sed 's/.*\ //'` +if test ! $? ; then + printerror "could not determine current runlevel" + if test x${RETRY} = x ; then + exit 102 + fi + RL= +fi + +## Handles shutdown sequences VERY safely +## i.e.: forget about policy, and do all we can to run the script. +## BTW, why the heck are we being run in a shutdown runlevel?! +if test x${RL} = x0 || test x${RL} = x6 ; then + FORCE=yes + RETRY=yes + POLICYHELPER= + BEQUIET= + printerror ---------------------------------------------------- + printerror WARNING: invoke-rc.d called during shutdown sequence + printerror enabling safe mode: initscript policy layer disabled + printerror ---------------------------------------------------- +fi + +## Verifies the existance of proper S??initscriptID and K??initscriptID +## *links* in the proper /etc/rc?.d/ directory +verifyrclink () { + # + # verifies if parameters are non-dangling symlinks + # all parameters are verified + # + doexit= + while test $# -gt 0 ; do + if test ! -L "$1" ; then + printerror not a symlink: $1 + doexit=102 + fi + if test ! -f "$1" ; then + printerror dangling symlink: $1 + doexit=102 + fi + shift + done + if test x${doexit} != x && test x${RETRY} = x; then + if [ -n "$RELEASE_UPGRADE_IN_PROGRESS" ]; then + printerror "release upgrade in progress, error is not fatal" + exit 0 + fi + exit ${doexit} + fi + return 0 +} + +# we do handle multiple links per runlevel +# but we don't handle embedded blanks in link names :-( +if test x${RL} != x ; then + SLINK=`ls -d -Q ${RCDPREFIX}${RL}.d/S[0-9][0-9]${INITSCRIPTID} 2>/dev/null | xargs` + KLINK=`ls -d -Q ${RCDPREFIX}${RL}.d/K[0-9][0-9]${INITSCRIPTID} 2>/dev/null | xargs` + SSLINK=`ls -d -Q ${RCDPREFIX}S.d/S[0-9][0-9]${INITSCRIPTID} 2>/dev/null | xargs` + + verifyrclink ${SLINK} ${KLINK} ${SSLINK} +fi + +testexec () { + # + # returns true if any of the parameters is + # executable (after following links) + # + while test $# -gt 0 ; do + if test -x "$1" ; then + return 0 + fi + shift + done + return 1 +} + +RC= + +### +### LOCAL INITSCRIPT POLICY: Enforce need of a start entry +### in either runlevel S or current runlevel to allow start +### or restart. +### +case ${ACTION} in + start|restart) + if testexec ${SLINK} ; then + RC=104 + elif testexec ${KLINK} ; then + RC=101 + elif testexec ${SSLINK} ; then + RC=104 + fi + ;; +esac + +# test if /etc/init.d/initscript is actually executable +if testexec "${INITDPREFIX}${INITSCRIPTID}" ; then + if test x${RC} = x && test x${MODE} = xquery ; then + RC=105 + fi + + # call policy layer + querypolicy + case ${RC} in + 101|104) + ;; + *) if test x${MODE} != xquery ; then + printerror policy-rc.d returned error status ${RC} + if test x${RETRY} = x ; then + exit ${RC} + else + RC=102 + fi + fi + ;; + esac +else + ### + ### LOCAL INITSCRIPT POLICY: non-executable initscript; deny exec. + ### (this is common sense, actually :^P ) + ### + RC=101 +fi + +## Handles --query +if test x${MODE} = xquery ; then + exit ${RC} +fi + + +setechoactions () { + if test $# -gt 1 ; then + echoaction=true + else + echoaction= + fi +} +getnextaction () { + saction=$1 + shift + ACTION="$@" +} + +## Executes initscript +## note that $ACTION is a space-separated list of actions +## to be attempted in order until one suceeds. +if test x${FORCE} != x || test ${RC} -eq 104 ; then + if testexec "${INITDPREFIX}${INITSCRIPTID}" ; then + RC=102 + setechoactions ${ACTION} + while test ! -z "${ACTION}" ; do + getnextaction ${ACTION} + if test ! -z ${echoaction} ; then + printerror executing initscript action \"${saction}\"... + fi + + "${INITDPREFIX}${INITSCRIPTID}" "${saction}" "$@" && exit 0 + RC=$? + + if test ! -z "${ACTION}" ; then + printerror action \"${saction}\" failed, trying next action... + fi + done + printerror initscript ${INITSCRIPTID}, action \"${saction}\" failed. + if [ -n "$RELEASE_UPGRADE_IN_PROGRESS" ]; then + printerror "release upgrade in progress, error is not fatal" + exit 0 + fi + exit ${RC} + fi + exit 102 +fi + +## Handles --disclose-deny +if test ${RC} -eq 101 && test x${RETURNFAILURE} = x ; then + RC=0 +else + formataction ${ACTION} + printerror initscript ${naction} \"${printaction}\" not executed. +fi + +exit ${RC} diff -Nru update-manager-17.10.11/DistUpgrade/imported/invoke-rc.d.diff update-manager-0.156.14.15/DistUpgrade/imported/invoke-rc.d.diff --- update-manager-17.10.11/DistUpgrade/imported/invoke-rc.d.diff 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/imported/invoke-rc.d.diff 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,24 @@ +--- /usr/sbin/invoke-rc.d 2007-08-10 18:15:28.000000000 +0200 ++++ invoke-rc.d 2007-09-07 18:43:48.000000000 +0200 +@@ -314,6 +314,10 @@ + shift + done + if test x${doexit} != x && test x${RETRY} = x; then ++ if [ -n "$RELEASE_UPGRADE_IN_PROGRESS" ]; then ++ printerror "release upgrade in progress, error is not fatal" ++ exit 0 ++ fi + exit ${doexit} + fi + return 0 +@@ -431,6 +435,10 @@ + fi + done + printerror initscript ${INITSCRIPTID}, action \"${saction}\" failed. ++ if [ -n "$RELEASE_UPGRADE_IN_PROGRESS" ]; then ++ printerror "release upgrade in progress, error is not fatal" ++ exit 0 ++ fi + exit ${RC} + fi + exit 102 diff -Nru update-manager-17.10.11/DistUpgrade/MetaRelease.py update-manager-0.156.14.15/DistUpgrade/MetaRelease.py --- update-manager-17.10.11/DistUpgrade/MetaRelease.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/MetaRelease.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,332 @@ +# MetaRelease.py +# +# Copyright (c) 2004,2005 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import apt_pkg +import ConfigParser +import httplib +import logging +import rfc822 +import os +import socket +import sys +import time +import thread +import urllib2 + +from utils import get_lang, get_dist, get_ubuntu_flavor + +class Dist(object): + def __init__(self, name, version, date, supported): + self.name = name + self.version = version + self.date = date + self.supported = supported + self.releaseNotesURI = None + self.releaseNotesHtmlUri = None + self.upgradeTool = None + self.upgradeToolSig = None + # the server may report that the upgrade is broken currently + self.upgrade_broken = None + +class MetaReleaseCore(object): + """ + A MetaReleaseCore object astracts the list of released + distributions. + """ + + DEBUG = "DEBUG_UPDATE_MANAGER" in os.environ + + # some constants + CONF = "/etc/update-manager/release-upgrades" + CONF_METARELEASE = "/etc/update-manager/meta-release" + + def __init__(self, + useDevelopmentRelease=False, + useProposed=False, + forceLTS=False, + forceDownload=False): + self._debug("MetaRelease.__init__() useDevel=%s useProposed=%s" % (useDevelopmentRelease, useProposed)) + # force download instead of sending if-modified-since + self.forceDownload = forceDownload + # information about the available dists + self.downloading = True + self.new_dist = None + self.current_dist_name = get_dist() + self.no_longer_supported = None + + # default (if the conf file is missing) + self.METARELEASE_URI = "http://changelogs.ubuntu.com/meta-release" + self.METARELEASE_URI_LTS = "http://changelogs.ubuntu.com/meta-release-lts" + self.METARELEASE_URI_UNSTABLE_POSTFIX = "-development" + self.METARELEASE_URI_PROPOSED_POSTFIX = "-development" + + # check the meta-release config first + parser = ConfigParser.ConfigParser() + if os.path.exists(self.CONF_METARELEASE): + try: + parser.read(self.CONF_METARELEASE) + except ConfigParser.Error, e: + sys.stderr.write("ERROR: failed to read '%s':\n%s" % ( + self.CONF_METARELEASE, e)) + return + # make changing the metarelease file and the location + # for the files easy + if parser.has_section("METARELEASE"): + sec = "METARELEASE" + for k in ["URI", + "URI_LTS", + "URI_UNSTABLE_POSTFIX", + "URI_PROPOSED_POSTFIX"]: + if parser.has_option(sec, k): + self._debug("%s: %s " % (self.CONF_METARELEASE, + parser.get(sec,k))) + setattr(self, "%s_%s" % (sec, k), parser.get(sec, k)) + + # check the config file first to figure if we want lts upgrades only + parser = ConfigParser.ConfigParser() + if os.path.exists(self.CONF): + try: + parser.read(self.CONF) + except ConfigParser.Error, e: + sys.stderr.write("ERROR: failed to read '%s':\n%s" % ( + self.CONF, e)) + return + # now check which specific url to use + if parser.has_option("DEFAULT","Prompt"): + type = parser.get("DEFAULT","Prompt").lower() + if (type == "never" or type == "no"): + # nothing to do for this object + # FIXME: what about no longer supported? + self.downloading = False + return + elif type == "lts": + self.METARELEASE_URI = self.METARELEASE_URI_LTS + # needed for the _tryUpgradeSelf() code in DistUpgradeController + if forceLTS: + self.METARELEASE_URI = self.METARELEASE_URI_LTS + # devel and proposed "just" change the postfix + if useDevelopmentRelease: + self.METARELEASE_URI += self.METARELEASE_URI_UNSTABLE_POSTFIX + elif useProposed: + self.METARELEASE_URI += self.METARELEASE_URI_PROPOSED_POSTFIX + + self._debug("metarelease-uri: %s" % self.METARELEASE_URI) + self.metarelease_information = None + if not self._buildMetaReleaseFile(): + self._debug("_buildMetaReleaseFile failed") + return + # we start the download thread here and we have a timeout + thread.start_new_thread(self.download, ()) + #t=thread.start_new_thread(self.check, ()) + + def _buildMetaReleaseFile(self): + # build the metarelease_file name + self.METARELEASE_FILE = os.path.join("/var/lib/update-manager/", + os.path.basename(self.METARELEASE_URI)) + # check if we can write to the global location, if not, + # write to homedir + try: + open(self.METARELEASE_FILE,"a") + except IOError, e: + cache_dir = os.getenv( + "XDG_CACHE_HOME", os.path.expanduser("~/.cache")) + path = os.path.join(cache_dir, 'update-manager-core') + if not os.path.exists(path): + try: + os.mkdir(path) + except OSError, e: + sys.stderr.write("mkdir() failed: '%s'" % e) + return False + self.METARELEASE_FILE = os.path.join(path,os.path.basename(self.METARELEASE_URI)) + # if it is empty, remove it to avoid I-M-S hits on empty file + try: + if os.path.getsize(self.METARELEASE_FILE) == 0: + os.unlink(self.METARELEASE_FILE) + except Exception, e: + pass + return True + + def dist_no_longer_supported(self, dist): + """ virtual function that is called when the distro is no longer + supported + """ + self.no_longer_supported = dist + def new_dist_available(self, dist): + """ virtual function that is called when a new distro release + is available + """ + self.new_dist = dist + + def parse(self): + self._debug("MetaRelease.parse()") + current_dist_name = self.current_dist_name + self._debug("current dist name: '%s'" % current_dist_name) + current_dist = None + dists = [] + + # parse the metarelease_information file + index_tag = apt_pkg.TagFile(self.metarelease_information) + step_result = index_tag.step() + while step_result: + if "Dist" in index_tag.section: + name = index_tag.section["Dist"] + self._debug("found distro name: '%s'" % name) + rawdate = index_tag.section["Date"] + date = time.mktime(rfc822.parsedate(rawdate)) + supported = int(index_tag.section["Supported"]) + version = index_tag.section["Version"] + # add the information to a new date object + dist = Dist(name, version, date,supported) + if "ReleaseNotes" in index_tag.section: + dist.releaseNotesURI = index_tag.section["ReleaseNotes"] + lang = get_lang() + if lang: + dist.releaseNotesURI += "?lang=%s" % lang + if "ReleaseNotesHtml" in index_tag.section: + dist.releaseNotesHtmlUri = index_tag.section["ReleaseNotesHtml"] + query = self._get_release_notes_uri_query_string(dist) + if query: + dist.releaseNotesHtmlUri += query + if "UpgradeTool" in index_tag.section: + dist.upgradeTool = index_tag.section["UpgradeTool"] + if "UpgradeToolSignature" in index_tag.section: + dist.upgradeToolSig = index_tag.section["UpgradeToolSignature"] + if "UpgradeBroken" in index_tag.section: + dist.upgrade_broken = index_tag.section["UpgradeBroken"] + dists.append(dist) + if name == current_dist_name: + current_dist = dist + step_result = index_tag.step() + + # first check if the current runing distro is in the meta-release + # information. if not, we assume that we run on something not + # supported and silently return + if current_dist is None: + self._debug("current dist not found in meta-release file\n") + return False + + # then see what we can upgrade to + upgradable_to = "" + for dist in dists: + if dist.date > current_dist.date: + upgradable_to = dist + self._debug("new dist: %s" % upgradable_to) + break + + # only warn if unsupported and a new dist is available (because + # the development version is also unsupported) + if upgradable_to != "" and not current_dist.supported: + self.dist_no_longer_supported(current_dist) + if upgradable_to != "": + self.new_dist_available(upgradable_to) + + # parsing done and sucessfully + return True + + # the network thread that tries to fetch the meta-index file + # can't touch the gui, runs as a thread + def download(self): + self._debug("MetaRelease.download()") + lastmodified = 0 + req = urllib2.Request(self.METARELEASE_URI) + # make sure that we always get the latest file (#107716) + req.add_header("Cache-Control", "No-Cache") + req.add_header("Pragma", "no-cache") + if os.access(self.METARELEASE_FILE, os.W_OK): + try: + lastmodified = os.stat(self.METARELEASE_FILE).st_mtime + except OSError, e: + pass + if lastmodified > 0 and not self.forceDownload: + req.add_header("If-Modified-Since", time.asctime(time.gmtime(lastmodified))) + try: + # open + uri=urllib2.urlopen(req, timeout=20) + # sometime there is a root owned meta-relase file + # there, try to remove it so that we get it + # with proper permissions + if (os.path.exists(self.METARELEASE_FILE) and + not os.access(self.METARELEASE_FILE,os.W_OK)): + try: + os.unlink(self.METARELEASE_FILE) + except OSError,e: + print "Can't unlink '%s' (%s)" % (self.METARELEASE_FILE,e) + # we may get exception here on e.g. disk full + try: + f=open(self.METARELEASE_FILE,"w+") + for line in uri.readlines(): + f.write(line) + f.flush() + f.seek(0,0) + self.metarelease_information=f + except IOError, e: + pass + uri.close() + # http error + except urllib2.HTTPError, e: + # mvo: only reuse local info on "not-modified" + if e.code == 304 and os.path.exists(self.METARELEASE_FILE): + self._debug("reading file '%s'" % self.METARELEASE_FILE) + self.metarelease_information=open(self.METARELEASE_FILE,"r") + else: + self._debug("result of meta-release download: '%s'" % e) + # generic network error + except (urllib2.URLError, httplib.BadStatusLine, socket.timeout), e: + self._debug("result of meta-release download: '%s'" % e) + # now check the information we have + if self.metarelease_information != None: + self._debug("have self.metarelease_information") + try: + self.parse() + except: + logging.exception("parse failed for '%s'" % self.METARELEASE_FILE) + # no use keeping a broken file around + os.remove(self.METARELEASE_FILE) + # we don't want to keep a meta-release file around when it + # has a "Broken" flag, this ensures we are not bitten by + # I-M-S/cache issues + if self.new_dist and self.new_dist.upgrade_broken: + os.remove(self.METARELEASE_FILE) + else: + self._debug("NO self.metarelease_information") + self.downloading = False + + def _get_release_notes_uri_query_string(self, dist): + q = "?" + # get the lang + lang = get_lang() + if lang: + q += "lang=%s&" % lang + # get the os + os = get_ubuntu_flavor() + q += "os=%s&" % os + # get the version to upgrade to + q += "ver=%s" % dist.version + return q + + def _debug(self, msg): + if self.DEBUG: + sys.stderr.write(msg+"\n") + + +if __name__ == "__main__": + meta = MetaReleaseCore(False, False) + diff -Nru update-manager-17.10.11/DistUpgrade/mirrors.cfg update-manager-0.156.14.15/DistUpgrade/mirrors.cfg --- update-manager-17.10.11/DistUpgrade/mirrors.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/mirrors.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,830 @@ +#ubuntu +http://archive.ubuntu.com/ubuntu/ +http://security.ubuntu.com/ubuntu/ +ftp://archive.ubuntu.com/ubuntu/ +ftp://security.ubuntu.com/ubuntu/ +mirror://launchpad.net/ubuntu/+countrymirrors-archive +mirror://mirrors.ubuntu.com/mirrors.txt +http://ports.ubuntu.com/ +ftp://ports.ubuntu.com/ +http://ports.ubuntu.com/ubuntu-ports/ +ftp://ports.ubuntu.com/ubuntu-ports/ +http://old-releases.ubuntu.com/ +ftp://old-releases.ubuntu.com/ +http://extras.ubuntu.com/ubuntu +ftp://extras.ubuntu.com/ubuntu + +#commercial (both urls are valid) +http://archive.canonical.com +http://archive.canonical.com/ubuntu/ + +#commercial-ppas +https://private-ppa.launchpad.net/commercial-ppa-uploaders + + +##===Australia=== +http://ftp.iinet.net.au/pub/ubuntu/ +http://mirror.optus.net/ubuntu/ +http://mirror.isp.net.au/ftp/pub/ubuntu/ +http://www.planetmirror.com/pub/ubuntu/ +http://ftp.filearena.net/pub/ubuntu/ +http://mirror.pacific.net.au/linux/ubuntu/ +ftp://mirror.isp.net.au/pub/ubuntu/ +ftp://ftp.planetmirror.com/pub/ubuntu/ +ftp://ftp.filearena.net/pub/ubuntu/ +ftp://mirror.internode.on.net/pub/ubuntu/ubuntu +ftp://ftp.iinet.net.au/pub/ubuntu/ +ftp://mirror.pacific.net.au/linux/ubuntu/ +rsync://ftp.iinet.net.au/ubuntu/ +rsync://mirror.isp.net.au/ubuntu/ +rsync://rsync.filearena.net/ubuntu/ + +##===Austria=== +http://ubuntu.inode.at/ubuntu/ +http://ubuntu.uni-klu.ac.at/ubuntu/ +http://gd.tuwien.ac.at/opsys/linux/ubuntu/archive/ +ftp://ubuntu.inode.at/ubuntu/ +ftp://ftp.uni-klu.ac.at/linux/ubuntu/ +ftp://gd.tuwien.ac.at/opsys/linux/ubuntu/archive/ +rsync://ubuntu.inode.at/ubuntu/ubuntu/ +rsync://gd.tuwien.ac.at/ubuntu/archive/ + +#===Belgium=== +http://ftp.belnet.be/pub/mirror/ubuntu.com/ +http://ftp.belnet.be/packages/ubuntu/ubuntu/ +http://ubuntu.mirrors.skynet.be/pub/ubuntu.com/ +http://mirror.freax.be/ubuntu/archive.ubuntu.com/ +ftp://ftp.belnet.be/pub/mirror/ubuntu.com/ +ftp://ftp.belnet.be/packages/ubuntu/ubuntu/ +ftp://ubuntu.mirrors.skynet.be/pub/ubuntu.com/ + +#===Brazil=== +http://espelhos.edugraf.ufsc.br/ubuntu/ +http://ubuntu.interlegis.gov.br/archive/ +http://ubuntu.c3sl.ufpr.br/ubuntu/ + +#===Canada=== +ftp://ftp.cs.mun.ca/pub/mirror/ubuntu/ +rsync://rsync.cs.mun.ca/ubuntu/ +http://mirror.cpsc.ucalgary.ca/mirror/ubuntu.com/ +ftp://mirror.cpsc.ucalgary.ca/mirror/ubuntu.com/ +http://mirror.arcticnetwork.ca/pub/ubuntu/packages/ +ftp://mirror.arcticnetwork.ca/pub/ubuntu/packages/ +rsync://rsync.arcticnetwork.ca/ubuntu-packages + +#===China=== +http://archive.ubuntu.org.cn/ubuntu/ +http://debian.cn99.com/ubuntu/ +http://mirror.lupaworld.com/ubuntu/ + +#===CostaRica=== +http://ftp.ucr.ac.cr/ubuntu/ +ftp://ftp.ucr.ac.cr/pub/ubuntu/ + +#===CzechRepublic=== +http://archive.ubuntu.cz/ubuntu/ +ftp://archive.ubuntu.cz/ubuntu/ +http://ubuntu.supp.name/ubuntu/ + +#===Denmark=== +http://mirrors.dk.telia.net/ubuntu/ +http://mirrors.dotsrc.org/ubuntu/ +http://klid.dk/homeftp/ubuntu/ +ftp://mirrors.dk.telia.net/ubuntu/ +ftp://mirrors.dotsrc.org/ubuntu/ +ftp://klid.dk/ubuntu/ + +#===Estonia=== +http://ftp.estpak.ee/pub/ubuntu/ +ftp://ftp.estpak.ee/pub/ubuntu/ + +#===Finland=== +http://www.nic.funet.fi/pub/mirrors/archive.ubuntu.com/ +ftp://ftp.funet.fi/pub/mirrors/archive.ubuntu.com/ + +#===France=== +http://mir1.ovh.net/ubuntu/ubuntu/ +http://fr.archive.ubuntu.com/ubuntu/ +http://ftp.u-picardie.fr/pub/ubuntu/ubuntu/ +http://ftp.oleane.net/pub/ubuntu/ +ftp://mir1.ovh.net/ubuntu/ubuntu/ +ftp://fr.archive.ubuntu.com/ubuntu/ +ftp://ftp.u-picardie.fr/pub/ubuntu/ubuntu/ +ftp://ftp.proxad.net/mirrors/ftp.ubuntu.com/ubuntu/ +ftp://ftp.oleane.net/pub/ubuntu/ +rsync://mir1.ovh.net/ubuntu/ubuntu/ + +#===Germany=== +http://debian.charite.de/ubuntu/ +http://ftp.inf.tu-dresden.de/os/linux/dists/ubuntu/ +http://www.artfiles.org/ubuntu.com +http://ftp.rz.tu-bs.de/pub/mirror/ubuntu-packages/ +http://ftp.join.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/ +http://www.ftp.uni-erlangen.de/pub/mirrors/ubuntu/ +http://debian.tu-bs.de/ubuntu/ +ftp://debian.charite.de/ubuntu/ +ftp://ftp.fu-berlin.de/linux/ubuntu/ +ftp://ftp.rz.tu-bs.de/pub/mirror/ubuntu-packages/ +ftp://ftp.join.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/ +ftp://ftp.uni-erlangen.de/pub/mirrors/ubuntu/ +ftp://debian.tu-bs.de/ubuntu/ +rsync://ftp.inf.tu-dresden.de/ubuntu/ +rsync://ftp.rz.tu-bs.de/pub/mirror/ubuntu-packages/ +rsync://ftp.join.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/ +rsync://debian.tu-bs.de/ubuntu/ + +#===Greece=== +http://ftp.ntua.gr/pub/linux/ubuntu/ +ftp://ftp.ntua.gr/pub/linux/ubuntu/ + +#===Hungary=== +http://ftp.kfki.hu/linux/ubuntu/ +ftp://ftp.kfki.hu/pub/linux/ubuntu/ +ftp://ftp.fsn.hu/pub/linux/distributions/ubuntu/ + +#===Indonesia=== +http://komo.vlsm.org/ubuntu/ +http://kambing.vlsm.org/ubuntu/ +rsync://komo.vlsm.org/ubuntu/ +rsync://kambing.vlsm.org/ubuntu/ + +#===Iceland=== +http://ubuntu.odg.cc/ +http://ubuntu.lhi.is/ + +#===Ireland=== +http://ftp.esat.net/mirrors/archive.ubuntu.com/ +http://ftp.heanet.ie/pub/ubuntu/ +ftp://ftp.esat.net/mirrors/archive.ubuntu.com/ +ftp://ftp.heanet.ie/pub/ubuntu/ +rsync://ftp.esat.net/mirrors/archive.ubuntu.com/ +rsync://ftp.heanet.ie/pub/ubuntu/ + +#===Italy=== +http://ftp.linux.it/ubuntu/ +http://na.mirror.garr.it/mirrors/ubuntu-archive/ +ftp://ftp.linux.it/ubuntu/ +ftp://na.mirror.garr.it/mirrors/ubuntu-archive/ +rsync://na.mirror.garr.it/ubuntu-archive/ + +#===Japan=== +http://ubuntu.mithril-linux.org/archives/ + +#===Korea=== +http://mirror.letsopen.com/os/ubuntu/ +ftp://mirror.letsopen.com/os/ubuntu/ +http://ftp.kaist.ac.kr/pub/ubuntu/ +ftp://ftp.kaist.ac.kr/pub/ubuntu/ +rsync://ftp.kaist.ac.kr/ubuntu/ + +#===Latvia=== +http://ubuntu-arch.linux.edu.lv/ubuntu/ + +#===Lithuania=== +http://ftp.litnet.lt/pub/ubuntu/ +ftp://ftp.litnet.lt/pub/ubuntu/ + +#===Namibia=== +ftp://ftp.polytechnic.edu.na/pub/ubuntulinux/ + +#===Netherlands=== +http://ftp.bit.nl/ubuntu/ +http://ubuntu.synssans.nl +ftp://ftp.bit.nl/ubuntu/ +rsync://ftp.bit.nl/ubuntu/ + +#===NewZealand=== +ftp://ftp.citylink.co.nz/ubuntu/ + +#===Nicaragua=== +http://www.computacion.uni.edu.ni/iso/ubuntu/ + +#===Norway=== +http://mirror.trivini.no/ubuntu +ftp://mirror.trivini.no/ubuntu +ftp://ftp.uninett.no/linux/ubuntu/ +rsync://ftp.uninett.no/ubuntu/ + +#===Poland=== +http://ubuntulinux.mainseek.com/ubuntu/ +http://ubuntu.task.gda.pl/ubuntu/ +ftp://ubuntu.task.gda.pl/ubuntu/ +rsync://ubuntu.task.gda.pl/ubuntu/ + +#===Portugal=== +ftp://ftp.rnl.ist.utl.pt/ubuntu/ +http://darkstar.ist.utl.pt/ubuntu/archive/ +http://ubuntu.dcc.fc.up.pt/ + +#===Romania=== +http://ftp.iasi.roedu.net/mirrors/ubuntulinux.org/ubuntu/ +ftp://ftp.iasi.roedu.net/mirrors/ubuntulinux.org/ubuntu/ +rsync://ftp.iasi.roedu.net/ubuntu/ +http://ftp.lug.ro/ubuntu/ +ftp://ftp.lug.ro/ubuntu/ + +#===Russia=== +http://debian.nsu.ru/ubuntu/ +ftp://debian.nsu.ru/ubuntu/ +ftp://ftp.chg.ru/pub/Linux/ubuntu/archive +http://ftp.chg.ru/pub/Linux/ubuntu/archive + +#===SouthAfrica=== +ftp://ftp.is.co.za/ubuntu/ +ftp://ftp.leg.uct.ac.za/pub/linux/ubuntu/ +ftp://ftp.sun.ac.za/ftp/ubuntu/ + +#===Spain=== +ftp://ftp.um.es/mirror/ubuntu/ +ftp://ftp.ubuntu-es.org/ubuntu/ + +#===Sweden=== +http://ftp.acc.umu.se/mirror/ubuntu/ +ftp://ftp.se.linux.org/pub/Linux/distributions/ubuntu/ + +#===Switzerland=== +http://mirror.switch.ch/ftp/mirror/ubuntu/ +ftp://mirror.switch.ch/mirror/ubuntu/ + +#===Taiwan=== +http://apt.ubuntu.org.tw/ubuntu/ +ftp://apt.ubuntu.org.tw/ubuntu/ +http://apt.nc.hcc.edu.tw/pub/ubuntu/ +http://ubuntu.csie.ntu.edu.tw/ubuntu/ +ftp://apt.nc.hcc.edu.tw/pub/ubuntu/ +ftp://os.nchc.org.tw/ubuntu/ +ftp://ftp.ee.ncku.edu.tw/pub/ubuntu/ +rsync://ftp.ee.ncku.edu.tw/ubuntu/ +http://ftp.cse.yzu.edu.tw/ftp/Linux/Ubuntu/ubuntu/ +ftp://ftp.cse.yzu.edu.tw/Linux/Ubuntu/ubuntu/ + +#===Turkey=== +http://godel.cs.bilgi.edu.tr/mirror/ubuntu/ +ftp://godel.cs.bilgi.edu.tr/ubuntu/ + +#===UnitedKingdom=== +http://www.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/ +ftp://ftp.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/ +http://www.mirror.ac.uk/mirror/archive.ubuntu.com/ubuntu/ +ftp://ftp.mirror.ac.uk/mirror/archive.ubuntu.com/ubuntu/ +rsync://rsync.mirrorservice.org/archive.ubuntu.com/ubuntu/ +http://ubuntu.blueyonder.co.uk/archive/ +ftp://ftp.blueyonder.co.uk/sites/ubuntu/archive/ + +#===UnitedStates=== +http://mirror.cs.umn.edu/ubuntu/ +http://lug.mtu.edu/ubuntu/ +http://mirror.clarkson.edu/pub/distributions/ubuntu/ +http://ubuntu.mirrors.tds.net/ubuntu/ +http://www.opensourcemirrors.org/ubuntu/ +http://ftp.ale.org/pub/mirrors/ubuntu/ +http://ubuntu.secs.oakland.edu/ +http://mirror.mcs.anl.gov/pub/ubuntu/ +http://mirrors.cat.pdx.edu/ubuntu/ +http://ubuntu.cs.utah.edu/ubuntu/ +http://ftp.ussg.iu.edu/linux/ubuntu/ +http://mirrors.xmission.com/ubuntu/ +http://ftp.osuosl.org/pub/ubuntu/ +http://mirrors.cs.wmich.edu/ubuntu/ +ftp://ftp.osuosl.org/pub/ubuntu/ +ftp://mirrors.xmission.com/ubuntu/ +ftp://ftp.ussg.iu.edu/linux/ubuntu/ +ftp://mirror.clarkson.edu/pub/distributions/ubuntu/ +ftp://ubuntu.mirrors.tds.net/ubuntu/ +ftp://mirror.mcs.anl.gov/pub/ubuntu/ +ftp://mirrors.cat.pdx.edu/ubuntu/ +ftp://ubuntu.cs.utah.edu/pub/ubuntu/ubuntu/ +rsync://ubuntu.cs.utah.edu/ubuntu/ +rsync://mirrors.cat.pdx.edu/ubuntu/ +rsync://mirror.mcs.anl.gov/ubuntu/ +rsync://ubuntu.mirrors.tds.net/ubuntu/ +rsync://mirror.cs.umn.edu/ubuntu/ + +http://free.nchc.org.tw/ubuntu +http://br.archive.ubuntu.com/ubuntu/ +http://es.archive.ubuntu.com/ubuntu/ +ftp://ftp.free.fr/mirrors/ftp.ubuntu.com/ubuntu/ +http://ie.archive.ubuntu.com/ubuntu/ +http://mirror.anl.gov/pub/ubuntu/ +http://se.archive.ubuntu.com/ubuntu/ +http://ubuntu.intergenia.de/ubuntu/ +http://ubuntu.linux-bg.org/ubuntu/ +http://ubuntu.ynet.sk/ubuntu/ +http://nl.archive.ubuntu.com/ubuntu/ +http://cz.archive.ubuntu.com/ubuntu/ +http://de.archive.ubuntu.com/ubuntu/ +http://dk.archive.ubuntu.com/ubuntu/ +http://ftp.estpak.ee/ubuntu/ +http://ftp.crihan.fr/ubuntu/ +http://ftp.cse.yzu.edu.tw/pub/Linux/Ubuntu/ubuntu/ +http://ftp.dei.uc.pt/pub/linux/ubuntu/archive/ +http://ftp.duth.gr/pub/ubuntu/ +http://ftp.halifax.rwth-aachen.de/ubuntu/ +http://ftp.iinet.net.au/pub/ubuntu +ftp://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu +http://ftp.stw-bonn.de/ubuntu/ +http://ftp.tiscali.nl/ubuntu/ +ftp://ftp.tudelft.nl/pub/Linux/archive.ubuntu.com/ +http://ftp.twaren.net/Linux/Ubuntu/ubuntu/ +http://ftp.uni-kl.de/pub/linux/ubuntu/ +http://ftp.uninett.no/ubuntu/ +http://ftp.usf.edu/pub/ubuntu/ +http://kr.archive.ubuntu.com/ubuntu/ +http://gr.archive.ubuntu.com/ubuntu/ +http://gulus.USherbrooke.ca/ubuntu/ +http://mirror.nttu.edu.tw/ubuntu/ +http://mirrors.easynews.com/linux/ubuntu/ +http://mirrors.kernel.org/ubuntu/ +http://ftp.oleane.net/ubuntu/ +http://yu.archive.ubuntu.com/ubuntu/ +http://sft.if.usp.br/ubuntu/ +http://ubuntu-archive.datahop.it/ubuntu/ +http://hr.archive.ubuntu.com/ubuntu/ +http://ubuntu.mirrors.tds.net/pub/ubuntu/ +http://ubuntu.fastbull.org/ubuntu/ +http://ubuntu.indika.net.id/ubuntu/ +http://ubuntu.tiscali.nl/ +http://www.gtlib.gatech.edu/pub/ubuntu/ +http://archive.ubuntu.com.ba/ubuntu/ +http://archive.ubuntu.uasw.edu/ +http://ubuntu.ipacct.com/ubuntu/ +http://bw.archive.ubuntu.com/ubuntu/ +http://ubuntu.cn99.com/ubuntu/ +http://ubuntuarchive.is.co.za/ubuntu/ +http://ftp.dateleco.es/ubuntu/ +http://ftp.ds.karen.hj.se/pub/os/linux/ubuntu/ +http://ftp.fsn.hu/pub/linux/distributions/ubuntu +http://ftp.hosteurope.de/mirror/archive.ubuntu.com/ +http://ftp.u-picardie.fr/mirror/ubuntu/ubuntu/ +http://ftp.gil.di.uminho.pt/ubuntu/ +http://klid.dk/ftp/ubuntu/ +http://mirror.cc.columbia.edu/pub/linux/ubuntu/archive/ +http://mirror.imbrandon.com/ubuntu/ +http://mosel.estg.ipleiria.pt/mirror/distros/ubuntu/archive/ +http://neacm.fe.up.pt/ubuntu/ +http://packages.midian.hu//pub/linux/distributions/ubuntu +http://tw.archive.ubuntu.com/ubuntu/ +http://ftp.ticklers.org/archive.ubuntu.org/ubuntu/ +http://ubuntu.mirror.ac.za/ubuntu-archive/ +http://ubuntu.mithril-linux.org/archives +http://ubuntu.virginmedia.com/archive/ +http://ubuntu.univ-nantes.fr/ubuntu/ +http://ftp.vectranet.pl/ubuntu/ +http://ftp.iitm.ac.in/ubuntu +http://mirror.lcsee.wvu.edu/ubuntu/ +http://ubuntu.cs.uaf.edu/ubuntu/ +http://cl.archive.ubuntu.com/ubuntu/ +http://cudlug.cudenver.edu/ubuntu/ +http://debian.linux.org.tw/ubuntu/ +http://ftp.belnet.be/linux/ubuntu/ubuntu/ +http://ftp.chg.ru/pub/Linux/ubuntu/archive/ +http://ftp.citylink.co.nz/ubuntu/ +http://ftp.ecc.u-tokyo.ac.jp/ubuntu/ +http://ftp.gui.uva.es/sites/ubuntu.com/ubuntu/ +http://ftp.linux.edu.lv/ubuntu/ +http://ftp.lug.ro/ubuntu/ +ftp://ftp.man.szczecin.pl/pub/Linux/ubuntu/ +http://ftp.port80.se/ubuntu/ +http://ftp-stud.fht-esslingen.de/Mirrors/ubuntu/ +http://ftp.tu-chemnitz.de/pub/linux/ubuntu/ +http://ftp.unina.it/pub/linux/distributions/ubuntu/ +ftp://ftpserv.tudelft.nl/pub/Linux/archive.ubuntu.com/ +http://mirror.etf.bg.ac.yu/distributions/ubuntu/ubuntu-archive/ +http://mirror.lupaworld.com/ubuntu/archive/ +http://mirror.uni-c.dk/ubuntu/ +http://mirror2.etf.bg.ac.yu/distributions/ubuntu/ubuntu-archive/ +http://mirrors.nic.funet.fi/ubuntu/ +http://snert.mi.hs-heilbronn.de/pub/ubuntu/ubuntu/ +http://ubuntu.eriders.ge/ubuntu/ +http://ubuntu.lhi.is/ubuntu/ +http://ubuntu.mirror.rafal.ca/ubuntu/ +http://ubuntu.mirrors.skynet.be/pub/ubuntu.com/ubuntu/ +http://ubuntu.sh.cvut.cz/ +http://ubuntu.snet.uz/ubuntu/ +http://ftp.leg.uct.ac.za/pub/linux/ubuntu/ +http://archive.mnosi.org/ubuntu/ +http://free.nchc.org.tw/ubuntu/ +http://carroll.cac.psu.edu/pub/linux/distributions/ubuntu/ +http://ftp.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/ +http://ftp.fsn.hu/pub/linux/distributions/ubuntu/ +http://packages.midian.hu//pub/linux/distributions/ubuntu/ +http://ftp.iitm.ac.in/ubuntu/ +http://ftp.tuke.sk/ubuntu/ +http://ubuntu.mirror.frontiernet.net/ubuntu/ +http://san.csc.calpoly.edu/ubuntu/ubuntu/ +http://ftp.freepark.org/pub/linux/distributions/ubuntu/ +ftp://ftp.linux.org.tr/pub/ubuntu/ +http://mirror.ox.ac.uk/sites/archive.ubuntu.com/ubuntu/ +http://mirror.rootguide.org/ubuntu/ +http://ubuntu.csie.nctu.edu.tw/ubuntu/ +http://mirror.gamais.itb.ac.id/ubuntu/ +http://th.archive.ubuntu.com/ubuntu/ +http://ubuntu.uz/ubuntu/ +http://ubuntu.org.ua/ubuntu/ +http://ftp-stud.hs-esslingen.de/ubuntu/ +http://ftp.belnet.be/pub/mirror/ubuntu.com/ubuntu/ +http://ftp.daum.net/ubuntu/ +http://ftp.netspace.net.au/pub/ubuntu/ +http://ftp.pwr.wroc.pl/ubuntu/ +http://ftp.science.nus.edu.sg/ubuntu/ +http://godel.cs.bilgi.edu.tr/ubuntu/ +http://mirror.hgkz.ch/ubuntu/ +http://mirrors.ccs.neu.edu/archive.ubuntu.com/ +http://tezcatl.fciencias.unam.mx/ubuntu/ +http://mirror.grapevine.com.au/ubuntu/archive/ +http://mirror.utdlug.org/linux/distributions/ubuntu/packages/ +http://mt.archive.ubuntu.com/ubuntu/ +http://ftp.yz.yamagata-u.ac.jp/pub/linux/ubuntu/archives/ +ftp://ftp.mipt.ru/mirror/ubuntu/ +http://nl2.archive.ubuntu.com/ubuntu/ +http://ftp.cw.net/ubuntu/ +http://ftp.udc.es/ubuntu/ +http://sunsite.informatik.rwth-aachen.de/ftp/pub/Linux/ubuntu/ubuntu/ +http://ubuntu.otenet.gr/ +http://wwwftp.ciril.fr/pub/linux/ubuntu/archives/ +http://ftp.freepark.org/ubuntu/ +http://mir1.ovh.net/ubuntu/ +http://ftp.astral.ro/mirrors/ubuntu.com/archive/ +http://ubuntu.compuporter.net/archive/ +http://mirrors.shlug.org/ubuntu/ +http://ubuntu.mls.nc/ubuntu/ +http://ftp.jaist.ac.jp/pub/Linux/ubuntu/ +http://nz2.archive.ubuntu.com/ubuntu/ +http://ubuntu.grn.cat/ubuntu/ +http://ubuntu.positive-internet.com/ubuntu/ +http://ubuntu-archive.polytechnic.edu.na/ +http://ubuntu.media.mit.edu/ubuntu/ +http://ftp.ncnu.edu.tw/Linux/ubuntu/ubuntu/ +http://ftp.iut-bm.univ-fcomte.fr/ubuntu/ +http://esda.wu-wien.ac.at/pub/ubuntu-archive/ +http://mirror.aarnet.edu.au/pub/ubuntu/archive/ +http://ftp.hostrino.com/pub/ubuntu/archive/ +http://mirror.internode.on.net/pub/ubuntu/ubuntu/ +http://mirror.yandex.ru/ubuntu/ +http://mirror.zhdk.ch/ubuntu/ +http://gulus.usherbrooke.ca/ubuntu/ +http://mirrors.rit.edu/ubuntu/ +http://ftp.tecnoera.com/ubuntu/ +http://ftp5.gwdg.de/pub/linux/debian/ubuntu/ +http://mirror.csclub.uwaterloo.ca/ubuntu/ +http://dl2.foss-id.web.id/ubuntu/ +http://debian.nctu.edu.tw/ubuntu/ +http://rs.archive.ubuntu.com/ubuntu/ +http://ubuntu.apt-get.eu/ubuntu/ +http://ftp.energotel.sk/pub/linux/ubuntu/ +http://ubuntu.intuxication.net/ubuntu/ +http://www.las.ic.unicamp.br/pub/ubuntu/ +http://mirror.3fl.net.au/ubuntu/ +http://ftp.belnet.be/mirror/ubuntu.com/ubuntu/ +ftp://mirrors.dotsrc.org/ubuntu-cd/ +http://mirror.clarkson.edu/pub/ubuntu/ +http://public.planetmirror.com/pub/ubuntu/archive/ +http://ubuntu.interlegis.gov.br/ubuntu/ +http://archive.ubuntu.mnosi.org/ubuntu/ +http://ubuntu-archive.polytechnic.edu.na/ubuntu/ +http://nz.archive.ubuntu.com/ubuntu/ +http://ftp.corbina.net/pub/Linux/ubuntu/ +http://nl3.archive.ubuntu.com/ubuntu/ +http://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/ +ftp://ftp.corbina.net/pub/Linux/ubuntu/ +http://ftp.wcss.pl/ubuntu/ +ftp://swtsrv.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/ +http://ubuntutym.u-toyama.ac.jp/ubuntu/ +http://ftp.dat.etsit.upm.es/ubuntu/ +http://mirrors.acm.jhu.edu/ubuntu/ +http://ubuntu-archive.patan.com.ar/ +http://mirror.fslutd.org/linux/distributions/ubuntu/packages/ +http://swtsrv.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/ +http://ubuntu.mirror.cambrium.nl/ubuntu/ +http://ftp.vxu.se/ubuntu/ +ftp://news.chu.edu.tw/Linux/Ubntu/packages/ +http://mirrors.jgi-psf.org/ubuntu/ +http://ftp.df.lth.se/ubuntu/ +http://mirror1.lockdownhosting.com/ubuntu/ +http://ubuntu-ashisuto.ubuntulinux.jp/ubuntu/ +http://ubuntu-mirror.cs.colorado.edu/ubuntu/ +http://ubuntu.gnu.gen.tr/ubuntu/ +http://ubuntu.mirrors.isu.net.sa/ubuntu/ +http://ubuntu.osuosl.org/ubuntu/ +http://ubuntu.qatar.cmu.edu/ubuntu/ +http://ubuntu.retrosnub.co.uk/ +http://archive.ubuntu-rocks.org/ubuntu/ +http://ftp.utexas.edu/ubuntu/ +http://piotrkosoft.net/pub/mirrors/ubuntu/ +http://ubuntu.univ-reims.fr/ubuntu/ +ftp://ftp.chu.edu.tw/Linux/Ubntu/packages/ +http://archive.linux.duke.edu/ubuntu/ +http://mirrors.us.kernel.org/ubuntu/ +http://mirrors3.kernel.org/ubuntu/ +http://mirrors4.kernel.org/ubuntu/ +http://softlibre.unizar.es/ubuntu/archive/ +http://gpl.savoirfairelinux.net/pub/mirrors/ubuntu/ +http://ubuntu.utalca.cl/ +http://giano.com.dist.unige.it/ubuntu/ +http://sk.archive.ubuntu.com/ubuntu/ +http://mirrors.nl.eu.kernel.org/ubuntu/ +http://mirrors.se.eu.kernel.org/ubuntu/ +http://ftp.sunet.se/pub/Linux/distributions/ubuntu/ubuntu/ +http://ftp.antik.sk/ubuntu/ +ftp://ftp.chu.edu.tw/Linux/Ubuntu/packages/ +http://ftp.klid.dk/ftp/ubuntu/ +http://ike.egr.msu.edu/pub/ubuntu/archive/ +http://mirror.mirohost.net/ubuntu/ +http://ubuntu.nano-box.net/ubuntu/ +http://mirror.powermongo.org/ubuntu/ +http://ftp-mirror.stu.edu.tw/ubuntu/ +http://mirrors.nfsi.pt/ubuntu/ +http://ftp.astral.ro/mirrors/ubuntu.com/ubuntu/ +http://ftp.caliu.cat/pub/distribucions/ubuntu/archive/ +http://gaosu.rave.org/ubuntu/ +http://mirror.cpsc.ucalgary.ca/mirror/ubuntu.com/packages/ +http://astromirror.uchicago.edu/ubuntu/ +http://mirrors.xservers.ro/ubuntu/ +http://mirror.its.uidaho.edu/pub/ubuntu/ +http://samaritan.ucmerced.edu/ubuntu/ +http://ftp.free.org/mirrors/archive.ubuntu.com/ubuntu/ +http://fileserver.uniroma1.it/ubuntu/ +http://ftp.cvut.cz/ubuntu/ +http://ftp.riken.jp/Linux/ubuntu/ +http://ftp.telfort.nl/ubuntu/ +http://ubuntu.indika.net.id/ +http://ubuntu.secsup.org/ +http://ubuntu.wallawalla.edu/ubuntu/ +http://mirror.isoc.org.il/pub/ubuntu/ +http://ubuntu.dormforce.net/ubuntu/ +http://89.148.222.236/ubuntu/ +http://ubuntu-archive.mirrors.proxad.net/ubuntu/ +http://mirror.rol.ru/ubuntu/ +http://ftp.caliu.info/pub/distribucions/ubuntu/ubuntu/ +http://mirror.ousli.org/ubuntu/ +http://ubuntu.patan.com.ar/ubuntu/ +http://archive.ubuntu.mirror.dkm.cz/ubuntu/ +http://ftp.mtu.ru/pub/ubuntu/archive/ +http://ubuntu.stu.edu.tw/ubuntu/ +http://archive.mmu.edu.my/ubuntu/ +http://ftp.metu.edu.tr/ubuntu/ +http://mirror.wff-gaming.de/ubuntu/ +http://repository.linux.pf/ubuntu/ +http://ubuntu.mmu.edu.my/ubuntu/ +http://mirror.umoss.org/ubuntu/ +http://mirror.oscc.org.my/ubuntu/ +http://mirror.globo.com/ubuntu/archive/ +http://sunsite.rediris.es/mirror/ubuntu-archive/ +http://linux.org.by/ubuntu/ +http://mirror.nus.edu.sg/ubuntu/ +http://www.ftp.ne.jp/Linux/packages/ubuntu/archive/ +http://mirror.math.ucdavis.edu/ubuntu/ +http://archive.mitra.net.np/ubuntu/ +http://pf.archive.ubuntu.com/ubuntu/ +http://mirror-fpt-telecom.fpt.net/ubuntu/ +http://ftp.linux.org.tr/ubuntu/ +http://mirrors.cytanet.com.cy/linux/ubuntu-archive/ +http://mirrors.cytanet.com.cy/linux/ubuntu/archive/ +ftp://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu/ +http://mirror.cps.cmich.edu/ubuntu/ +http://mirrors.hitsol.net/ubuntu/ +http://ubuntu.hitsol.net/ubuntu/ +http://ubuntu.mirror.iweb.ca/ +http://ubuntu.mirror.su.se/ubuntu/ +http://ubuntu.oss.eznetsols.org/ubuntu/ +http://mirrors.portafixe.com/ubuntu/archive/ +http://ubuntu.lagis.at/ubuntu/ +http://mirror.gnucv.cl/ubuntu/ +http://russell.cs.bilgi.edu.tr/ubuntu/ +ftp://ftp.chu.edu.tw/Linux/Ubuntu/archives/ +http://mirrors.ccs.neu.edu/ubuntu/ +http://ubuntu-mirror.sit.kmutt.ac.th/archive/ +http://ubuntu.ictvalleumbra.it/ubuntu/ +http://mirror.arlug.ro/pub/ubuntu/ubuntu/ +http://ubuntuarchive.eweka.nl/ubuntu/ +http://ftp.cs.pu.edu.tw/Linux/Ubuntu/ubuntu/ +http://ftp.ds.karen.hj.se/ubuntu/ +http://kebo.vlsm.org/ubuntu/ +http://mirror1.ku.ac.th/ubuntu/ +http://peloto.pantuflo.es/ubuntu/ +http://ucho.ignum.cz/ubuntu/ +http://archive.monubuntu.fr/ +http://mirror.korea.ac.kr/ubuntu/ +http://ubuntu2.cica.es/ubuntu/ +http://ftp.sh.cvut.cz/MIRRORS/ubuntu/ +http://archive.ubuntu.mirror.dkm.cz/ +http://ftp.tudelft.nl/archive.ubuntu.com/ +http://mirror.netspace.net.au/pub/ubuntu/archive/ +http://mirror.uoregon.edu/ubuntu/archives/ +http://ubuntu.mirror.garr.it/mirrors/ubuntu-archive/ +http://ubuntu-archive.sit.kmutt.ac.th/ +http://mirror.files.bigpond.com/ +http://ubuntu-archives.mirror.nexicom.net/ +http://ftp.acc.umu.se/ubuntu/ +http://ftp.snt.utwente.nl/pub/os/linux/ubuntu/ +http://mirror.i3d.net/pub/ubuntu/ +http://mirror.internetone.it/ubuntu-archive/ +http://mirror.pnl.gov/ubuntu/ +http://ubuntu.idrepo.or.id/ubuntu/ +http://ubuntu.laps.ufpa.br/ubuntu/ +http://ubuntu.mirror.tudos.de/ubuntu/ +http://mirror.nl.leaseweb.net/ubuntu/ +http://mirror.us.leaseweb.net/ubuntu/ +http://bouyguestelecom.ubuntu.lafibre.info/ubuntu/ +http://ftp.byfly.by/ubuntu/ +http://ftp.sunet.se/pub/os/Linux/distributions/ubuntu/ubuntu/ +http://mirror.datacenter.by/ubuntu/ +http://mirror.de.leaseweb.net/ubuntu/ +http://mirror.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/ +http://mirror.lstn.net/ubuntu/ +http://mirror.lzu.edu.cn/ubuntu/ +http://mirror.netcologne.de/ubuntu/ +http://mirror.serverloft.eu/ubuntu/ubuntu/ +http://mirrors.adnettelecom.ro/ubuntu/ +http://mirror.ovh.net/ubuntu/ +http://ubuntu.cica.es/ubuntu/ +http://ubuntu.mirror.pop-sc.rnp.br/ubuntu/ +http://ubuntu.ufba.br/ubuntu/ +http://76.73.4.58/ubuntu/ +http://artfiles.org/ubuntu.com/ +http://cesium.di.uminho.pt/pub/ubuntu-archive/ +http://debian.informatik.uni-erlangen.de/ubuntu/ +http://download.nus.edu.sg/mirror/ubuntu/ +http://ftp.availo.se/ubuntu/ +http://archive.mirror.blix.eu/ubuntu/ +ftp://ftp.csie.chu.edu.tw/Ubuntu/archive/ +http://archive.ubuntumirror.dei.uc.pt/ubuntu/ +http://ftp.egr.msu.edu/pub/ubuntu/archive/ +http://ftp.icm.edu.pl/pub/Linux/ubuntu/ +http://ftp.info.uvt.ro/ubuntu/ +http://ftp.lysator.liu.se/ubuntu/ +http://ftp.nsysu.edu.tw/Ubuntu/ubuntu/ +http://ftp.portlane.com/ubuntu/ +http://ftp.rnl.ist.utl.pt/pub/ubuntu/archive/ +http://ftp.roedu.net/mirrors/ubuntulinux.org/ubuntu/ +http://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu/ +http://ubuntu.saix.net/ubuntu-archive/ +http://ftp.tcc.edu.tw/Linux/ubuntu/ +http://ftp.telfort.nl/pub/mirror/ubuntu/ +http://ftp.tku.edu.tw/ubuntu/ +http://ftp.tsukuba.wide.ad.jp/Linux/ubuntu/ +http://ftp.tu-chemnitz.de/pub/linux/ubuntu-ports/ +http://ftp.tu-ilmenau.de/mirror/ubuntu/ +http://ftp.uni-erlangen.de/mirrors/ubuntu/ +http://kambing.ui.ac.id/ubuntu/ +http://mirror.as29550.net/archive.ubuntu.com/ +http://mirror.bauhuette.fh-aachen.de/ubuntu/ +http://mirror.bytemark.co.uk/ubuntu/ +http://mirror.clibre.uqam.ca/ubuntu/ +http://mirror.corbina.net/ubuntu/ +http://mirror.cse.iitk.ac.in/ubuntu/ +http://mirror.dattobackup.com/ubuntu/ +http://mirror.ihug.co.nz/ubuntu/ +http://mirror.its.sfu.ca/mirror/ubuntu/ +http://mirror.kavalinux.com/ubuntu/ +http://mirror.kku.ac.th/ubuntu/ +http://mirror.krystal.co.uk/ubuntu/ +http://mirror.metrocast.net/ubuntu/ +http://mirror.netlinux.cl/ubuntu/ +http://mirror.netspace.net.au/pub/ubuntu/ +http://mirror.neu.edu.cn/ubuntu/ +http://mirror.peer1.net/ubuntu/ +http://mirror.soften.ktu.lt/ubuntu/ +http://mirror.sov.uk.goscomb.net/ubuntu/ +http://mirror.steadfast.net/ubuntu/ +http://mirror.symnds.com/ubuntu/ +http://mirror.team-cymru.org/ubuntu/ +http://mirror.telepoint.bg/ubuntu/ +http://mirror.timeweb.ru/ubuntu/ +http://mirror.umd.edu/ubuntu/ +http://mirror.unesp.br/ubuntu/ +http://mirror.unix-solutions.be/ubuntu/ +http://mirror.uoregon.edu/ubuntu/ +http://mirror01.th.ifl.net/ubuntu/ +http://mirror2.corbina.ru/ubuntu/ +http://mirrors.163.com/ubuntu/ +http://mirrors.accretive-networks.net/ubuntu/ +http://mirrors.coopvgg.com.ar/ubuntu/ +http://mirrors.coreix.net/ubuntu/ +http://mirrors.ecvps.com/ubuntu/ +http://mirrors.fe.up.pt/ubuntu/ +http://mirrors.gigenet.com/ubuntuarchive/ +http://mirrors.ircam.fr/pub/ubuntu/archive/ +http://mirrors.melbourne.co.uk/ubuntu/ +http://mirrors.mit.edu/ubuntu/ +http://mirrors.psu.ac.th/pub/ubuntu/ +http://mirrors.sohu.com/ubuntu/ +http://mirrors.syringanetworks.net/ubuntu-archive/ +http://mirrors.tecnoera.com/ubuntu/ +http://mirrors.telianet.dk/ubuntu/ +http://mirrors.uaip.org/ubuntu/ +http://mirrors.ustc.edu.cn/ubuntu/ +http://osmirror.rug.nl/ubuntu/ +http://no.archive.ubuntu.com/ubuntu/ +http://rpm.scl.rs/linux/ubuntu/archive/ +http://shadow.ind.ntou.edu.tw/ubuntu/ +http://speglar.simnet.is/ubuntu/ +http://vesta.informatik.rwth-aachen.de/ftp/pub/Linux/ubuntu/ubuntu/ +http://suse.uni-leipzig.de/pub/releases.ubuntu.com/ubuntu/ +http://tux.rainside.sk/ubuntu/ +http://ubuntu-archive.locaweb.com.br/ubuntu/ +http://ubuntu-mirror.telesys.org.ua/ubuntu/ +http://ubuntu.arcticnetwork.ca/ +http://ubuntu.cs.nctu.edu.tw/ubuntu/ +http://ubuntu.cybercomhosting.com/ubuntu/ +http://ubuntu.datahop.net/ubuntu/ +http://ubuntu.etf.bg.ac.rs/ubuntu/ +http://ubuntu.koyanet.lv/ubuntu/ +http://ubuntu.load.lv/ubuntu/ +http://ubuntu.mirror.atratoip.net/ubuntu/ +http://ubuntu.mirror.root.lu/ubuntu/ +http://ubuntu.mirror.tn/ +http://ubuntu.mirror.vu.lt/ubuntu/ +http://ubuntu.mirrors.crysys.hu/ +http://ubuntu.mirrors.pair.com/archive/ +http://ubuntu.mirrors.uk2.net/ubuntu/ +http://ubuntu.pesat.net.id/archive/ +http://ubuntu.trumpetti.atm.tut.fi/ubuntu/ +http://ubuntu.tsl.gr/ +http://ubuntu.uach.mx/ +http://ubuntu.uc3m.es/ubuntu/ +http://ubuntu.uib.no/archive/ +http://ubuntu.unitedcolo.de/ubuntu/ +http://ubuntu.wikimedia.org/ubuntu/ +http://ucmirror.canterbury.ac.nz/ubuntu/ +http://www-ftp.lip6.fr/pub/linux/distributions/Ubuntu/archive/ +http://www.club.cc.cmu.edu/pub/ubuntu/ +http://ubuntuarchive.xfree.com.ar/ubuntu/ +http://ubuntu-archive.adsolux.com/ubuntu/ +http://archive.ubuntu.nautile.nc/ubuntu/ +http://biruni.upm.my/mirror/ubuntu/ +http://cosmos.cites.illinois.edu/pub/ubuntu/ +http://deis-mirrors.isec.pt/ubuntu/ +http://mirror.fcaglp.unlp.edu.ar/ubuntu/ +http://ftp.arnes.si/pub/mirrors/ubuntu/ +ftp://ftp.iitb.ac.in/distributions/ubuntu/archives/ +http://ftp.litnet.lt/ubuntu/ +ftp://ftp.rezopole.net/ubuntu/ +http://ftp.sjtu.edu.cn/ubuntu/ +http://ftp.sun.ac.za/ftp/ubuntu/ +http://linux.nsu.ru/ubuntu/ +http://linux.ntuoss.org/ubuntu/ +http://linux.psu.ru/ubuntu/ +http://mirror.beget.ru/ubuntu/ +http://mirror-cybernet.lums.edu.pk/pub/ubuntu/ +http://mirror.alfredstate.edu/ubuntu/ +http://mirror.as24220.net/pub/ubuntu/archive/ +http://mirror.bjtu.edu.cn/ubuntu/ +http://mirror.clarkson.edu/ubuntu/ +http://mirror.hmc.edu/ubuntu/ +http://mirror.hosef.org/ubuntu/ +http://mirror.its.dal.ca/ubuntu/ +http://mirror.learn.ac.lk/ubuntu/ +http://mirror.linux.org.au/ubuntu/ +http://mirror.neolabs.kz/ubuntu/ +http://mirror.picosecond.org/ubuntu/ +http://mirror.rayquang.net/ubuntu/ +ftp://mirror.space.kz/ubuntu/ +http://mirror.squ.edu.om/ubuntuarchive/ +http://mirrors.bloomu.edu/ubuntu/ +http://mirrors.ispros.com.bd/ubuntu/ +http://mirrors.serverhost.ro/ubuntu/archive/ +http://mirrors.ucr.ac.cr/ubuntu/ +http://singo.ub.ac.id/ubuntu/ +http://ubuntu.alex-vichev.info/ +http://ubuntu.eecs.wsu.edu/ +http://ubuntu.mirror.netelligent.ca/ubuntu/ +http://ubuntu.mirrors.skynet.be/ubuntu/ +http://ubuntu.qualitynet.net/ubuntu/ +http://ubuntu.retrosnub.co.uk/ubuntu/ +http://ubuntu.sastudio.jp/ubuntu/ +http://ubuntu.securedservers.com/ +http://ubuntu.skarta.net/ubuntu/ +http://ubuntu.srt.cn/ubuntu/ +http://ubuntu.sth.sze.hu/ubuntu/ +http://ubuntu.unal.edu.co/ubuntu/ +http://ubuntuarchive.hnsdc.com/ubuntu/ +http://us.archive.ubuntu.com/ubuntu/ +http://www.lug.bu.edu/mirror/ubuntu/ +http://www.mirror.upm.edu.my/ubuntu/ +http://bos.fkip.uns.ac.id/ubuntu/ +http://distrib-coffee.ipsl.jussieu.fr/ubuntu/ +http://distrib-coffee.ipsl.jussieu.fr/pub/linux/ubuntu/ +http://ftp.ccc.uba.ar/pub/linux/ubuntu/ +http://glug.nith.ac.in/ubuntu/archives/ +http://kartolo.sby.datautama.net.id/ubuntu/ +http://mirror.greennet.gl/ubuntu/ +http://mirror.lihnidos.org/ubuntu/ubuntu/ +http://mirror.pregi.net/ubuntu/ +http://mirrors.einstein.yu.edu/ubuntu/archive/ +http://ubuntu.cic.userena.cl/ubuntu/ +http://buaya.klas.or.id/ubuntu/ +http://ftp.leg.uct.ac.za/ubuntu/ +http://mirror.calvin.edu/ubuntu/ +http://mirror.vcu.edu/pub/gnu+linux/ubuntu/ +http://mirror.waia.asn.au/ubuntu/ +ftp://mirror1.cs.washington.edu/ubuntu/ +http://ubuntu.grena.ge/ubuntu/ +http://ubuntu.tuxuri.com/ubuntu/ +http://ubuntu.unc.edu.ar/ubuntu/ +http://mirror.linux.org.mt/ubuntu/ +http://linux.vlz.su/ubuntu/ +http://de2.archive.ubuntu.com/ubuntu/ +http://ge.archive.ubuntu.com/ubuntu/ +http://np.archive.ubuntu.com/ubuntu/ +http://ubuntu.ctu.edu.vn/archive/ diff -Nru update-manager-17.10.11/DistUpgrade/patches/README update-manager-0.156.14.15/DistUpgrade/patches/README --- update-manager-17.10.11/DistUpgrade/patches/README 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/patches/README 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,17 @@ +This dir can be used to drop *ed* script as patches (we can not use +patch as its not part of the default install) to fixup stuff that is +problematic during the upgrade (like doc-base and +/usr/sbin/install-docs). + +The files have the format _path_to_binary.orig_md5sum.result_md5sum + +The upgrader will check for binaries with the matching md5sum and +apply the patches if the md5sum is correct (first --dry-run to +ensure it applies cleanly). + +Caveats: +- it does *not* do binary patching +- the md5sum calculation in python is not efficient, so do + *not* patch huge files +- the ed implementation is in python and reads the full file + into memory so only use it for smallish files diff -Nru update-manager-17.10.11/DistUpgrade/patches/_usr_bin_pycompile.b17cebfbf18d152702278b15710d5095.97c07a02e5951cf68cb3f86534f6f917 update-manager-0.156.14.15/DistUpgrade/patches/_usr_bin_pycompile.b17cebfbf18d152702278b15710d5095.97c07a02e5951cf68cb3f86534f6f917 --- update-manager-17.10.11/DistUpgrade/patches/_usr_bin_pycompile.b17cebfbf18d152702278b15710d5095.97c07a02e5951cf68cb3f86534f6f917 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/patches/_usr_bin_pycompile.b17cebfbf18d152702278b15710d5095.97c07a02e5951cf68cb3f86534f6f917 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,80 @@ +278a + if process.returncode not in (None, 0): + rv = process.returncode + sys.exit(rv) +. +276a + rv = 0 +. +271c + compile(files, versions, + options.force, options.optimize, e_patterns) +. +265c + compile(files, versions, + options.force, options.optimize, e_patterns) +. +258c + compile(files, compile_versions, options.force, + options.optimize, e_patterns) +. +238c + if options.vrange and options.vrange[0] == options.vrange[1] and\ + options.vrange != (None, None) and\ + exists("/usr/bin/python%d.%d" % options.vrange[0]): + # specific version requested, use it even if it's not in SUPPORTED + versions = set(options.vrange[:1]) + else: + versions = get_requested_versions(options.vrange, available=True) +. +207a + parser.add_option('-f', '--force', action='store_true', dest='force', + default=False, help='force rebuild even if timestamps are up-to-date') + parser.add_option('-O', action='store_true', dest='optimize', + default=False, help="byte-compile to .pyo files") +. +194c + try: + pipe = STDINS[version] + except KeyError: + # `pycompile /usr/lib/` invoked, add missing worker + pipe = py_compile(version, optimize, WORKERS) + pipe.next() + STDINS[version] = pipe +. +191,192c + cfn = fn + 'c' if (__debug__ or not optimize) else 'o' + if exists(cfn) and not force: + ftime = os.stat(fn).st_mtime + try: + ctime = os.stat(cfn).st_mtime + except os.error: + ctime = 0 + if (ctime > ftime): + continue +. +185c + coroutine = py_compile(version, optimize, WORKERS) +. +180c +def compile(files, versions, force, optimize, e_patterns=None): +. +170c + cmd = "python%s%s -m py_compile -" \ + % (version, '' if (__debug__ or not optimize) else ' -O') +. +167c +def py_compile(version, optimize, workers): +. +31c +from subprocess import PIPE, STDOUT, Popen +. +27a +import os +. +5a +# Copyright © 2010 Canonical Ltd +. +2c +# -*- coding: utf-8 -*- +. diff -Nru update-manager-17.10.11/DistUpgrade/plugins/deb_plugin.py update-manager-0.156.14.15/DistUpgrade/plugins/deb_plugin.py --- update-manager-17.10.11/DistUpgrade/plugins/deb_plugin.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/plugins/deb_plugin.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,41 @@ +# deb_plugin.py - common package for post_cleanup for apt/.deb packages +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import computerjanitor +import apt + + +class DebPlugin(computerjanitor.Plugin): + + """Plugin for post_cleanup processing with apt. + + This plugin does not find any cruft of its own. Instead it + centralizes the post_cleanup handling for all packages that remove + .deb packages. + + """ + + def get_cruft(self): + return [] + + def post_cleanup(self): + try: + self.app.apt_cache.commit(apt.progress.text.AcquireProgress(), + apt.progress.base.InstallProgress()) + except Exception: # pragma: no cover + raise + finally: + self.app.refresh_apt_cache() diff -Nru update-manager-17.10.11/DistUpgrade/plugins/deb_plugin_tests.py update-manager-0.156.14.15/DistUpgrade/plugins/deb_plugin_tests.py --- update-manager-17.10.11/DistUpgrade/plugins/deb_plugin_tests.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/plugins/deb_plugin_tests.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,52 @@ +# deb_plugin_tests.py - unittests for deb_plugin.py +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import unittest + +import deb_plugin + + +class MockApplication(object): + + def __init__(self): + self.commit_called = False + self.refresh_called = False + self.apt_cache = self + + def commit(self, foo, bar): + self.commit_called = True + + def refresh_apt_cache(self): + self.refresh_called = True + + +class DebPluginTests(unittest.TestCase): + + def setUp(self): + self.plugin = deb_plugin.DebPlugin() + self.app = MockApplication() + self.plugin.set_application(self.app) + + def testReturnsEmptyListOfCruft(self): + self.assertEqual(self.plugin.get_cruft(), []) + + def testPostCleanupCallsCommit(self): + self.plugin.post_cleanup() + self.assert_(self.app.commit_called) + + def testPostCleanupCallsRefresh(self): + self.plugin.post_cleanup() + self.assert_(self.app.refresh_called) diff -Nru update-manager-17.10.11/DistUpgrade/plugins/dpkg_status_plugin.py update-manager-0.156.14.15/DistUpgrade/plugins/dpkg_status_plugin.py --- update-manager-17.10.11/DistUpgrade/plugins/dpkg_status_plugin.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/plugins/dpkg_status_plugin.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,66 @@ +# dpkg_status.py - compact the dpkg status file +# Copyright (C) 2009 Canonical, Ltd. +# +# Author: Michael Vogt +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +from apt_pkg import TagFile +import subprocess +import logging + +import computerjanitor +_ = computerjanitor.setup_gettext() + + +class DpkgStatusCruft(computerjanitor.Cruft): + + def __init__(self, n_items): + self.n_items = n_items + + def get_prefix(self): + return "dpkg-status" + + def get_prefix_description(self): # pragma: no cover + return _("%i obsolete entries in the status file") % self.n_items + + def get_shortname(self): + return _("Obsolete entries in dpkg status") + + def get_description(self): # pragma: no cover + return _("Obsolete dpkg status entries") + + def cleanup(self): # pragma: no cover + logging.debug("calling dpkg --forget-old-unavail") + res = subprocess.call(["dpkg","--forget-old-unavail"]) + logging.debug("dpkg --forget-old-unavail returned %s" % res) + +class DpkgStatusPlugin(computerjanitor.Plugin): + + def __init__(self, fname="/var/lib/dpkg/status"): + self.status = fname + self.condition = ["PostCleanup"] + + def get_cruft(self): + n_cruft = 0 + tagf = TagFile(open(self.status)) + while tagf.step(): + statusline = tagf.section.get("Status") + (want, flag, status) = statusline.split() + if want == "purge" and flag == "ok" and status == "not-installed": + n_cruft += 1 + logging.debug("DpkgStatusPlugin found %s cruft items" % n_cruft) + if n_cruft: + return [DpkgStatusCruft(n_cruft)] + return [] # pragma: no cover diff -Nru update-manager-17.10.11/DistUpgrade/plugins/dpkg_status_plugin_tests.py update-manager-0.156.14.15/DistUpgrade/plugins/dpkg_status_plugin_tests.py --- update-manager-17.10.11/DistUpgrade/plugins/dpkg_status_plugin_tests.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/plugins/dpkg_status_plugin_tests.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,39 @@ +# dpkg_status.py - compact the dpkg status file +# Copyright (C) 2009 Canonical, Ltd. +# +# Author: Michael Vogt +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import os +import tempfile +import unittest + +import dpkg_status_plugin + + +class AutoRemovalPluginTests(unittest.TestCase): + + def setUp(self): + fd, self.fname = tempfile.mkstemp() + os.write(fd, "Status: purge ok not-installed\n") + os.close(fd) + self.plugin = dpkg_status_plugin.DpkgStatusPlugin(self.fname) + + def tearDown(self): + os.remove(self.fname) + + def testDpkgStatus(self): + names = [cruft.get_name() for cruft in self.plugin.get_cruft()] + self.assertEqual(sorted(names), sorted([u"dpkg-status:Obsolete entries in dpkg status"])) diff -Nru update-manager-17.10.11/DistUpgrade/plugins/kdelibs4to5_plugin.py update-manager-0.156.14.15/DistUpgrade/plugins/kdelibs4to5_plugin.py --- update-manager-17.10.11/DistUpgrade/plugins/kdelibs4to5_plugin.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/plugins/kdelibs4to5_plugin.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,41 @@ +# kdelibs4to5_plugin.py - install kdelibs5-dev if kdeblibs4-dev is installed +# Copyright (C) 2009 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import computerjanitor +_ = computerjanitor.setup_gettext() + + +class Kdelibs4devToKdelibs5devPlugin(computerjanitor.Plugin): + + """Plugin to install kdelibs5-dev if kdelibs4-dev is installed. + + See also LP: #279621. + + """ + + def __init__(self): + self.condition = ["from_hardyPostDistUpgradeCache"] + + def get_cruft(self): + fromp = "kdelibs4-dev" + top = "kdelibs5-dev" + cache = self.app.apt_cache + if (fromp in cache and cache[fromp].is_installed and + top in cache and not cache[top].is_installed): + yield computerjanitor.MissingPackageCruft(cache[top], + _("When upgrading, if kdelibs4-dev is installed, " + "kdelibs5-dev needs to be installed. See " + "bugs.launchpad.net, bug #279621 for details.")) diff -Nru update-manager-17.10.11/DistUpgrade/plugins/langpack_manual_plugin.py update-manager-0.156.14.15/DistUpgrade/plugins/langpack_manual_plugin.py --- update-manager-17.10.11/DistUpgrade/plugins/langpack_manual_plugin.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/plugins/langpack_manual_plugin.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,65 @@ +# langpack_manual_plugin.py - mark langpacks to be manually installed +# Copyright (C) 2009 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import computerjanitor +_ = computerjanitor.setup_gettext() + +import logging + +class ManualInstallCruft(computerjanitor.Cruft): + + def __init__(self, pkg): + self.pkg = pkg + + def get_prefix(self): + return "mark-manually-installed" + + def get_shortname(self): + return self.pkg.name + + def get_description(self): + return (_("%s needs to be marked as manually installed.") % + self.pkg.name) + + def cleanup(self): + self.pkg.markKeep() + self.pkg.markInstall() + + +class MarkLangpacksManuallyInstalledPlugin(computerjanitor.Plugin): + + """Plugin to mark language packs as manually installed. + + This works around quirks in the hardy->intrepid upgrade. + + """ + + def __init__(self): + self.condition = ["from_hardyPostDistUpgradeCache"] + + def get_cruft(self): + # language-support-* changed its dependencies from "recommends" + # to "suggests" for language-pack-* - this means that apt will + # think they are now auto-removalable if they got installed + # as a dep of language-support-* - we fix this here + cache = self.app.apt_cache + for pkg in cache: + if (pkg.name.startswith("language-pack-") and + not pkg.name.endswith("-base") and + cache._depcache.IsAutoInstalled(pkg._pkg) and + pkg.is_installed): + logging.debug("setting '%s' to manual installed" % pkg.name) + yield ManualInstallCruft(pkg) diff -Nru update-manager-17.10.11/DistUpgrade/plugins/remove_lilo_plugin.py update-manager-0.156.14.15/DistUpgrade/plugins/remove_lilo_plugin.py --- update-manager-17.10.11/DistUpgrade/plugins/remove_lilo_plugin.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/plugins/remove_lilo_plugin.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,43 @@ +# remove_lilo_plugin.py - remove lilo if grub is also installed +# Copyright (C) 2009 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import os + +import logging +import computerjanitor +_ = computerjanitor.setup_gettext() + + +class RemoveLiloPlugin(computerjanitor.Plugin): + + """Plugin to remove lilo if grub is also installed.""" + + description = _("Remove lilo since grub is also installed." + "(See bug #314004 for details.)") + + def __init__(self): + self.condition = ["jauntyPostDistUpgradeCache"] + + def get_cruft(self): + if "lilo" in self.app.apt_cache and "grub" in self.app.apt_cache: + lilo = self.app.apt_cache["lilo"] + grub = self.app.apt_cache["grub"] + if lilo.is_installed and grub.is_installed: + if not os.path.exists("/etc/lilo.conf"): + yield computerjanitor.PackageCruft(lilo, self.description) + else: + logging.warning("lilo and grub installed, but " + "lilo.conf exists") diff -Nru update-manager-17.10.11/DistUpgrade/prerequists-sources.dapper.list update-manager-0.156.14.15/DistUpgrade/prerequists-sources.dapper.list --- update-manager-17.10.11/DistUpgrade/prerequists-sources.dapper.list 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/prerequists-sources.dapper.list 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,4 @@ +# sources.list fragment for pre-requists (mirror from sources.list + fallback) +# this is safe to remove after the upgrade +${mirror} +deb http://archive.ubuntu.com/ubuntu dapper-backports main/debian-installer diff -Nru update-manager-17.10.11/DistUpgrade/prerequists-sources.dapper-ports.list update-manager-0.156.14.15/DistUpgrade/prerequists-sources.dapper-ports.list --- update-manager-17.10.11/DistUpgrade/prerequists-sources.dapper-ports.list 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/prerequists-sources.dapper-ports.list 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,4 @@ +# sources.list fragment for pre-requists of arches living on ports.ubuntu.com +# no mirror because there are no mirrors here +# this is safe to remove after the upgrade +deb http://ports.ubuntu.com/ubuntu-ports dapper-backports main/debian-installer diff -Nru update-manager-17.10.11/DistUpgrade/prerequists-sources.list update-manager-0.156.14.15/DistUpgrade/prerequists-sources.list --- update-manager-17.10.11/DistUpgrade/prerequists-sources.list 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/prerequists-sources.list 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,6 @@ +# sources.list fragment for pre-requists (mirror from sources.list + fallback) +# this is safe to remove after the upgrade +${mirror} +# when this changes from -proposed to -updates, ensure to update +# DistUpgradeController.py:1393 as well +deb http://archive.ubuntu.com/ubuntu/ lucid-updates main diff -Nru update-manager-17.10.11/DistUpgrade/README update-manager-0.156.14.15/DistUpgrade/README --- update-manager-17.10.11/DistUpgrade/README 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/README 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,90 @@ +General +------- + +The dist-upgrader is designed to make upgrades for ubuntu (or similar +distributions) easy and painless. It supports both network mode and +cdrom upgrades. The cdromupgrade will ask if it should use the network +or not. There is a wrapper script "cdromupgrade" (that assumes the +file of the upgrade life in +CDROM_ROOT/dists/stable/dist-upgrader/binary-all/) that can be put +onto the CD and it will support upgrades directly from the CD. + + +Environment +----------- +The following environment variable will be *honored*: + +RELEASE_UPGRADE_NO_FORCE_OVERWRITE: +- if that is set, no --force-overwrite is used + +RELEASE_UPRADER_NO_APPORT: +- if that is set, apport is not run in case of package install falures + +RELEASE_UPRADER_ALLOW_THIRD_PARTY: +- if that is set, third party repositories will not be commented out + but instead tried to be upgraded + + + +The following environment variable will be *set* by the upgrader: +RELEASE_UPGRADE_IN_PROGRESS: +- set to "1" if a release-upgrade is running (and not a normal + package/security upgrade) +RELEASE_UPGRADE_MODE: +- either "desktop" or "server" + + +Configuration +------------- + +The DistUpgrade.cfg format is based on the python ConfigParser. + +It supports the following sections: + +[View] - controls the output +Depends: + Packages that must be installed to the version specified (just like + a regular depends line in a pkg). +[$view-used] +Depends: just like the global "view" depend but only evaluated when the + specific view is in use + +[Distro] - global distribution specfic options +BaseMetaPkgs: + the basic meta-pkgs that must be installed (ubuntu-base usually) +MetaPkgs: + packages that define a "desktop" (e.g. ubuntu-desktop) +PostUpgrade{Install,Remove,Purge}: + action right after the upgrade was calculated in the cache (marking + happens *before* the cache.commit()) +ForcedObsoletes: + Obsolete packages that the user is asked about after the upgrade (marking + happens *after* the cache.commit()) +RemoveEssentialOk: + Those packages are ok to remove even though they are essential +KeepInstalledPkgs: + If the package was installed before, it should still be installed + after the upgrade +KeepInstalledSection: + Packages from this section that were installed should always be + installed afterwards as well (useful for eg translations) + +[$meta-pkg] +KeyDependencies: + Dependencies that are considered "key" dependencies of the meta-pkg to + detect if it was installed but later removed by the user +PostUpgrade{Install,Remove,Purge}: + s.above +ForcedObsoletes: + s.above + +[Files] - file specific stuff + +[Sources] - how to rewrite the sources.list + +[Network] - network specific options + +[PreRequists] - use specific packages for dist-upgrade +Packages= List of what packages to look for +SourcesList=a sources.list fragment that will be placed into + /etc/apt/sources.list.d and that contains the backported pkgs \ No newline at end of file diff -Nru update-manager-17.10.11/DistUpgrade/ReleaseAnnouncement update-manager-0.156.14.15/DistUpgrade/ReleaseAnnouncement --- update-manager-17.10.11/DistUpgrade/ReleaseAnnouncement 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/ReleaseAnnouncement 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,56 @@ += Welcome to Ubuntu 12.04 LTS 'Precise Pangolin' = + +The Ubuntu team is proud to announce Ubuntu 12.04 LTS 'Precise Pangolin'. + +To see what's new in this release, visit: + http://www.ubuntu.com/desktop/features + +Ubuntu is a Linux distribution for your desktop or server, with a fast +and easy install, regular releases, a tight selection of excellent +applications installed by default, and almost any other software you +can imagine available through the network. + +We hope you enjoy Ubuntu. + +== Feedback and Helping == + +If you would like to help shape Ubuntu, take a look at the list of +ways you can participate at + + http://www.ubuntu.com/community/participate/ + +Your comments, bug reports, patches and suggestions will help ensure +that our next release is the best release of Ubuntu ever. If you feel +that you have found a bug please read: + + http://help.ubuntu.com/community/ReportingBugs + +Then report bugs using apport in Ubuntu. For example: + + ubuntu-bug linux + +will open a bug report in Launchpad regarding the linux package. + +If you have a question, or if you think you may have found a bug but +aren't sure, first try asking on the #ubuntu or #ubuntu-bugs IRC +channels on Freenode, on the Ubuntu Users mailing list, or on the +Ubuntu forums: + + http://help.ubuntu.com/community/InternetRelayChat + http://lists.ubuntu.com/mailman/listinfo/ubuntu-users + http://www.ubuntuforums.org/ + + +== More Information == + +You can find out more about Ubuntu on our website, IRC channel and wiki. +If you're new to Ubuntu, please visit: + + http://www.ubuntu.com/ + + +To sign up for future Ubuntu announcements, please subscribe to Ubuntu's +very low volume announcement list at: + + http://lists.ubuntu.com/mailman/listinfo/ubuntu-announce + diff -Nru update-manager-17.10.11/DistUpgrade/removal_blacklist.cfg update-manager-0.156.14.15/DistUpgrade/removal_blacklist.cfg --- update-manager-17.10.11/DistUpgrade/removal_blacklist.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/removal_blacklist.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,19 @@ +# blacklist of packages that should never be removed +ubuntu-standard +ubuntu-minimal +ubuntu-desktop +kubuntu-desktop +xubuntu-desktop +lubuntu-desktop +# update-manager itself should not remove itself +update-manager +update-manager-core +# posgresql (LP: #871893) +^postgresql-.*[0-9]\.[0-9].* +# the upgrade runs in it +^screen$ +# unity +unity$ +unity-2d$ +# gnome-session (LP: #946539) +gnome-session$ diff -Nru update-manager-17.10.11/DistUpgrade/screenrc update-manager-0.156.14.15/DistUpgrade/screenrc --- update-manager-17.10.11/DistUpgrade/screenrc 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/screenrc 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,3 @@ +logfile /var/log/dist-upgrade/screenlog.%n +logtstamp on +zombie xr \ No newline at end of file diff -Nru update-manager-17.10.11/DistUpgrade/SimpleGtk3builderApp.py update-manager-0.156.14.15/DistUpgrade/SimpleGtk3builderApp.py --- update-manager-17.10.11/DistUpgrade/SimpleGtk3builderApp.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/SimpleGtk3builderApp.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,61 @@ +""" + SimpleGladeApp.py + Module that provides an object oriented abstraction to pygtk and libglade. + Copyright (C) 2004 Sandino Flores Moreno +""" + +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import logging + +from gi.repository import Gtk + +# based on SimpleGladeApp +class SimpleGtkbuilderApp: + + def __init__(self, path, domain): + self.builder = Gtk.Builder() + self.builder.set_translation_domain(domain) + self.builder.add_from_file(path) + self.builder.connect_signals(self) + for o in self.builder.get_objects(): + if issubclass(type(o), Gtk.Buildable): + name = Gtk.Buildable.get_name(o) + setattr(self, name, o) + else: + logging.debug("WARNING: can not get name for '%s'" % o) + + def run(self): + """ + Starts the main loop of processing events checking for Control-C. + + The default implementation checks wheter a Control-C is pressed, + then calls on_keyboard_interrupt(). + + Use this method for starting programs. + """ + try: + Gtk.main() + except KeyboardInterrupt: + self.on_keyboard_interrupt() + + def on_keyboard_interrupt(self): + """ + This method is called by the default implementation of run() + after a program is finished by pressing Control-C. + """ + pass + diff -Nru update-manager-17.10.11/DistUpgrade/SimpleGtkbuilderApp.py update-manager-0.156.14.15/DistUpgrade/SimpleGtkbuilderApp.py --- update-manager-17.10.11/DistUpgrade/SimpleGtkbuilderApp.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/SimpleGtkbuilderApp.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,61 @@ +""" + SimpleGladeApp.py + Module that provides an object oriented abstraction to pygtk and libglade. + Copyright (C) 2004 Sandino Flores Moreno +""" + +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import logging + +import gtk + +# based on SimpleGladeApp +class SimpleGtkbuilderApp: + + def __init__(self, path, domain): + self.builder = gtk.Builder() + self.builder.set_translation_domain(domain) + self.builder.add_from_file(path) + self.builder.connect_signals(self) + for o in self.builder.get_objects(): + if issubclass(type(o), gtk.Buildable): + name = gtk.Buildable.get_name(o) + setattr(self, name, o) + else: + logging.debug("WARNING: can not get name for '%s'" % o) + + def run(self): + """ + Starts the main loop of processing events checking for Control-C. + + The default implementation checks wheter a Control-C is pressed, + then calls on_keyboard_interrupt(). + + Use this method for starting programs. + """ + try: + gtk.main() + except KeyboardInterrupt: + self.on_keyboard_interrupt() + + def on_keyboard_interrupt(self): + """ + This method is called by the default implementation of run() + after a program is finished by pressing Control-C. + """ + pass + diff -Nru update-manager-17.10.11/DistUpgrade/sourceslist.py update-manager-0.156.14.15/DistUpgrade/sourceslist.py --- update-manager-17.10.11/DistUpgrade/sourceslist.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/sourceslist.py 2015-11-26 16:33:29.000000000 +0000 @@ -0,0 +1,499 @@ +# sourceslist.py - Provide an abstraction of the sources.list +# +# Copyright (c) 2004-2009 Canonical Ltd. +# Copyright (c) 2004 Michiel Sikkes +# Copyright (c) 2006-2007 Sebastian Heinlein +# +# Authors: Michiel Sikkes +# Michael Vogt +# Sebastian Heinlein +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +from __future__ import absolute_import, print_function + +import glob +import logging +import os.path +import re +import shutil +import time + +import apt_pkg +from .distinfo import DistInfo +#from apt_pkg import gettext as _ + + +# some global helpers + +__all__ = ['is_mirror', 'SourceEntry', 'NullMatcher', 'SourcesList', + 'SourceEntryMatcher'] + + +def is_mirror(master_uri, compare_uri): + """ check if the given add_url is idential or a mirror of orig_uri e.g.: + master_uri = archive.ubuntu.com + compare_uri = de.archive.ubuntu.com + -> True + """ + # remove traling spaces and "/" + compare_uri = compare_uri.rstrip("/ ") + master_uri = master_uri.rstrip("/ ") + # uri is identical + if compare_uri == master_uri: + #print "Identical" + return True + # add uri is a master site and orig_uri has the from "XX.mastersite" + # (e.g. de.archive.ubuntu.com) + try: + compare_srv = compare_uri.split("//")[1] + master_srv = master_uri.split("//")[1] + #print "%s == %s " % (add_srv, orig_srv) + except IndexError: # ok, somethings wrong here + #print "IndexError" + return False + # remove the leading "." (if any) and see if that helps + if "." in compare_srv and \ + compare_srv[compare_srv.index(".") + 1:] == master_srv: + #print "Mirror" + return True + return False + + +def uniq(s): + """ simple and efficient way to return uniq collection + + This is not intended for use with a SourceList. It is provided + for internal use only. It does not have a leading underscore to + not break any old code that uses it; but it should not be used + in new code (and is not listed in __all__).""" + return list(set(s)) + + +class SourceEntry(object): + """ single sources.list entry """ + + def __init__(self, line, file=None): + self.invalid = False # is the source entry valid + self.disabled = False # is it disabled ('#' in front) + self.type = "" # what type (deb, deb-src) + self.architectures = [] # architectures + self.trusted = None # Trusted + self.uri = "" # base-uri + self.dist = "" # distribution (dapper, edgy, etc) + self.comps = [] # list of available componetns (may empty) + self.comment = "" # (optional) comment + self.line = line # the original sources.list line + if file is None: + file = apt_pkg.config.find_dir( + "Dir::Etc") + apt_pkg.config.find("Dir::Etc::sourcelist") + self.file = file # the file that the entry is located in + self.parse(line) + self.template = None # type DistInfo.Suite + self.children = [] + + def __eq__(self, other): + """ equal operator for two sources.list entries """ + return (self.disabled == other.disabled and + self.type == other.type and + self.uri == other.uri and + self.dist == other.dist and + self.comps == other.comps) + + def mysplit(self, line): + """ a split() implementation that understands the sources.list + format better and takes [] into account (for e.g. cdroms) """ + line = line.strip() + pieces = [] + tmp = "" + # we are inside a [..] block + p_found = False + space_found = False + for i in range(len(line)): + if line[i] == "[": + if space_found: + space_found = False + p_found = True + pieces.append(tmp) + tmp = line[i] + else: + p_found = True + tmp += line[i] + elif line[i] == "]": + p_found = False + tmp += line[i] + elif space_found and not line[i].isspace(): + # we skip one or more space + space_found = False + pieces.append(tmp) + tmp = line[i] + elif line[i].isspace() and not p_found: + # found a whitespace + space_found = True + else: + tmp += line[i] + # append last piece + if len(tmp) > 0: + pieces.append(tmp) + return pieces + + def parse(self, line): + """ parse a given sources.list (textual) line and break it up + into the field we have """ + line = self.line.strip() + #print line + # check if the source is enabled/disabled + if line == "" or line == "#": # empty line + self.invalid = True + return + if line[0] == "#": + self.disabled = True + pieces = line[1:].strip().split() + # if it looks not like a disabled deb line return + if not pieces[0] in ("rpm", "rpm-src", "deb", "deb-src"): + self.invalid = True + return + else: + line = line[1:] + # check for another "#" in the line (this is treated as a comment) + i = line.find("#") + if i > 0: + self.comment = line[i + 1:] + line = line[:i] + # source is ok, split it and see what we have + pieces = self.mysplit(line) + # Sanity check + if len(pieces) < 3: + self.invalid = True + return + # Type, deb or deb-src + self.type = pieces[0].strip() + # Sanity check + if self.type not in ("deb", "deb-src", "rpm", "rpm-src"): + self.invalid = True + return + + if pieces[1].strip()[0] == "[": + options = pieces.pop(1).strip("[]").split() + for option in options: + try: + key, value = option.split("=", 1) + except Exception: + self.invalid = True + else: + if key == "arch": + self.architectures = value.split(",") + elif key == "trusted": + self.trusted = apt_pkg.string_to_bool(value) + else: + self.invalid = True + + # URI + self.uri = pieces[1].strip() + if len(self.uri) < 1: + self.invalid = True + # distro and components (optional) + # Directory or distro + self.dist = pieces[2].strip() + if len(pieces) > 3: + # List of components + self.comps = pieces[3:] + else: + self.comps = [] + + def set_enabled(self, new_value): + """ set a line to enabled or disabled """ + self.disabled = not new_value + # enable, remove all "#" from the start of the line + if new_value: + self.line = self.line.lstrip().lstrip('#') + else: + # disabled, add a "#" + if self.line.strip()[0] != "#": + self.line = "#" + self.line + + def __str__(self): + """ debug helper """ + return self.str().strip() + + def str(self): + """ return the current line as string """ + if self.invalid: + return self.line + line = "" + if self.disabled: + line = "# " + + line += self.type + + if self.architectures and self.trusted is not None: + line += " [arch=%s trusted=%s]" % ( + ",".join(self.architectures), "yes" if self.trusted else "no") + elif self.trusted is not None: + line += " [trusted=%s]" % ("yes" if self.trusted else "no") + elif self.architectures: + line += " [arch=%s]" % ",".join(self.architectures) + line += " %s %s" % (self.uri, self.dist) + if len(self.comps) > 0: + line += " " + " ".join(self.comps) + if self.comment != "": + line += " #" + self.comment + line += "\n" + return line + + +class NullMatcher(object): + """ a Matcher that does nothing """ + + def match(self, s): + return True + + +class SourcesList(object): + """ represents the full sources.list + sources.list.d file """ + + def __init__(self, + withMatcher=True, + matcherPath="/usr/share/python-apt/templates/"): + self.list = [] # the actual SourceEntries Type + if withMatcher: + self.matcher = SourceEntryMatcher(matcherPath) + else: + self.matcher = NullMatcher() + self.refresh() + + def refresh(self): + """ update the list of known entries """ + self.list = [] + # read sources.list + file = apt_pkg.config.find_file("Dir::Etc::sourcelist") + self.load(file) + # read sources.list.d + partsdir = apt_pkg.config.find_dir("Dir::Etc::sourceparts") + for file in glob.glob("%s/*.list" % partsdir): + self.load(file) + # check if the source item fits a predefined template + for source in self.list: + if not source.invalid: + self.matcher.match(source) + + def __iter__(self): + """ simple iterator to go over self.list, returns SourceEntry + types """ + for entry in self.list: + yield entry + + def __find(self, *predicates, **attrs): + for source in self.list: + if (all(getattr(source, key) == attrs[key] for key in attrs) and + all(predicate(source) for predicate in predicates)): + yield source + + def add(self, type, uri, dist, orig_comps, comment="", pos=-1, file=None, + architectures=[]): + """ + Add a new source to the sources.list. + The method will search for existing matching repos and will try to + reuse them as far as possible + """ + + architectures = set(architectures) + # create a working copy of the component list so that + # we can modify it later + comps = orig_comps[:] + sources = self.__find(lambda s: set(s.architectures) == architectures, + disabled=False, invalid=False, type=type, + uri=uri, dist=dist) + # check if we have this source already in the sources.list + for source in sources: + for new_comp in comps: + if new_comp in source.comps: + # we have this component already, delete it + # from the new_comps list + del comps[comps.index(new_comp)] + if len(comps) == 0: + return source + + sources = self.__find(lambda s: set(s.architectures) == architectures, + invalid=False, type=type, uri=uri, dist=dist) + for source in sources: + # if there is a repo with the same (type, uri, dist) just add the + # components + if source.disabled and set(source.comps) == set(comps): + source.disabled = False + return source + elif not source.disabled: + source.comps = uniq(source.comps + comps) + return source + # there isn't any matching source, so create a new line and parse it + line = type + if architectures: + line += " [arch=%s]" % ",".join(architectures) + line += " %s %s" % (uri, dist) + for c in comps: + line = line + " " + c + if comment != "": + line = "%s #%s\n" % (line, comment) + line = line + "\n" + new_entry = SourceEntry(line) + if file is not None: + new_entry.file = file + self.matcher.match(new_entry) + self.list.insert(pos, new_entry) + return new_entry + + def remove(self, source_entry): + """ remove the specified entry from the sources.list """ + self.list.remove(source_entry) + + def restore_backup(self, backup_ext): + " restore sources.list files based on the backup extension " + file = apt_pkg.config.find_file("Dir::Etc::sourcelist") + if os.path.exists(file + backup_ext) and os.path.exists(file): + shutil.copy(file + backup_ext, file) + # now sources.list.d + partsdir = apt_pkg.config.find_dir("Dir::Etc::sourceparts") + for file in glob.glob("%s/*.list" % partsdir): + if os.path.exists(file + backup_ext): + shutil.copy(file + backup_ext, file) + + def backup(self, backup_ext=None): + """ make a backup of the current source files, if no backup extension + is given, the current date/time is used (and returned) """ + already_backuped = set() + if backup_ext is None: + backup_ext = time.strftime("%y%m%d.%H%M") + for source in self.list: + if (source.file not in already_backuped and + os.path.exists(source.file)): + shutil.copy(source.file, "%s%s" % (source.file, backup_ext)) + return backup_ext + + def load(self, file): + """ (re)load the current sources """ + try: + with open(file, "r") as f: + for line in f: + source = SourceEntry(line, file) + self.list.append(source) + except: + logging.warning("could not open file '%s'\n" % file) + + def save(self): + """ save the current sources """ + files = {} + # write an empty default config file if there aren't any sources + if len(self.list) == 0: + path = apt_pkg.config.find_file("Dir::Etc::sourcelist") + header = ( + "## See sources.list(5) for more information, especialy\n" + "# Remember that you can only use http, ftp or file URIs\n" + "# CDROMs are managed through the apt-cdrom tool.\n") + + with open(path, "w") as f: + f.write(header) + return + + try: + for source in self.list: + if source.file not in files: + files[source.file] = open(source.file, "w") + files[source.file].write(source.str()) + finally: + for f in files: + files[f].close() + + def check_for_relations(self, sources_list): + """get all parent and child channels in the sources list""" + parents = [] + used_child_templates = {} + for source in sources_list: + # try to avoid checking uninterressting sources + if source.template is None: + continue + # set up a dict with all used child templates and corresponding + # source entries + if source.template.child: + key = source.template + if key not in used_child_templates: + used_child_templates[key] = [] + temp = used_child_templates[key] + temp.append(source) + else: + # store each source with children aka. a parent :) + if len(source.template.children) > 0: + parents.append(source) + #print self.used_child_templates + #print self.parents + return (parents, used_child_templates) + + +class SourceEntryMatcher(object): + """ matcher class to make a source entry look nice + lots of predefined matchers to make it i18n/gettext friendly + """ + + def __init__(self, matcherPath): + self.templates = [] + # Get the human readable channel and comp names from the channel .infos + spec_files = glob.glob("%s/*.info" % matcherPath) + for f in spec_files: + f = os.path.basename(f) + i = f.find(".info") + f = f[0:i] + dist = DistInfo(f, base_dir=matcherPath) + for template in dist.templates: + if template.match_uri is not None: + self.templates.append(template) + return + + def match(self, source): + """Add a matching template to the source""" + found = False + for template in self.templates: + if (re.search(template.match_uri, source.uri) and + re.match(template.match_name, source.dist) and + # deb is a valid fallback for deb-src (if that is not + # definied, see #760035 + (source.type == template.type or template.type == "deb")): + found = True + source.template = template + break + elif (template.is_mirror(source.uri) and + re.match(template.match_name, source.dist)): + found = True + source.template = template + break + return found + + +# some simple tests +if __name__ == "__main__": + apt_pkg.init_config() + sources = SourcesList() + + for entry in sources: + logging.info("entry %s" % entry.str()) + #print entry.uri + + mirror = is_mirror("http://archive.ubuntu.com/ubuntu/", + "http://de.archive.ubuntu.com/ubuntu/") + logging.info("is_mirror(): %s" % mirror) + + logging.info(is_mirror("http://archive.ubuntu.com/ubuntu", + "http://de.archive.ubuntu.com/ubuntu/")) + logging.info(is_mirror("http://archive.ubuntu.com/ubuntu/", + "http://de.archive.ubuntu.com/ubuntu")) diff -Nru update-manager-17.10.11/DistUpgrade/TODO update-manager-0.156.14.15/DistUpgrade/TODO --- update-manager-17.10.11/DistUpgrade/TODO 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/TODO 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,65 @@ +Config/Profiles: +---------------- +* add include directive (or something like this) + +CDROM: +----- + * release notes display in CDROM mode + * if run from CDROM and we have network -> do a self update + * support dapper-commercial in sources.list rewriting + * after "no-network" dist-upgrade it is most likely that the system + is only half-upgraded and update-manager will not be able to do + the full upgrade. update-manager needs to be changed to support + full dist-upgrades (possible by just calling the dist-upgrader + in a special mode) + +Misc: +----- + +* [fabbio]: we probably don't want to remove stuff that moved from main + to universe (if the user has only main enabled this is considered + obsolete). It would also be nice inform about packages that went from + main->universe. We could ship a list of demotions. +* set bigger timeout than 120s? + +breezy->dapper +-------------- +- gnome-icon-theme changes a lot, icons move from hicolor to gnome. + this might have caused a specatular crash during a upgrade + + +hoary->breezy +------------- +- stop gnome-volume-manager before the hoary->breezy upgrade + (it will crash otherwise) +- send a "\n" on the libc6 question on hoary->breezy + +general +------- +- whitelist removal (pattern? e.g. c102 -> c2a etc) and not + display it? + +Robustness: +----------- +- automatically comment out entires in the sources.list that fail to + fetch. + Trouble: apt doesn't provide a method to map from a line in th + sources.list to the indexFile and python-apt dosn't proivde a way to + get all the metaIndexes in sources.list, nor a way to get the + pkgIndexFiles from the metaIndexes (metaIndex is not available in + python-apt at all) + What we could do is to write DistUpgradeCache.update(), check the + DescURI for each failed item and guess from it what sources.list + line failed (e.g. uri.endswith("Sources{.bz2|.gz") -> deb-src, get + base-uri, find 'dists' in uri etc) + +- don't stop if a single pkg fails to upgrade: + - the problem here is apt, in apt-pkg/deb/dpkgpm.cc it will stop if + dpkg returns a non-zero exit code. The problem with this is of course + that this may happen in the middle of the upgrade, leaving half the + packages unpacked but not configured or loads of packages unconfigured. + One possible solution is to not stop in apt but try to continue as long + as possible. The problem here is that e.g. if libnoitfy0 explodes and + evolution, update-notifer depend on it, continuing means to evo and u-n + can't be upgraded and dpkg explodes on them too. This is not more worse + than what we have right now I guess. diff -Nru update-manager-17.10.11/DistUpgrade/Ubuntu.info update-manager-0.156.14.15/DistUpgrade/Ubuntu.info --- update-manager-17.10.11/DistUpgrade/Ubuntu.info 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/Ubuntu.info 2016-01-19 11:55:41.000000000 +0000 @@ -0,0 +1,2189 @@ +ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog + +Suite: devel +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu development series +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: devel +ParentSuite: devel +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Ubuntu development series + +Suite: devel +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: devel +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +Description: Independent +Component: main +CompDescription: Provided by third-party software developers +CompDescriptionLong: Software offered by third party developers. + +Suite: devel-security +ParentSuite: devel +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: devel-security +ParentSuite: devel +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +Description: Important security updates + +Suite: devel-updates +ParentSuite: devel +RepositoryType: deb +Description: Recommended updates + +Suite: devel-updates +ParentSuite: devel +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Recommended updates + +Suite: devel-proposed +ParentSuite: devel +RepositoryType: deb +Description: Pre-released updates + +Suite: devel-proposed +ParentSuite: devel +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Pre-released updates + +Suite: devel-backports +ParentSuite: devel +RepositoryType: deb +Description: Unsupported updates + +Suite: devel-backports +ParentSuite: devel +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Unsupported updates + + +Suite: xenial +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 16.04 LTS 'Xenial Xerus' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: xenial +ParentSuite: xenial +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 16.04 LTS 'Xenial Xerus' + +Suite: xenial +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*16.04 LTS +MatchURI: cdrom:\[Ubuntu.*16.04 LTS +Description: Cdrom with Ubuntu 16.04 LTS 'Xenial Xerus' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: xenial +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: xenial-security +ParentSuite: xenial +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: xenial-security +ParentSuite: xenial +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +Description: Important security updates + +Suite: xenial-updates +ParentSuite: xenial +RepositoryType: deb +Description: Recommended updates + +Suite: xenial-updates +ParentSuite: xenial +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Recommended updates + +Suite: xenial-proposed +ParentSuite: xenial +RepositoryType: deb +Description: Pre-released updates + +Suite: xenial-proposed +ParentSuite: xenial +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Pre-released updates + +Suite: xenial-backports +ParentSuite: xenial +RepositoryType: deb +Description: Unsupported updates + +Suite: xenial-backports +ParentSuite: xenial +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Unsupported updates + +Suite: wily +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 15.10 'Wily Werewolf' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: wily +ParentSuite: wily +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 15.10 'Wily Werewolf' + +Suite: wily +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*15.10 +MatchURI: cdrom:\[Ubuntu.*15.10 +Description: Cdrom with Ubuntu 15.10 'Wily Werewolf' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: wily +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: wily-security +ParentSuite: wily +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: wily-security +ParentSuite: wily +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +Description: Important security updates + +Suite: wily-updates +ParentSuite: wily +RepositoryType: deb +Description: Recommended updates + +Suite: wily-updates +ParentSuite: wily +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Recommended updates + +Suite: wily-proposed +ParentSuite: wily +RepositoryType: deb +Description: Pre-released updates + +Suite: wily-proposed +ParentSuite: wily +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Pre-released updates + +Suite: wily-backports +ParentSuite: wily +RepositoryType: deb +Description: Unsupported updates + +Suite: wily-backports +ParentSuite: wily +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Unsupported updates + + +Suite: vivid +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 15.04 'Vivid Vervet' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: vivid +ParentSuite: vivid +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 15.04 'Vivid Vervet' + +Suite: vivid +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*15.04 +MatchURI: cdrom:\[Ubuntu.*15.04 +Description: Cdrom with Ubuntu 15.04 'Vivid Vervet' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: vivid +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: vivid +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +Description: Independent +Component: main +CompDescription: Provided by third-party software developers +CompDescriptionLong: Software offered by third party developers. + +Suite: vivid-security +ParentSuite: vivid +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: vivid-security +ParentSuite: vivid +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +Description: Important security updates + +Suite: vivid-updates +ParentSuite: vivid +RepositoryType: deb +Description: Recommended updates + +Suite: vivid-updates +ParentSuite: vivid +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Recommended updates + +Suite: vivid-proposed +ParentSuite: vivid +RepositoryType: deb +Description: Pre-released updates + +Suite: vivid-proposed +ParentSuite: vivid +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Pre-released updates + +Suite: vivid-backports +ParentSuite: vivid +RepositoryType: deb +Description: Unsupported updates + +Suite: vivid-backports +ParentSuite: vivid +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Unsupported updates + + +Suite: utopic +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 14.10 'Utopic Unicorn' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: utopic +ParentSuite: utopic +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 14.10 'Utopic Unicorn' + +Suite: utopic +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*14.10 +MatchURI: cdrom:\[Ubuntu.*14.10 +Description: Cdrom with Ubuntu 14.10 'Utopic Unicorn' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: utopic +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: utopic +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +Description: Independent +Component: main +CompDescription: Provided by third-party software developers +CompDescriptionLong: Software offered by third party developers. + +Suite: utopic-security +ParentSuite: utopic +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: utopic-security +ParentSuite: utopic +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +Description: Important security updates + +Suite: utopic-updates +ParentSuite: utopic +RepositoryType: deb +Description: Recommended updates + +Suite: utopic-updates +ParentSuite: utopic +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Recommended updates + +Suite: utopic-proposed +ParentSuite: utopic +RepositoryType: deb +Description: Pre-released updates + +Suite: utopic-proposed +ParentSuite: utopic +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Pre-released updates + +Suite: utopic-backports +ParentSuite: utopic +RepositoryType: deb +Description: Unsupported updates + +Suite: utopic-backports +ParentSuite: utopic +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Unsupported updates + + +Suite: trusty +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 14.04 'Trusty Tahr' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: trusty +ParentSuite: trusty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 14.04 'Trusty Tahr' + +Suite: trusty +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*14.04 +MatchURI: cdrom:\[Ubuntu.*14.04 +Description: Cdrom with Ubuntu 14.04 'Trusty Tahr' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: trusty +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: trusty +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +Description: Independent +Component: main +CompDescription: Provided by third-party software developers +CompDescriptionLong: Software offered by third party developers. + +Suite: trusty-security +ParentSuite: trusty +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: trusty-security +ParentSuite: trusty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +Description: Important security updates + +Suite: trusty-updates +ParentSuite: trusty +RepositoryType: deb +Description: Recommended updates + +Suite: trusty-updates +ParentSuite: trusty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Recommended updates + +Suite: trusty-proposed +ParentSuite: trusty +RepositoryType: deb +Description: Pre-released updates + +Suite: trusty-proposed +ParentSuite: trusty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Pre-released updates + +Suite: trusty-backports +ParentSuite: trusty +RepositoryType: deb +Description: Unsupported updates + +Suite: trusty-backports +ParentSuite: trusty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Unsupported updates + + +Suite: saucy +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 13.10 'Saucy Salamander' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: saucy +ParentSuite: saucy +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 13.10 'Saucy Salamander' + +Suite: saucy +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*13.10 +MatchURI: cdrom:\[Ubuntu.*13.10 +Description: Cdrom with Ubuntu 13.10 'Saucy Salamander' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: saucy +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: saucy +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +Description: Independent +Component: main +CompDescription: Provided by third-party software developers +CompDescriptionLong: Software offered by third party developers. + +Suite: saucy-security +ParentSuite: saucy +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: saucy-security +ParentSuite: saucy +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +Description: Important security updates + +Suite: saucy-updates +ParentSuite: saucy +RepositoryType: deb +Description: Recommended updates + +Suite: saucy-updates +ParentSuite: saucy +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Recommended updates + +Suite: saucy-proposed +ParentSuite: saucy +RepositoryType: deb +Description: Pre-released updates + +Suite: saucy-proposed +ParentSuite: saucy +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Pre-released updates + +Suite: saucy-backports +ParentSuite: saucy +RepositoryType: deb +Description: Unsupported updates + +Suite: saucy-backports +ParentSuite: saucy +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Unsupported updates + + +Suite: raring +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 13.04 'Raring Ringtail' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: raring +ParentSuite: raring +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 13.04 'Raring Ringtail' + +Suite: raring +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*13.04 +MatchURI: cdrom:\[Ubuntu.*13.04 +Description: Cdrom with Ubuntu 13.04 'Raring Ringtail' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: raring +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: raring +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +Description: Independent +Component: main +CompDescription: Provided by third-party software developers +CompDescriptionLong: Software offered by third party developers. + +Suite: raring-security +ParentSuite: raring +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: raring-security +ParentSuite: raring +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +Description: Important security updates + +Suite: raring-updates +ParentSuite: raring +RepositoryType: deb +Description: Recommended updates + +Suite: raring-updates +ParentSuite: raring +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Recommended updates + +Suite: raring-proposed +ParentSuite: raring +RepositoryType: deb +Description: Pre-released updates + +Suite: raring-proposed +ParentSuite: raring +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Pre-released updates + +Suite: raring-backports +ParentSuite: raring +RepositoryType: deb +Description: Unsupported updates + +Suite: raring-backports +ParentSuite: raring +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Unsupported updates + + +Suite: quantal +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 12.10 'Quantal Quetzal' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: quantal +ParentSuite: quantal +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 12.10 'Quantal Quetzal' + +Suite: quantal +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*12.10 +MatchURI: cdrom:\[Ubuntu.*12.10 +Description: Cdrom with Ubuntu 12.10 'Quantal Quetzal' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: quantal +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: quantal +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +Description: Independent +Component: main +CompDescription: Provided by third-party software developers +CompDescriptionLong: Software offered by third party developers. + +Suite: quantal-security +ParentSuite: quantal +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: quantal-security +ParentSuite: quantal +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +Description: Important security updates + +Suite: quantal-updates +ParentSuite: quantal +RepositoryType: deb +Description: Recommended updates + +Suite: quantal-updates +ParentSuite: quantal +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Recommended updates + +Suite: quantal-proposed +ParentSuite: quantal +RepositoryType: deb +Description: Pre-released updates + +Suite: quantal-proposed +ParentSuite: quantal +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Pre-released updates + +Suite: quantal-backports +ParentSuite: quantal +RepositoryType: deb +Description: Unsupported updates + +Suite: quantal-backports +ParentSuite: quantal +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Unsupported updates + +Suite: precise +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 12.04 'Precise Pangolin' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: precise +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 12.04 'Precise Pangolin' + +Suite: precise +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*12.04 +MatchURI: cdrom:\[Ubuntu.*12.04 +Description: Cdrom with Ubuntu 12.04 'Precise Pangolin' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: precise +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: precise +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +Description: Independent +Component: main +CompDescription: Provided by third-party software developers +CompDescriptionLong: Software offered by third party developers. + +Suite: precise-security +ParentSuite: precise +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: precise-security +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +Description: Important security updates + +Suite: precise-updates +ParentSuite: precise +RepositoryType: deb +Description: Recommended updates + +Suite: precise-updates +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Recommended updates + +Suite: precise-proposed +ParentSuite: precise +RepositoryType: deb +Description: Pre-released updates + +Suite: precise-proposed +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Pre-released updates + +Suite: precise-backports +ParentSuite: precise +RepositoryType: deb +Description: Unsupported updates + +Suite: precise-backports +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Unsupported updates + +Suite: oneiric +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 11.10 'Oneiric Ocelot' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: oneiric +ParentSuite: oneiric +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 11.10 'Oneiric Ocelot' + +Suite: oneiric +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*11.10 +MatchURI: cdrom:\[Ubuntu.*11.10 +Description: Cdrom with Ubuntu 11.10 'Oneiric Ocelot' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: oneiric +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: oneiric +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +Description: Independent +Component: main +CompDescription: Provided by third-party software developers +CompDescriptionLong: Software offered by third party developers. + +Suite: oneiric-security +ParentSuite: oneiric +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: oneiric-security +ParentSuite: oneiric +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +Description: Important security updates + +Suite: oneiric-updates +ParentSuite: oneiric +RepositoryType: deb +Description: Recommended updates + +Suite: oneiric-updates +ParentSuite: oneiric +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Recommended updates + +Suite: oneiric-proposed +ParentSuite: oneiric +RepositoryType: deb +Description: Pre-released updates + +Suite: oneiric-proposed +ParentSuite: oneiric +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Pre-released updates + +Suite: oneiric-backports +ParentSuite: oneiric +RepositoryType: deb +Description: Unsupported updates + +Suite: oneiric-backports +ParentSuite: oneiric +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Unsupported updates + + +Suite: natty +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 11.04 'Natty Narwhal' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: natty +ParentSuite: natty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 11.04 'Natty Narwhal' + +Suite: natty +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*11.04 +MatchURI: cdrom:\[Ubuntu.*11.04 +Description: Cdrom with Ubuntu 11.04 'Natty Narwhal' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: natty +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: natty +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +Description: Independent +Component: main +CompDescription: Provided by third-party software developers +CompDescriptionLong: Software offered by third party developers. + +Suite: natty-security +ParentSuite: natty +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: natty-security +ParentSuite: natty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +Description: Important security updates + +Suite: natty-updates +ParentSuite: natty +RepositoryType: deb +Description: Recommended updates + +Suite: natty-updates +ParentSuite: natty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Recommended updates + +Suite: natty-proposed +ParentSuite: natty +RepositoryType: deb +Description: Pre-released updates + +Suite: natty-proposed +ParentSuite: natty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Pre-released updates + +Suite: natty-backports +ParentSuite: natty +RepositoryType: deb +Description: Unsupported updates + +Suite: natty-backports +ParentSuite: natty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +Description: Unsupported updates + +Suite: maverick +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 10.10 'Maverick Meerkat' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: maverick +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*10.10 +MatchURI: cdrom:\[Ubuntu.*10.10 +Description: Cdrom with Ubuntu 10.10 'Maverick Meerkat' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: maverick +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +Description: Canonical Partners +Component: partner +CompDescription: Software packaged by Canonical for their partners +CompDescriptionLong: This software is not part of Ubuntu. + +Suite: maverick +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +Description: Independent +Component: main +CompDescription: Provided by third-party software developers +CompDescriptionLong: Software offered by third party developers. + +Suite: maverick-security +ParentSuite: maverick +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: maverick-updates +ParentSuite: maverick +RepositoryType: deb +Description: Recommended updates + +Suite: maverick-proposed +ParentSuite: maverick +RepositoryType: deb +Description: Pre-released updates + +Suite: maverick-backports +ParentSuite: maverick +RepositoryType: deb +Description: Unsupported updates + +Suite: lucid +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 10.04 'Lucid Lynx' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: lucid +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*10.04 +MatchURI: cdrom:\[Ubuntu.*10.04 +Description: Cdrom with Ubuntu 10.04 'Lucid Lynx' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: lucid-security +ParentSuite: lucid +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: lucid-updates +ParentSuite: lucid +RepositoryType: deb +Description: Recommended updates + +Suite: lucid-proposed +ParentSuite: lucid +RepositoryType: deb +Description: Pre-released updates + +Suite: lucid-backports +ParentSuite: lucid +RepositoryType: deb +Description: Unsupported updates + +Suite: karmic +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 9.10 'Karmic Koala' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: karmic +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*9.10 +MatchURI: cdrom:\[Ubuntu.*9.10 +Description: Cdrom with Ubuntu 9.10 'Karmic Koala' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: karmic-security +ParentSuite: karmic +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: karmic-updates +ParentSuite: karmic +RepositoryType: deb +Description: Recommended updates + +Suite: karmic-proposed +ParentSuite: karmic +RepositoryType: deb +Description: Pre-released updates + +Suite: karmic-backports +ParentSuite: karmic +RepositoryType: deb +Description: Unsupported updates + +Suite: jaunty +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 9.04 'Jaunty Jackalope' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: jaunty +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*9.04 +MatchURI: cdrom:\[Ubuntu.*9.04 +Description: Cdrom with Ubuntu 9.04 'Jaunty Jackalope' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: jaunty-security +ParentSuite: jaunty +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: jaunty-updates +ParentSuite: jaunty +RepositoryType: deb +Description: Recommended updates + +Suite: jaunty-proposed +ParentSuite: jaunty +RepositoryType: deb +Description: Pre-released updates + +Suite: jaunty-backports +ParentSuite: jaunty +RepositoryType: deb +Description: Unsupported updates + +Suite: intrepid +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 8.10 'Intrepid Ibex' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: intrepid +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*8.10 +MatchURI: cdrom:\[Ubuntu.*8.10 +Description: Cdrom with Ubuntu 8.10 'Intrepid Ibex' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: intrepid-security +ParentSuite: intrepid +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: intrepid-updates +ParentSuite: intrepid +RepositoryType: deb +Description: Recommended updates + +Suite: intrepid-proposed +ParentSuite: intrepid +RepositoryType: deb +Description: Pre-released updates + +Suite: intrepid-backports +ParentSuite: intrepid +RepositoryType: deb +Description: Unsupported updates + + +Suite: hardy +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +Description: Ubuntu 8.04 'Hardy Heron' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: hardy +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*8.04 +MatchURI: cdrom:\[Ubuntu.*8.04 +Description: Cdrom with Ubuntu 8.04 'Hardy Heron' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: hardy-security +ParentSuite: hardy +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: hardy-updates +ParentSuite: hardy +RepositoryType: deb +Description: Recommended updates + +Suite: hardy-proposed +ParentSuite: hardy +RepositoryType: deb +Description: Pre-released updates + +Suite: hardy-backports +ParentSuite: hardy +RepositoryType: deb +Description: Unsupported updates + + +Suite: gutsy +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu +BaseURI-sparc: http://archive.ubuntu.com/ubuntu/ +MatchURI-sparc: archive.ubuntu.com/ubuntu +MirrorsFile: Ubuntu.mirrors +Description: Ubuntu 7.10 'Gutsy Gibbon' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: gutsy +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*7.10 +MatchURI: cdrom:\[Ubuntu.*7.10 +Description: Cdrom with Ubuntu 7.10 'Gutsy Gibbon' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: gutsy-security +ParentSuite: gutsy +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-sparc: http://security.ubuntu.com/ubuntu/ +MatchURI-sparc: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Important security updates + +Suite: gutsy-updates +ParentSuite: gutsy +RepositoryType: deb +Description: Recommended updates + +Suite: gutsy-proposed +ParentSuite: gutsy +RepositoryType: deb +Description: Pre-released updates + +Suite: gutsy-backports +ParentSuite: gutsy +RepositoryType: deb +Description: Unsupported updates + + +Suite: feisty +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports +MirrorsFile: Ubuntu.mirrors +Description: Ubuntu 7.04 'Feisty Fawn' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: feisty +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*7.04 +MatchURI: cdrom:\[Ubuntu.*7.04 +Description: Cdrom with Ubuntu 7.04 'Feisty Fawn' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: feisty-security +ParentSuite: feisty +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports +Description: Important security updates + +Suite: feisty-updates +ParentSuite: feisty +RepositoryType: deb +Description: Recommended updates + +Suite: feisty-proposed +ParentSuite: feisty +RepositoryType: deb +Description: Pre-released updates + +Suite: feisty-backports +ParentSuite: feisty +RepositoryType: deb +Description: Unsupported updates + +Suite: edgy +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports +MirrorsFile: Ubuntu.mirrors +Description: Ubuntu 6.10 'Edgy Eft' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +CompDescription: Restricted software +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: edgy +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*6.10 +MatchURI: cdrom:\[Ubuntu.*6.10 +Description: Cdrom with Ubuntu 6.10 'Edgy Eft' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: edgy-security +ParentSuite: edgy +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports +Description: Important security updates + +Suite: edgy-updates +ParentSuite: edgy +RepositoryType: deb +Description: Recommended updates + +Suite: edgy-proposed +ParentSuite: edgy +RepositoryType: deb +Description: Pre-released updates + +Suite: edgy-backports +ParentSuite: edgy +RepositoryType: deb +Description: Unsupported updates + +Suite: dapper +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports +MirrorsFile: Ubuntu.mirrors +Description: Ubuntu 6.06 LTS 'Dapper Drake' +Component: main +CompDescription: Officially supported +CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +CompDescription: Community-maintained (universe) +CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +CompDescription: Restricted software (Multiverse) +CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: dapper +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*6.06 +MatchURI: cdrom:\[Ubuntu.*6.06 +Description: Cdrom with Ubuntu 6.06 LTS 'Dapper Drake' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: dapper-security +ParentSuite: dapper +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports +Description: Important security updates + +Suite: dapper-updates +ParentSuite: dapper +RepositoryType: deb +Description: Recommended updates + +Suite: dapper-proposed +ParentSuite: dapper +RepositoryType: deb +Description: Pre-released updates + +Suite: dapper-backports +ParentSuite: dapper +RepositoryType: deb +Description: Unsupported updates + +Suite: breezy +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: Ubuntu.mirrors +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 5.10 'Breezy Badger' +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright +Component: universe +CompDescription: Community-maintained (Universe) +Component: multiverse +CompDescription: Non-free (Multiverse) + +Suite: breezy +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*5.10 +MatchURI: cdrom:\[Ubuntu.*5.10 +Description: Cdrom with Ubuntu 5.10 'Breezy Badger' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: breezy-security +ParentSuite: breezy +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 5.10 Security Updates + +Suite: breezy-updates +ParentSuite: breezy +RepositoryType: deb +Description: Ubuntu 5.10 Updates + +Suite: breezy-backports +ParentSuite: breezy +RepositoryType: deb +Description: Ubuntu 5.10 Backports + +Suite: hoary +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports +MirrorsFile: Ubuntu.mirrors +Description: Ubuntu 5.04 'Hoary Hedgehog' +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright +Component: universe +CompDescription: Community-maintained (Universe) +Component: multiverse +CompDescription: Non-free (Multiverse) + +Suite: hoary +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*5.04 +MatchURI: cdrom:\[Ubuntu.*5.04 +Description: Cdrom with Ubuntu 5.04 'Hoary Hedgehog' +Available: False +Component: main +CompDescription: Officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: hoary-security +ParentSuite: hoary +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports +Description: Ubuntu 5.04 Security Updates + +Suite: hoary-updates +ParentSuite: hoary +RepositoryType: deb +Description: Ubuntu 5.04 Updates + +Suite: hoary-backports +ParentSuite: hoary +RepositoryType: deb +Description: Ubuntu 5.04 Backports + +Suite: warty +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +Description: Ubuntu 4.10 'Warty Warthog' +Component: main +CompDescription: No longer officially supported +Component: restricted +CompDescription: Restricted copyright +Component: universe +CompDescription: Community-maintained (Universe) +Component: multiverse +CompDescription: Non-free (Multiverse) + +Suite: warty +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*4.10 +MatchURI: cdrom:\[Ubuntu.*4.10 +Description: Cdrom with Ubuntu 4.10 'Warty Warthog' +Available: False +Component: main +CompDescription: No longer officially supported +Component: restricted +CompDescription: Restricted copyright + +Suite: warty-security +ParentSuite: warty +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +Description: Ubuntu 4.10 Security Updates + +Suite: warty-updates +ParentSuite: warty +RepositoryType: deb +Description: Ubuntu 4.10 Updates + +Suite: warty-backports +ParentSuite: warty +RepositoryType: deb +Description: Ubuntu 4.10 Backports + diff -Nru update-manager-17.10.11/DistUpgrade/utils.py update-manager-0.156.14.15/DistUpgrade/utils.py --- update-manager-17.10.11/DistUpgrade/utils.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/utils.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,461 @@ +# utils.py +# +# Copyright (c) 2004-2008 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +from gettext import gettext as _ +from gettext import ngettext +from stat import (S_IMODE, ST_MODE, S_IXUSR) +from math import ceil + +import apt_pkg +apt_pkg.init_config() + +import locale +import logging +import re +import os +import os.path +import glob +import subprocess +import sys +import time +import urllib2 +import urlparse + +from copy import copy +from urlparse import urlsplit + + +class ExecutionTime(object): + """ + Helper that can be used in with statements to have a simple + measure of the timing of a particular block of code, e.g. + with ExecutionTime("db flush"): + db.flush() + """ + def __init__(self, info=""): + self.info = info + def __enter__(self): + self.now = time.time() + def __exit__(self, type, value, stack): + print "%s: %s" % (self.info, time.time() - self.now) + +def get_string_with_no_auth_from_source_entry(entry): + tmp = copy(entry) + url_parts = urlsplit(tmp.uri) + if url_parts.username: + tmp.uri = tmp.uri.replace(url_parts.username, "hidden-u") + if url_parts.password: + tmp.uri = tmp.uri.replace(url_parts.password, "hidden-p") + return str(tmp) + +def estimate_kernel_size_in_boot(): + """ estimate the amount of space that the current kernel takes in /boot """ + size = 0 + kver = os.uname()[2] + for f in glob.glob("/boot/*%s*" % kver): + size += os.path.getsize(f) + return size + +def is_unity_running(): + """ return True if Unity is currently running """ + unity_running = False + try: + import dbus + bus = dbus.SessionBus() + unity_running = bus.name_has_owner("com.canonical.Unity") + except: + logging.exception("could not check for Unity dbus service") + return unity_running + +def is_child_of_process_name(processname, pid=None): + if not pid: + pid = os.getpid() + while pid > 0: + stat_file = "/proc/%s/stat" % pid + stat = open(stat_file).read() + # extract command (inside ()) + command = stat.partition("(")[2].partition(")")[0] + if command == processname: + return True + # get parent (second to the right of command) and check that next + pid = int(stat.partition(")")[2].split()[1]) + return False + +def inside_chroot(): + """ returns True if we are inside a chroot + """ + # if there is no proc or no pid 1 we are very likely inside a chroot + if not os.path.exists("/proc") or not os.path.exists("/proc/1"): + return True + # if the inode is differnt for pid 1 "/" and our "/" + return os.stat("/") != os.stat("/proc/1/root") + +def wrap(t, width=70, subsequent_indent=""): + """ helpers inspired after textwrap - unfortunately + we can not use textwrap directly because it break + packagenames with "-" in them into new lines + """ + out = "" + for s in t.split(): + if (len(out)-out.rfind("\n")) + len(s) > width: + out += "\n" + subsequent_indent + out += s + " " + return out + +def twrap(s, **kwargs): + msg = "" + paras = s.split("\n") + for par in paras: + s = wrap(par, **kwargs) + msg += s+"\n" + return msg + +def lsmod(): + " return list of loaded modules (or [] if lsmod is not found) " + modules=[] + # FIXME raise? + if not os.path.exists("/sbin/lsmod"): + return [] + p=subprocess.Popen(["/sbin/lsmod"], stdout=subprocess.PIPE) + lines=p.communicate()[0].split("\n") + # remove heading line: "Modules Size Used by" + del lines[0] + # add lines to list, skip empty lines + for line in lines: + if line: + modules.append(line.split()[0]) + return modules + +def check_and_fix_xbit(path): + " check if a given binary has the executable bit and if not, add it" + if not os.path.exists(path): + return + mode = S_IMODE(os.stat(path)[ST_MODE]) + if not ((mode & S_IXUSR) == S_IXUSR): + os.chmod(path, mode | S_IXUSR) + +def country_mirror(): + " helper to get the country mirror from the current locale " + # special cases go here + lang_mirror = { 'c' : '', + } + # no lang, no mirror + if not 'LANG' in os.environ: + return '' + lang = os.environ['LANG'].lower() + # check if it is a special case + if lang[:5] in lang_mirror: + return lang_mirror[lang[:5]] + # now check for the most comon form (en_US.UTF-8) + if "_" in lang: + country = lang.split(".")[0].split("_")[1] + if "@" in country: + country = country.split("@")[0] + return country+"." + else: + return lang[:2]+"." + return '' + +def get_dist(): + " return the codename of the current runing distro " + # support debug overwrite + dist = os.environ.get("META_RELEASE_FAKE_CODENAME") + if dist: + logging.warn("using fake release name '%s' (because of META_RELEASE_FAKE_CODENAME environment) " % dist) + return dist + # then check the real one + from subprocess import Popen, PIPE + p = Popen(["lsb_release","-c","-s"],stdout=PIPE) + res = p.wait() + if res != 0: + sys.stderr.write("lsb_release returned exitcode: %i\n" % res) + return "unknown distribution" + dist = p.stdout.readline().strip() + return dist + +class HeadRequest(urllib2.Request): + def get_method(self): + return "HEAD" + +def url_downloadable(uri, debug_func=None): + """ + helper that checks if the given uri exists and is downloadable + (supports optional debug_func function handler to support + e.g. logging) + + Supports http (via HEAD) and ftp (via size request) + """ + if not debug_func: + lambda x: True + debug_func("url_downloadable: %s" % uri) + (scheme, netloc, path, querry, fragment) = urlparse.urlsplit(uri) + debug_func("s='%s' n='%s' p='%s' q='%s' f='%s'" % (scheme, netloc, path, querry, fragment)) + if scheme == "http": + try: + http_file = urllib2.urlopen(HeadRequest(uri)) + http_file.close() + if http_file.code == 200: + return True + return False + except Exception, e: + debug_func("error from httplib: '%s'" % e) + return False + elif scheme == "ftp": + import ftplib + try: + f = ftplib.FTP(netloc) + f.login() + f.cwd(os.path.dirname(path)) + size = f.size(os.path.basename(path)) + f.quit() + if debug_func: + debug_func("ftplib.size() returned: %s" % size) + if size != 0: + return True + except Exception, e: + if debug_func: + debug_func("error from ftplib: '%s'" % e) + return False + return False + +def init_proxy(gsettings=None): + """ init proxy settings + + * first check for http_proxy environment (always wins), + * then check the apt.conf http proxy, + * then look into synaptics conffile + * then into gconf (if gconfclient was supplied) + """ + SYNAPTIC_CONF_FILE = "/root/.synaptic/synaptic.conf" + proxy = None + # generic apt config wins + if apt_pkg.config.find("Acquire::http::Proxy") != '': + proxy = apt_pkg.config.find("Acquire::http::Proxy") + # then synaptic + elif os.path.exists(SYNAPTIC_CONF_FILE): + cnf = apt_pkg.Configuration() + apt_pkg.read_config_file(cnf, SYNAPTIC_CONF_FILE) + use_proxy = cnf.find_b("Synaptic::useProxy", False) + if use_proxy: + proxy_host = cnf.find("Synaptic::httpProxy") + proxy_port = str(cnf.find_i("Synaptic::httpProxyPort")) + if proxy_host and proxy_port: + proxy = "http://%s:%s/" % (proxy_host, proxy_port) + # gconf is no more + # elif gconfclient: + # try: # see LP: #281248 + # if gconfclient.get_bool("/system/http_proxy/use_http_proxy"): + # host = gconfclient.get_string("/system/http_proxy/host") + # port = gconfclient.get_int("/system/http_proxy/port") + # use_auth = gconfclient.get_bool("/system/http_proxy/use_authentication") + # if host and port: + # if use_auth: + # auth_user = gconfclient.get_string("/system/http_proxy/authentication_user") + # auth_pw = gconfclient.get_string("/system/http_proxy/authentication_password") + # proxy = "http://%s:%s@%s:%s/" % (auth_user,auth_pw,host, port) + # else: + # proxy = "http://%s:%s/" % (host, port) + # except Exception, e: + # print "error from gconf: %s" % e + # if we have a proxy, set it + if proxy: + # basic verification + if not re.match("http://\w+", proxy): + print >> sys.stderr, "proxy '%s' looks invalid" % proxy + return + proxy_support = urllib2.ProxyHandler({"http":proxy}) + opener = urllib2.build_opener(proxy_support) + urllib2.install_opener(opener) + os.putenv("http_proxy",proxy) + return proxy + +def on_battery(): + """ + Check via dbus if the system is running on battery. + This function is using UPower per default, if UPower is not + available it falls-back to DeviceKit.Power. + """ + try: + import dbus + bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM) + try: + devobj = bus.get_object('org.freedesktop.UPower', + '/org/freedesktop/UPower') + dev = dbus.Interface(devobj, 'org.freedesktop.DBus.Properties') + return dev.Get('org.freedesktop.UPower', 'OnBattery') + except dbus.exceptions.DBusException, e: + if e._dbus_error_name != 'org.freedesktop.DBus.Error.ServiceUnknown': + raise + devobj = bus.get_object('org.freedesktop.DeviceKit.Power', + '/org/freedesktop/DeviceKit/Power') + dev = dbus.Interface(devobj, "org.freedesktop.DBus.Properties") + return dev.Get("org.freedesktop.DeviceKit.Power", "on_battery") + except Exception, e: + #import sys + #print >>sys.stderr, "on_battery returned error: ", e + return False + +def inhibit_sleep(): + """ + Send a dbus signal to power-manager to not suspend + the system, using the freedesktop common interface + """ + try: + import dbus + bus = dbus.Bus(dbus.Bus.TYPE_SESSION) + devobj = bus.get_object('org.freedesktop.PowerManagement', + '/org/freedesktop/PowerManagement/Inhibit') + dev = dbus.Interface(devobj, "org.freedesktop.PowerManagement.Inhibit") + cookie = dev.Inhibit('UpdateManager', 'Updating system') + return (dev, cookie) + except Exception: + #print "could not send the dbus Inhibit signal: %s" % e + return (False, False) + +def allow_sleep(dev, cookie): + """Send a dbus signal to gnome-power-manager to allow a suspending + the system""" + try: + dev.UnInhibit(cookie) + except Exception, e: + print "could not send the dbus UnInhibit signal: %s" % e + + +def str_to_bool(str): + if str == "0" or str.upper() == "FALSE": + return False + return True + +def utf8(str): + return unicode(str, 'latin1').encode('utf-8') + +def get_lang(): + import logging + try: + (locale_s, encoding) = locale.getdefaultlocale() + return locale_s + except Exception: + logging.exception("gedefaultlocale() failed") + return None + +def get_ubuntu_flavor(): + """ try to guess the flavor based on the running desktop """ + # this will (of course) not work in a server environment, + # but the main use case for this is to show the right + # release notes + denv = os.environ.get("DESKTOP_SESSION", "") + if "gnome" in denv: + return "ubuntu" + elif "kde" in denv: + return "kubuntu" + elif "xfce" in denv or "xubuntu" in denv: + return "xubuntu" + elif "LXDE" in denv or "Lubuntu" in denv: + return "lubuntu" + # default to ubuntu if nothing more specific is found + return "ubuntu" + +def error(parent, summary, message): + from gi.repository import Gtk, Gdk + d = Gtk.MessageDialog(parent=parent, + flags=Gtk.DialogFlags.MODAL, + type=Gtk.MessageType.ERROR, + buttons=Gtk.ButtonsType.CLOSE) + d.set_markup("%s\n\n%s" % (summary, message)) + d.realize() + d.get_window().set_functions(Gdk.WMFunction.MOVE) + d.set_title("") + d.run() + d.destroy() + return False + +def humanize_size(bytes): + """ + Convert a given size in bytes to a nicer better readable unit + """ + + if bytes < 1000 * 1000: + # to have 0 for 0 bytes, 1 for 0-1000 bytes and for 1 and above round up + size_in_kb = int(ceil(bytes/float(1000))); + # TRANSLATORS: download size of small updates, e.g. "250 kB" + return ngettext("%(size).0f kB", "%(size).0f kB", size_in_kb) % { "size" : size_in_kb } + else: + # TRANSLATORS: download size of updates, e.g. "2.3 MB" + return locale.format_string(_("%.1f MB"), bytes / 1000.0 / 1000.0) + +def get_arch(): + return apt_pkg.Config.find("APT::Architecture") + + +def is_port_already_listening(port): + """ check if the current system is listening on the given tcp port """ + # index in the line + INDEX_LOCAL_ADDR = 1 + #INDEX_REMOTE_ADDR = 2 + INDEX_STATE = 3 + # state (st) that we care about + STATE_LISTENING = '0A' + # read the data + for line in open("/proc/net/tcp"): + line = line.strip() + if not line: + continue + # split, values are: + # sl local_address rem_address st tx_queue rx_queue tr tm->when retrnsmt uid timeout inode + values = line.split() + state = values[INDEX_STATE] + if state != STATE_LISTENING: + continue + local_port_str = values[INDEX_LOCAL_ADDR].split(":")[1] + local_port = int(local_port_str, 16) + if local_port == port: + return True + return False + + +def iptables_active(): + """ Return True if iptables is active """ + # FIXME: is there a better way? + iptables_empty="""Chain INPUT (policy ACCEPT) +target prot opt source destination + +Chain FORWARD (policy ACCEPT) +target prot opt source destination + +Chain OUTPUT (policy ACCEPT) +target prot opt source destination +""" + if os.getuid() != 0: + raise OSError, "Need root to check the iptables state" + if not os.path.exists("/sbin/iptables"): + return False + out = subprocess.Popen(["iptables", "-L"], + stdout=subprocess.PIPE).communicate()[0] + if out == iptables_empty: + return False + return True + + +if __name__ == "__main__": + #print mirror_from_sources_list() + #print on_battery() + #print inside_chroot() + print iptables_active() diff -Nru update-manager-17.10.11/DistUpgrade/window_main.ui update-manager-0.156.14.15/DistUpgrade/window_main.ui --- update-manager-17.10.11/DistUpgrade/window_main.ui 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/window_main.ui 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,267 @@ + + window_main + + + + 0 + 0 + 349 + 294 + + + + Distribution Upgrade + + + + + + Show Terminal >>> + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 302 + 21 + + + + + + + + + + + false + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 20 + 16 + + + + + + + + + + + false + + + + + + + + + + 0 + 0 + + + + + + + false + + + + + + + + 0 + 0 + + + + + + + false + + + + + + + Preparing to upgrade + + + false + + + + + + + + 0 + 0 + + + + + + + false + + + + + + + + 0 + 0 + + + + + + + false + + + + + + + Getting new packages + + + false + + + + + + + Cleaning up + + + false + + + + + + + Installing the upgrades + + + false + + + + + + + Setting new software channels + + + false + + + + + + + Restarting the computer + + + false + + + + + + + + 0 + 0 + + + + + + + false + + + + + + + + 0 + 0 + + + + + + + false + + + + + + + + + <b><big>Upgrading Ubuntu to version 12.04</big></b> + + + false + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + 24 + + + + + + + + + diff -Nru update-manager-17.10.11/DistUpgrade/xorg_fix_proprietary.py update-manager-0.156.14.15/DistUpgrade/xorg_fix_proprietary.py --- update-manager-17.10.11/DistUpgrade/xorg_fix_proprietary.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/xorg_fix_proprietary.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,165 @@ +#!/usr/bin/python +# +# this script will exaimne /etc/xorg/xorg.conf and +# transition from broken proprietary drivers to the free ones +# + +import sys +import os +import os.path +import logging +import time +import shutil +import subprocess +import apt_pkg +apt_pkg.init() + +# main xorg.conf +XORG_CONF="/etc/X11/xorg.conf" + +# really old and most likely obsolete conf +OBSOLETE_XORG_CONF="/etc/X11/XF86Config-4" + +def remove_input_devices(xorg_source=XORG_CONF, xorg_destination=XORG_CONF): + logging.debug("remove_input_devices") + content=[] + in_input_devices = False + for raw in open(xorg_source): + line = raw.strip() + if (line.lower().startswith("section") and + line.lower().split("#")[0].strip().endswith('"inputdevice"')): + logging.debug("found 'InputDevice' section") + content.append("# commented out by update-manager, HAL is now used and auto-detects devices\n") + content.append("# Keyboard settings are now read from /etc/default/console-setup\n") + content.append("#"+raw) + in_input_devices=True + elif line.lower().startswith("endsection") and in_input_devices: + content.append("#"+raw) + in_input_devices=False + elif line.lower().startswith("inputdevice"): + logging.debug("commenting out '%s' " % line) + content.append("# commented out by update-manager, HAL is now used and auto-detects devices\n") + content.append("# Keyboard settings are now read from /etc/default/console-setup\n") + content.append("#"+raw) + elif in_input_devices: + logging.debug("commenting out '%s' " % line) + content.append("#"+raw) + else: + content.append(raw) + open(xorg_destination+".new","w").write("".join(content)) + os.rename(xorg_destination+".new", xorg_destination) + return True + +def replace_driver_from_xorg(old_driver, new_driver, xorg=XORG_CONF): + """ + this removes old_driver driver from the xorg.conf and subsitutes + it with the new_driver + """ + if not os.path.exists(xorg): + logging.warning("file %s not found" % xorg) + return + content=[] + for line in open(xorg): + # remove comments + s=line.split("#")[0].strip() + # check for fglrx driver entry + if (s.lower().startswith("driver") and + s.endswith('"%s"' % old_driver)): + logging.debug("line '%s' found" % line) + line='\tDriver\t"%s"\n' % new_driver + logging.debug("replacing with '%s'" % line) + content.append(line) + # write out the new version + if open(xorg).readlines() != content: + logging.info("saveing new %s (%s -> %s)" % (xorg, old_driver, new_driver)) + open(xorg+".xorg_fix","w").write("".join(content)) + os.rename(xorg+".xorg_fix", xorg) + +def comment_out_driver_from_xorg(old_driver, xorg=XORG_CONF): + """ + this comments out a driver from xorg.conf + """ + if not os.path.exists(xorg): + logging.warning("file %s not found" % xorg) + return + content=[] + for line in open(xorg): + # remove comments + s=line.split("#")[0].strip() + # check for old_driver driver entry + if (s.lower().startswith("driver") and + s.endswith('"%s"' % old_driver)): + logging.debug("line '%s' found" % line) + line='#%s' % line + logging.debug("replacing with '%s'" % line) + content.append(line) + # write out the new version + if open(xorg).readlines() != content: + logging.info("saveing new %s (commenting %s)" % (xorg, old_driver)) + open(xorg+".xorg_fix","w").write("".join(content)) + os.rename(xorg+".xorg_fix", xorg) + +def is_multiseat(xorg_source=XORG_CONF): + " check if we have a multiseat xorg config " + def is_serverlayout_line(line): + return (not line.strip().startswith("#") and + line.strip().lower().endswith('"serverlayout"')) + msl = len(filter(is_serverlayout_line, open(xorg_source))) + logging.debug("is_multiseat: lines %i", msl) + return msl > 1 + +if __name__ == "__main__": + if not os.getuid() == 0: + print "Need to run as root" + sys.exit(1) + + # we pretend to be update-manger so that apport picks up when we crash + sys.argv[0] = "/usr/bin/update-manager" + + # setup logging + logging.basicConfig(level=logging.DEBUG, + filename="/var/log/dist-upgrade/xorg_fixup.log", + filemode='w') + + logging.info("%s running" % sys.argv[0]) + + if os.path.exists(OBSOLETE_XORG_CONF): + old = OBSOLETE_XORG_CONF + new = OBSOLETE_XORG_CONF+".obsolete" + logging.info("renaming obsolete %s -> %s" % (old, new)) + os.rename(old, new) + + if not os.path.exists(XORG_CONF): + logging.info("No xorg.conf, exiting") + sys.exit(0) + + # remove empty xorg.conf to help xorg and its auto probing logic + # (LP: #439551) + if os.path.getsize(XORG_CONF) == 0: + logging.info("xorg.conf is zero size, removing") + os.remove(XORG_CONF) + sys.exit(0) + + #make a backup of the xorg.conf + backup = XORG_CONF + ".dist-upgrade-" + time.strftime("%Y%m%d%H%M") + logging.debug("creating backup '%s'" % backup) + shutil.copy(XORG_CONF, backup) + + if (not os.path.exists("/usr/lib/xorg/modules/drivers/fglrx_drv.so") and + "fglrx" in open(XORG_CONF).read()): + logging.info("Removing fglrx from %s" % XORG_CONF) + comment_out_driver_from_xorg("fglrx") + + if (not os.path.exists("/usr/lib/xorg/modules/drivers/nvidia_drv.so") and + "nvidia" in open(XORG_CONF).read()): + logging.info("Removing nvidia from %s" % XORG_CONF) + comment_out_driver_from_xorg("nvidia") + + # now run the removeInputDevices() if we have a new xserver + ver=subprocess.Popen(["dpkg-query","-W","-f=${Version}","xserver-xorg-core"], stdout=subprocess.PIPE).communicate()[0] + logging.info("xserver-xorg-core version is '%s'" % ver) + if ver and apt_pkg.version_compare(ver, "2:1.5.0") > 0: + if not is_multiseat(): + remove_input_devices() + else: + logging.info("multiseat setup, ignoring") diff -Nru update-manager-17.10.11/DistUpgrade/zz-update-grub update-manager-0.156.14.15/DistUpgrade/zz-update-grub --- update-manager-17.10.11/DistUpgrade/zz-update-grub 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/DistUpgrade/zz-update-grub 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,19 @@ +#! /bin/sh +set -e + +which update-grub >/dev/null 2>&1 || exit 0 + +set -- $DEB_MAINT_PARAMS +mode="${1#\'}" +mode="${mode%\'}" +case $0:$mode in + # Only run on postinst configure and postrm remove, to avoid wasting + # time by calling update-grub multiple times on upgrade and removal. + # Also run if we have no DEB_MAINT_PARAMS, in order to work with old + # kernel packages. + */postinst.d/*:|*/postinst.d/*:configure|*/postrm.d/*:|*/postrm.d/*:remove) + exec update-grub + ;; +esac + +exit 0 diff -Nru update-manager-17.10.11/do-release-upgrade update-manager-0.156.14.15/do-release-upgrade --- update-manager-17.10.11/do-release-upgrade 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/do-release-upgrade 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,126 @@ +#!/usr/bin/python + +import warnings +warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning) +import apt + +from DistUpgrade.DistUpgradeVersion import VERSION + +from UpdateManager.Core.MetaRelease import MetaReleaseCore +from UpdateManager.Core.DistUpgradeFetcherCore import DistUpgradeFetcherCore +from optparse import OptionParser +import locale +import gettext +from gettext import gettext as _ + +import os +import sys +import time +from DistUpgrade.utils import init_proxy + +RELEASE_AVAILABLE=0 +NO_RELEASE_AVAILABLE=1 + +if __name__ == "__main__": + + gettext.bindtextdomain("update-manager", "/usr/share/locale") + gettext.textdomain("update-manager") + + try: + locale.setlocale(locale.LC_ALL, "") + except: + pass + + init_proxy() + + # when run as "check-new-release" we go into "check only" mode + check_only = sys.argv[0].endswith("check-new-release") + + parser = OptionParser() + #FIXME: Workaround a bug in optparser which doesn't handle unicode/str + # correctly, see http://bugs.python.org/issue4391 + # Should be resolved by Python3 + enc = locale.getpreferredencoding() + parser.add_option ("-V", "--version", action="store_true", + dest="show_version", default=False, + help=_("Show version and exit").decode(enc)) + parser.add_option ("-d", "--devel-release", action="store_true", + dest="devel_release", default=False, + help=_("Check if upgrading to the latest devel release " + "is possible").decode(enc)) + parser.add_option ("-p", "--proposed", action="store_true", + dest="proposed_release", default=False, + help=_("Try upgrading to the latest release using " + "the upgrader from $distro-proposed").decode(enc)) + parser.add_option ("-m", "--mode", default="server", + dest="mode", + help=_("Run in a special upgrade mode.\n" + "Currently 'desktop' for regular upgrades of " + "a desktop system and 'server' for server " + "systems are supported.").decode(enc)) + parser.add_option ("-f", "--frontend", default="DistUpgradeViewText", + dest="frontend", + help=_("Run the specified frontend").decode(enc)) + parser.add_option ("-s","--sandbox", action="store_true", default=False, + help=_("Test upgrade with a sandbox aufs overlay").decode(enc)) + parser.add_option ("-c", "--check-dist-upgrade-only", action="store_true", + default=check_only, + help=_("Check only if a new distribution release is " + "available and report the result via the " + "exit code").decode(enc)) + parser.add_option ("-q", "--quiet", default=False, action="store_true", + dest="quiet") + + (options, args) = parser.parse_args() + + + if options.show_version: + print "%s: version %s" % (os.path.basename(sys.argv[0]), VERSION) + sys.exit(0) + + if not options.quiet: + print _("Checking for a new Ubuntu release") + + m = MetaReleaseCore(useDevelopmentRelease=options.devel_release, + useProposed=options.proposed_release) + # this will timeout eventually + while m.downloading: + time.sleep(0.5) + + # make sure to inform the user if his distro is no longer supported + # this will make it appear in motd (that calls do-release-upgrade in + # chech-new-release mode) + if m.no_longer_supported is not None: + url = "http://www.ubuntu.com/releaseendoflife" + print _("Your Ubuntu release is not supported anymore.") + print _("For upgrade information, please visit:\n" + "%(url)s\n") % { 'url' : url } + + # now inform about a new release + if m.new_dist is None: + if not options.quiet: + print _("No new release found") + sys.exit(NO_RELEASE_AVAILABLE) + + if m.new_dist.upgrade_broken: + if not options.quiet: + print _("Release upgrade not possible right now") + print _("The release upgrade can not be performed currently, " + "please try again later. The server reported: '%s'") % m.new_dist.upgrade_broken + sys.exit(NO_RELEASE_AVAILABLE) + + # we have a new dist + if options.check_dist_upgrade_only: + print _("New release '%s' available.") % m.new_dist.version + print _("Run 'do-release-upgrade' to upgrade to it.") + sys.exit(RELEASE_AVAILABLE) + + progress = apt.progress.text.AcquireProgress() + fetcher = DistUpgradeFetcherCore(new_dist=m.new_dist, + progress=progress) + fetcher.run_options += ["--mode=%s" % options.mode, + "--frontend=%s" % options.frontend, + ] + if options.sandbox: + fetcher.run_options.append("--sandbox") + fetcher.run() diff -Nru update-manager-17.10.11/help/C/index.docbook update-manager-0.156.14.15/help/C/index.docbook --- update-manager-17.10.11/help/C/index.docbook 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/help/C/index.docbook 1970-01-01 00:00:00.000000000 +0000 @@ -1,1023 +0,0 @@ - - - -]> - - - -
- - - - Software Updater Manual - - 2006 - In Words - - - - - - - In Words Techdoc Solutions - - &legal; - - - - Sean - Wheller - - In Words -
- sean@inwords.co.za -
- - - - Jeff - Schering - Editor - - - Jerome - Gotangco - Maintainer - - - - - - - - - - - - - - - - - - V0.0.1 - 06/03/2005 - - First version of the manual created in accordance - with Software Updater V0.37.1+svn20050301. Documentation Writer - sean@inwords.co.za - - - InWords Techdoc - Solutions - - - - - V0.0.2 - 26/03/2005 - - Edit of V0.0.1 to make some nodes shorter. - Editor jeffschering@gmail.com - - - InWords Techdoc - Solutions - - - - - V0.0.3 - 26/03/2005 - - Added Help, Add CD, Settings options. - sean@inwords.co.za - - - InWords Techdoc - Solutions - - - - - This manual explains how to use Software Updater, an apt update - management application for the GNOME desktop created by the Ubuntu - project. - - Feedback - - To report a bug or make a suggestion regarding this package or this - manual, send mail to ubuntu-users@lists.ubuntu.com. - - - - - - - Introduction - - Software Updater is a graphical interface to the - software update features of Advanced Packaging - Tool (APT). APT is a - command line tool for installing, updating, and removing software. - - Software Updater makes the task of checking for - and installing software updates as effortless as possible. - Software Updater keeps your system up to date - by checking Ubuntu's software repositories for new versions of installed - software. The new versions usually contain bug fixes and new features, but - may also contain security updates. Use Software Updater on a regular basis - to ensure that your system is as up to date and secure as possible. - - Software Updater decides which software needs to - be updated by comparing the version numbers of individual software files - on your computer with the software in one or more software repositories. - The software repositories are usually on remote network servers, but may - also be on a CD-ROM. Whenever Software Updater - notifies you that an update is available, you may choose to install the - update immediately, or to ignore the update. - - Software Updater has settings and preferences - which allow you to: set how often it checks for updates, add and remove - software repositories, and manage repository authentication keys. - - - Getting Started - - Installation - - Software Updater is installed as part of the - Ubuntu standard installation, and should already be on your system. The - application is known as Ubuntu Update - Manager. If you need to install Update - Manager, you can use Synaptic Package - Manager. Choose - System - Administration - Synaptic Package Manager - to start Synaptic. The package - you need to install is update-manager. - You may also install Software Updater from the command line using - apt-get. To install Update - Manager from the command line: - -sudo apt-get install update-manager - - - Software Updater is dependent on the following - packages: 'python,' 'python-gnome2,' - 'python-apt,' 'synaptic,' and - 'lsb-release.' - - - Starting Software Updater - Choose - System - Administration - Ubuntu Software Updater - to start the application. Enter your password when - prompted. - You may also start Software Updater from - the command line: - -update-manager - - - - Main Window - The Software Updater main window is used for - managing the update process and setting preferences. - When you open Software Updater, the main - window displays the list of packages that need to be installed to update - your computer. If the software on your computer is up to date, the main window contains - only the message "The software on this computer is up to date." - - - - - - - Available Updates - - - - - - - Performing Updates - - Updating Your Computer - When you open Software Updater, the main - window displays the list of packages that need to be installed to update - your computer. If the software on your computer is up to date, the main window contains - only the message "The software on this computer is up to date." - - - - - - - Available Updates - - - - By default, all packages are marked for installation. In most - cases you will install all of the packages right away. However, if there - are a large number of updates you may want to do only a few at a time. - To un-mark a package for installation, clear the check box - for the package. - To see additional information about a package, click on - Details. - (see ) - When you are ready to install the selected packages, - click on Install. - If Software Updater detects one or more - packages without a digital signature, the - Summary dialog is displayed. - The Summary dialog lists three groups of update - categories: - - - - NOT AUTHENTICATED - - - Packages without a digital signature. - - - - - To be upgraded - - - Packages that will be upgraded. - - - - - Unchanged - - - Packages that will not be upgraded due to dependency issues. - The packages will be upgraded in a future Update - Manager session, once the developers have - resolved the package dependencies. - - - - If you do not want to install non-authenticated packages, click - Cancel. The Summary - dialog will close, and you can - deselect the packages in the Software Updater - main window. - - If a deselected package is required as a dependency for a selected - package, Software Updater will install the - deselected package to satisfy the dependency. - - - Software Updater downloads all of the - selected packages before installing them. The entire process might take a - long time depending on the amount of data that needs to be downloaded, the - speed of your network connection, and the number of packages that need to - be installed. While downloading packages, - Software Updater displays a dialog box that - monitors the download progress. (See ). - - - Expanded Update Information - To see additional information about a package: - - - Click on the package in the main window. - - - Click on Details.A tabbed section - opens within the main window. - - - The tabs are as follows: - - - - Changes - - - A list of the changes incorporated in the package. The list - is the contents of the ChangeLog file for the - package. - - - - - Description - - - A short description of each program in the package. - - - - - - Monitoring Download Progress - Software Updater displays the - Installing updates window while the - packages are downloading. The progress bar in the - Installing updates window shows the progress - of the entire update. - To display the download progress of each package, click on - Show progress of individual files. - To cancel the download, click Cancel. - - All files must be downloaded before - Software Updater can proceed to the installation stage. If - the network connections fails or if you cancel the download, the update - will not be installed. - - To resume a canceled or failed download, click on Install in the - main window. Software Updater will resume the - download from the last successfully downloaded file. - - - - Monitoring Installation Progress - Software Updater displays the - Installation updates window while the updates are - being installed. The progress bar inside the Installation - updates window shows the progress of the entire installation. - - To display the installation progress of each package, click on - Terminal. The terminal view opens within the - window. The terminal view displays the unfiltered output of the Advanced - Packaging Tool (APT). APT is the tool that Software Updater uses to - perform the update. - - Do not terminate the installation process. This may lead to - corruption of installed programs and general system - instability. - - - - - Setting Preferences - The Software Updater - Preferences button displays the Software - Preferences dialog. From this dialog you can perform the - following tasks: - - - Manage software sources (see ). - - - Manage authentication keys (see ). - - - Manage settings (see ). - - - - Managing Software Sources - During installation of a distro, software repositories are - automatically added to the list of 'software sources.' - Typical sources added by the distro installation include the - installation source, update, and security repositories. Sources can be - added to and removed from the list and existing sources can be edited. - - The operations described here modify /etc/apt/sources.list using the Update - Manager graphical user interface. Software sources can - also be managed by making direct modifications in /etc/apt/sources.list. This is only - advised for advanced users. - - - Adding Software Sources - Software may be installed using various access methods: - - - - CD-ROM - Compact Disk Read Only Memory, - normally directly connected to the computer system and mounted - locally by the operating system. - - - - - - - FTP - File Transfer Protocol, a secure and - reliable protocol designed specifically for the purpose of - transferring large files across the Internet. - - - - HTTP - HyperText Transfer Protocol, commonly - used to request and receive Web pages, but can also be used for - file transfer. - - - - SMB - Server Management Block is used to - access shared resources on computers running Microsoft - Windows or Samba - Server. - - - - NFS - Network File System is used to access - shared resources on Linux/UNIX computers. - - - - Before software sources residing on SMB or NFS shares can be - defined, the share must be mounted by the local system. Access can - then be made via the local filesystem. For more information see - . - - A new software source can be defined by clicking - the Add button located on the - Software Preferences dialog. This will - display the Edit Repository dialog. - - - - - - - Adding Software Sources - - - - Complete the Edit Repository dialog to add - a new Software source. - - - - Repository - - - A drop-list containing known software sources. - - - - - Components - - - The Ubuntu software repository contains thousands of - software packages organized into four - 'components,' on the basis of the level of - support we can offer them, and whether or not they comply with - Free Software Philosophy. The components are called - 'main,' 'restricted,' - 'universe,' and - 'multiverse.' - Check the components you wish to include in the update list. - - - - Officially supported (main) - - The main distribution component contains applications that - are free software, can freely be redistributed and are fully - supported by the Ubuntu team. This includes the most popular - and most reliable open source applications available, much - of which is installed by default when you install Ubuntu. - Software in main includes a hand-selected list of - applications that the Ubuntu developers, community, and - users feel are important and that the Ubuntu security and - distribution team are willing to support. When you install - software from the main component you are assured that the - software will come with security updates and technical - support. We believe that the software in main includes - everything most people will need for a fully functional - desktop or Internet server running only open source - software. The licenses for software applications in main - must be free, but main may also may contain binary firmware - and selected fonts that cannot be modified without - permission from their authors. In all cases redistribution - is unencumbered. - - - - Restricted Copyright - The - restricted component is reserved for software that is very - commonly used, and which is supported by the Ubuntu team - even though it is not available under a completely free - license. Please note that it may not be possible to provide - complete support for this software since we are unable to - fix the software ourselves, but can only forward problem - reports to the actual authors. Some software from restricted - will be installed on Ubuntu CDs but is clearly separated to - ensure that it is easy to remove. We include this software - because it is essential in order for Ubuntu to run on - certain machines - typical examples are the binary drivers - that some video card vendors publish, which are the only way - for Ubuntu to run on those machines. By default, we will - only use open source software unless there is simply no - other way to install Ubuntu. The Ubuntu team works with such - vendors to accelerate the open-sourcing of their software to - ensure that as much software as possible is available under - a Free license. - - - - Community maintained - (Universe) - The universe component is a snapshot - of the free, open source, and Linux world. In universe you - can find almost every piece of open source software, and - software available under a variety of less open licenses, - all built automatically from a variety of public sources. - All of this software is compiled against the libraries and - using the tools that form part of main, so it should install - and work well with the software in main, but it comes with - no guarantee of security fixes and support. The universe - component includes thousands of pieces of software. Through - universe, users are able to have the diversity and - flexibility offered by the vast open source world on top of - a stable Ubuntu core. - - - - Non Free (Multiverse) - The - 'multiverse' component contains software - that is not free, which means the - licensing requirements of this software do not meet the - Ubuntu 'main' Component license Policy. - The onus is on you to verify your rights to use this - software and comply with the licensing terms of the - copyright holder. This software is not supported and usually - cannot be fixed or updated. Use it at your own risk. - - - - - - - - Creating Custom Software Sources - It is also possible to define custom software sources. - To define a custom software source click the - Custom button located on the Edit - Repository dialog. This will display a dialog in which - the custom repository can be defined using - apt command syntax. - Apt is an Advanced Packaging Tool and - front-end to dpkg the Debian Package - Management System. Once the apt line is entered - click the Add repository - button. - - - - - - - Creating Custom Software Sources - - - - The apt command syntax defines the - 'type,' 'location,' and - 'content' of the repository. Example of the command - syntax could look like this. - -deb ftp://archive.ubuntu.com/ubuntu/ hoary main restricted universe multiverse - - This example would define the software sources as a Debian source - at ubuntu.com containing the hoary release and using all components. - For definition of the components, see . - - - Removing Software Sources - Software sources can be removed from the sources list by selecting - the software source then clicking the - Remove button located on the - Software Preferences dialog. - Removal of a software source requires that the - apt file (/etc/apt/sources.list) that contains the a list of - software sources is updated. Before modifying this file - Software Updater prompts to confirm the - operation. If the operation is confirmed a backup copy is create in - /etc/apt/sources.list.save. - - - Editing Software Sources - To change the values defining a software source, select the source - record then click the edit button. This will display - the Edit Repository dialog. - - - - - - - Editing Software Sources - - - - - - - Type - - - Software sources may contain software in - 'Binary' or 'Source Code' - format. Select the option correlating to the repository - format. - - - - - URI - - - Enter a valid Uniform Resource Indicator - (URI). Following is a list of examples for - each of the possible access methods: - - - - - CD-ROM - - cdrom:[description_of_cd]/ - - - - - - - - FTP - - ftp://ftp.domain.ext/path/to/repository - - - - - HTTP - - http://www.domain.ext/path/to/repository - - - - - SMB - Works only when the computer is - already connected to an SMB share. To connect to SMB share - use the following command syntax from the shell - smbclient //hostname/sharename -U - username. - The SMB share is accessed from the local file system - once the local system is connected. - file://path/to/sharefile - - - - - NFS - Works only when the computer is - already connected to a NFS share. To connect the NFS share - must be mounted. NFS shares are mounted on the client side - using the mount command. The format of the command is as - follows: mount -o [options] [host]:[/remote/export] - [/local/directory] - - Once mounted Software Updater - can access the share using the following command - file://path/to/local/directory - - - - - If accessing a SMB or NFS shares by manually issuing the - mount commands, the file system must be - remounted manually after the system is rebooted. Failing to - remount will result in Update - Manager not being able to access the - resource. - - - - - - Distribution - - - The name of the distribution or name of the distribution - version. - - - - - Sections - - - The section of the distribution repository to access. - - - - - Comment - - - Add a comment to describe the repository. - - - - - Repositories defined using Synaptic, - another package management tool, are automatically displayed in the - Software Updater Software Sources - list. - - - - - Managing Authentication Keys - Authentication keys make it possible to verify the integrity of - update software. From the Authentication Keys - dialog it is possible to view and manage the list authentication keys. - Each key corresponds to a Software Source defined in the - Software Preference dialog (see ). Keys can be added and removed. In the - event of an error it is also possible to restore the default - authentication keys provided by the defined update repositories. - - - - - - - - Managing Authentication Keys - - - - - Adding Authentication Keys - Authentication keys are usually obtained from the software vendor - running the repository. Often the vendor will place a copy of the - authentication key on a key server, for example www.keyserver.net. The key - can then be retrieved using the command gpg - -recv-key. When the key resides on a key server the option - must be used to give the name of this - key server. - -gpg -recv-key --keyserver www.keyserver.net - - - If the key is fetched over a untrusted medium, like the - Internet, additional steps should be taken to verify the key. For - example, getting the fingerprint with a secure method such as by - phone, letter, or business card. Alternately you can check if the - key is signed with a known-good key. - - Once the key is downloaded, select it using the Choose - a key-file dialog that is displayed when the - Add button. - - - - - - - Adding Authentication Keys - - - - - - Removing Authentication Keys - Authentication keys can be removed by selecting a record item then - clicking the Remove - button. - - - Restoring Default Keys - During installation the default Ubuntu Authentication keys are - added to the Ubuntu GPG Keyring package. In - the even of a key being accidentally deleted it can be restored by - clicking the Restore default keys - button. - - - - Managing Settings - The Settings button, located on the - Software Preferences dialog, displays the - Settings dialog. From this interface you can - manage the behavior of the application and pre-update process. - - - - - - - Managing Settings - - - - The following options are available: - - User Interface - - - Show disabled software sources: - When checked - software sources that are not checked in the Software - Preferences dialog are displayed. When unchecked, - these items are not displayed in the list. - - - - Updates - - - - - - Automatically check for software updates: - - When checked the Update interval in - days option is enabled. Update - Manager will poll all enabled software sources - for updates according to the value specified in the - scroll-box. - - - - Download upgradable packages: - When - checked Software Updater will - automatically download any available software update packages. - It will not install them until the user has defined the - installation list (see ). - - - - - - - Temporary files - - - Automatically clean temporary packages files: - - When checked the Clean interval in days option - is enabled. Software Updater automatically - removes any temporary files created by the upgrade process according - to the value specified in the scroll-box. - - - Set maximum size of the package cache: When checked the size of - the package cache is limited to the value specified in the Maximum size in - MB spin-box. - - - Delete old packages in the package cache: When checked cached - packaged with a date older than the value specified in the Maximum age in - days spin-box will be automatically purged from the cache. - - - - - Install Progress for Terminal View Only - It is also possible to configure the installation progress to use - only a terminal view. That is to say, no progress bar is displayed, only - a terminal view. - - - - - - - Monitoring Installation Progress - - - - - Do not terminate the installation process. This may lead to - corruption of installed programs and general system - instability. - - Changing between 'Progress Bar' and - 'Terminal View,' modes is managed via - Synaptic. To change modes proceed as - follows: - - - Start Synaptic by selecting - System - Administration - Synaptic Package Manager - from the Desktop menu system. - - - When prompted, enter your password. - - - From the main menu, select - Settings - Preferences - . The Preferences dialog is - displayed. - - - From the General tab, Apply - Changes group, check or - uncheck the Apply changes in terminal - window checkbox. - - - - - - - Synaptic Preferences - General Tab - - - - - - - Click - OK and exit - Synaptic. - - - - - - About Software Updater - The Software Updater was written by Michiel - Sikkes michiel@eyeopened.nl and Michael Vogt - michael.vogt@ubuntu.com as an - apt Software Updater for the GNOME Desktop of the - Ubuntu distribution. The user manual was written by Sean Wheller - sean@inwords.co.za. - To report a bug or make a suggestion regarding this package or this - manual, send mail to ubuntu-users@lists.ubuntu.com. - &GFDL;
diff -Nru update-manager-17.10.11/help/C/Makefile.am update-manager-0.156.14.15/help/C/Makefile.am --- update-manager-17.10.11/help/C/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/help/C/Makefile.am 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,7 @@ +figdir = figures +docname = update-manager +lang = C +omffile = update-manager-C.omf +entities = fdl-appendix.xml legal.xml +include $(top_srcdir)/xmldocs.make +dist-hook: app-dist-hook diff -Nru update-manager-17.10.11/help/C/update-manager-C.omf update-manager-0.156.14.15/help/C/update-manager-C.omf --- update-manager-17.10.11/help/C/update-manager-C.omf 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/help/C/update-manager-C.omf 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,18 @@ + + + + sean@inwords.co.za (Sean Wheller) + Update Manager Manual + 2005-03-04 + + + This document explains how to use the Update Manager. + manual + + + + + + + diff -Nru update-manager-17.10.11/help/C/update-manager.xml update-manager-0.156.14.15/help/C/update-manager.xml --- update-manager-17.10.11/help/C/update-manager.xml 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/help/C/update-manager.xml 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,1023 @@ + + + +]> + + + +
+ + + + Update Manager Manual + + 2006 + In Words + + + + + + + In Words Techdoc Solutions + + &legal; + + + + Sean + Wheller + + In Words +
+ sean@inwords.co.za +
+ + + + Jeff + Schering + Editor + + + Jerome + Gotangco + Maintainer + + + + + + + + + + + + + + + + + + V0.0.1 + 06/03/2005 + + First version of the manual created in accordance + with Update Manager V0.37.1+svn20050301. Documentation Writer + sean@inwords.co.za + + + InWords Techdoc + Solutions + + + + + V0.0.2 + 26/03/2005 + + Edit of V0.0.1 to make some nodes shorter. + Editor jeffschering@gmail.com + + + InWords Techdoc + Solutions + + + + + V0.0.3 + 26/03/2005 + + Added Help, Add CD, Settings options. + sean@inwords.co.za + + + InWords Techdoc + Solutions + + + + + This manual explains how to use Update Manager, an apt update + management application for the GNOME desktop created by the Ubuntu + project. + + Feedback + + To report a bug or make a suggestion regarding this package or this + manual, send mail to ubuntu-users@lists.ubuntu.com. + + + + + + + Introduction + + Update Manager is a graphical interface to the + software update features of Advanced Packaging + Tool (APT). APT is a + command line tool for installing, updating, and removing software. + + Update Manager makes the task of checking for + and installing software updates as effortless as possible. + Update Manager keeps your system up to date + by checking Ubuntu's software repositories for new versions of installed + software. The new versions usually contain bug fixes and new features, but + may also contain security updates. Use Update Manager on a regular basis + to ensure that your system is as up to date and secure as possible. + + Update Manager decides which software needs to + be updated by comparing the version numbers of individual software files + on your computer with the software in one or more software repositories. + The software repositories are usually on remote network servers, but may + also be on a CD-ROM. Whenever Update Manager + notifies you that an update is available, you may choose to install the + update immediately, or to ignore the update. + + Update Manager has settings and preferences + which allow you to: set how often it checks for updates, add and remove + software repositories, and manage repository authentication keys. + + + Getting Started + + Installation + + Update Manager is installed as part of the + Ubuntu standard installation, and should already be on your system. The + application is known as Ubuntu Update + Manager. If you need to install Update + Manager, you can use Synaptic Package + Manager. Choose + System + Administration + Synaptic Package Manager + to start Synaptic. The package + you need to install is update-manager. + You may also install Update Manager from the command line using + apt-get. To install Update + Manager from the command line: + +sudo apt-get install update-manager + + + Update Manager is dependent on the following + packages: 'python,' 'python-gnome2,' + 'python-apt,' 'synaptic,' and + 'lsb-release.' + + + Starting Update Manager + Choose + System + Administration + Ubuntu Update Manager + to start the application. Enter your password when + prompted. + You may also start Update Manager from + the command line: + +update-manager + + + + Main Window + The Update Manager main window is used for + managing the update process and setting preferences. + When you open Update Manager, the main + window displays the list of packages that need to be installed to update + your computer. If the software on your computer is up to date, the main window contains + only the message "The software on this computer is up to date." + + + + + + + Available Updates + + + + + + + Performing Updates + + Updating Your Computer + When you open Update Manager, the main + window displays the list of packages that need to be installed to update + your computer. If the software on your computer is up to date, the main window contains + only the message "The software on this computer is up to date." + + + + + + + Available Updates + + + + By default, all packages are marked for installation. In most + cases you will install all of the packages right away. However, if there + are a large number of updates you may want to do only a few at a time. + To un-mark a package for installation, clear the check box + for the package. + To see additional information about a package, click on + Details. + (see ) + When you are ready to install the selected packages, + click on Install. + If Update Manager detects one or more + packages without a digital signature, the + Summary dialog is displayed. + The Summary dialog lists three groups of update + categories: + + + + NOT AUTHENTICATED + + + Packages without a digital signature. + + + + + To be upgraded + + + Packages that will be upgraded. + + + + + Unchanged + + + Packages that will not be upgraded due to dependency issues. + The packages will be upgraded in a future Update + Manager session, once the developers have + resolved the package dependencies. + + + + If you do not want to install non-authenticated packages, click + Cancel. The Summary + dialog will close, and you can + deselect the packages in the Update Manager + main window. + + If a deselected package is required as a dependency for a selected + package, Update Manager will install the + deselected package to satisfy the dependency. + + + Update Manager downloads all of the + selected packages before installing them. The entire process might take a + long time depending on the amount of data that needs to be downloaded, the + speed of your network connection, and the number of packages that need to + be installed. While downloading packages, + Update Manager displays a dialog box that + monitors the download progress. (See ). + + + Expanded Update Information + To see additional information about a package: + + + Click on the package in the main window. + + + Click on Details.A tabbed section + opens within the main window. + + + The tabs are as follows: + + + + Changes + + + A list of the changes incorporated in the package. The list + is the contents of the ChangeLog file for the + package. + + + + + Description + + + A short description of each program in the package. + + + + + + Monitoring Download Progress + Update Manager displays the + Installing updates window while the + packages are downloading. The progress bar in the + Installing updates window shows the progress + of the entire update. + To display the download progress of each package, click on + Show progress of individual files. + To cancel the download, click Cancel. + + All files must be downloaded before + Update Manager can proceed to the installation stage. If + the network connections fails or if you cancel the download, the update + will not be installed. + + To resume a canceled or failed download, click on Install in the + main window. Update Manager will resume the + download from the last successfully downloaded file. + + + + Monitoring Installation Progress + Update Manager displays the + Installation updates window while the updates are + being installed. The progress bar inside the Installation + updates window shows the progress of the entire installation. + + To display the installation progress of each package, click on + Terminal. The terminal view opens within the + window. The terminal view displays the unfiltered output of the Advanced + Packaging Tool (APT). APT is the tool that Update Manager uses to + perform the update. + + Do not terminate the installation process. This may lead to + corruption of installed programs and general system + instability. + + + + + Setting Preferences + The Update Manager + Preferences button displays the Software + Preferences dialog. From this dialog you can perform the + following tasks: + + + Manage software sources (see ). + + + Manage authentication keys (see ). + + + Manage settings (see ). + + + + Managing Software Sources + During installation of a distro, software repositories are + automatically added to the list of 'software sources.' + Typical sources added by the distro installation include the + installation source, update, and security repositories. Sources can be + added to and removed from the list and existing sources can be edited. + + The operations described here modify /etc/apt/sources.list using the Update + Manager graphical user interface. Software sources can + also be managed by making direct modifications in /etc/apt/sources.list. This is only + advised for advanced users. + + + Adding Software Sources + Software may be installed using various access methods: + + + + CD-ROM - Compact Disk Read Only Memory, + normally directly connected to the computer system and mounted + locally by the operating system. + + + + + + + FTP - File Transfer Protocol, a secure and + reliable protocol designed specifically for the purpose of + transferring large files across the Internet. + + + + HTTP - HyperText Transfer Protocol, commonly + used to request and receive Web pages, but can also be used for + file transfer. + + + + SMB - Server Management Block is used to + access shared resources on computers running Microsoft + Windows or Samba + Server. + + + + NFS - Network File System is used to access + shared resources on Linux/UNIX computers. + + + + Before software sources residing on SMB or NFS shares can be + defined, the share must be mounted by the local system. Access can + then be made via the local filesystem. For more information see + . + + A new software source can be defined by clicking + the Add button located on the + Software Preferences dialog. This will + display the Edit Repository dialog. + + + + + + + Adding Software Sources + + + + Complete the Edit Repository dialog to add + a new Software source. + + + + Repository + + + A drop-list containing known software sources. + + + + + Components + + + The Ubuntu software repository contains thousands of + software packages organized into four + 'components,' on the basis of the level of + support we can offer them, and whether or not they comply with + Free Software Philosophy. The components are called + 'main,' 'restricted,' + 'universe,' and + 'multiverse.' + Check the components you wish to include in the update list. + + + + Officially supported (main) + - The main distribution component contains applications that + are free software, can freely be redistributed and are fully + supported by the Ubuntu team. This includes the most popular + and most reliable open source applications available, much + of which is installed by default when you install Ubuntu. + Software in main includes a hand-selected list of + applications that the Ubuntu developers, community, and + users feel are important and that the Ubuntu security and + distribution team are willing to support. When you install + software from the main component you are assured that the + software will come with security updates and technical + support. We believe that the software in main includes + everything most people will need for a fully functional + desktop or Internet server running only open source + software. The licenses for software applications in main + must be free, but main may also may contain binary firmware + and selected fonts that cannot be modified without + permission from their authors. In all cases redistribution + is unencumbered. + + + + Restricted Copyright - The + restricted component is reserved for software that is very + commonly used, and which is supported by the Ubuntu team + even though it is not available under a completely free + license. Please note that it may not be possible to provide + complete support for this software since we are unable to + fix the software ourselves, but can only forward problem + reports to the actual authors. Some software from restricted + will be installed on Ubuntu CDs but is clearly separated to + ensure that it is easy to remove. We include this software + because it is essential in order for Ubuntu to run on + certain machines - typical examples are the binary drivers + that some video card vendors publish, which are the only way + for Ubuntu to run on those machines. By default, we will + only use open source software unless there is simply no + other way to install Ubuntu. The Ubuntu team works with such + vendors to accelerate the open-sourcing of their software to + ensure that as much software as possible is available under + a Free license. + + + + Community maintained + (Universe) - The universe component is a snapshot + of the free, open source, and Linux world. In universe you + can find almost every piece of open source software, and + software available under a variety of less open licenses, + all built automatically from a variety of public sources. + All of this software is compiled against the libraries and + using the tools that form part of main, so it should install + and work well with the software in main, but it comes with + no guarantee of security fixes and support. The universe + component includes thousands of pieces of software. Through + universe, users are able to have the diversity and + flexibility offered by the vast open source world on top of + a stable Ubuntu core. + + + + Non Free (Multiverse) - The + 'multiverse' component contains software + that is not free, which means the + licensing requirements of this software do not meet the + Ubuntu 'main' Component license Policy. + The onus is on you to verify your rights to use this + software and comply with the licensing terms of the + copyright holder. This software is not supported and usually + cannot be fixed or updated. Use it at your own risk. + + + + + + + + Creating Custom Software Sources + It is also possible to define custom software sources. + To define a custom software source click the + Custom button located on the Edit + Repository dialog. This will display a dialog in which + the custom repository can be defined using + apt command syntax. + Apt is an Advanced Packaging Tool and + front-end to dpkg the Debian Package + Management System. Once the apt line is entered + click the Add repository + button. + + + + + + + Creating Custom Software Sources + + + + The apt command syntax defines the + 'type,' 'location,' and + 'content' of the repository. Example of the command + syntax could look like this. + +deb ftp://archive.ubuntu.com/ubuntu/ hoary main restricted universe multiverse + + This example would define the software sources as a Debian source + at ubuntu.com containing the hoary release and using all components. + For definition of the components, see . + + + Removing Software Sources + Software sources can be removed from the sources list by selecting + the software source then clicking the + Remove button located on the + Software Preferences dialog. + Removal of a software source requires that the + apt file (/etc/apt/sources.list) that contains the a list of + software sources is updated. Before modifying this file + Update Manager prompts to confirm the + operation. If the operation is confirmed a backup copy is create in + /etc/apt/sources.list.save. + + + Editing Software Sources + To change the values defining a software source, select the source + record then click the edit button. This will display + the Edit Repository dialog. + + + + + + + Editing Software Sources + + + + + + + Type + + + Software sources may contain software in + 'Binary' or 'Source Code' + format. Select the option correlating to the repository + format. + + + + + URI + + + Enter a valid Uniform Resource Indicator + (URI). Following is a list of examples for + each of the possible access methods: + + + + + CD-ROM - + cdrom:[description_of_cd]/ + + + + + + + + FTP - + ftp://ftp.domain.ext/path/to/repository + + + + + HTTP - + http://www.domain.ext/path/to/repository + + + + + SMB - Works only when the computer is + already connected to an SMB share. To connect to SMB share + use the following command syntax from the shell + smbclient //hostname/sharename -U + username. + The SMB share is accessed from the local file system + once the local system is connected. + file://path/to/sharefile + + + + + NFS - Works only when the computer is + already connected to a NFS share. To connect the NFS share + must be mounted. NFS shares are mounted on the client side + using the mount command. The format of the command is as + follows: mount -o [options] [host]:[/remote/export] + [/local/directory] + + Once mounted Update Manager + can access the share using the following command + file://path/to/local/directory + + + + + If accessing a SMB or NFS shares by manually issuing the + mount commands, the file system must be + remounted manually after the system is rebooted. Failing to + remount will result in Update + Manager not being able to access the + resource. + + + + + + Distribution + + + The name of the distribution or name of the distribution + version. + + + + + Sections + + + The section of the distribution repository to access. + + + + + Comment + + + Add a comment to describe the repository. + + + + + Repositories defined using Synaptic, + another package management tool, are automatically displayed in the + Update Manager Software Sources + list. + + + + + Managing Authentication Keys + Authentication keys make it possible to verify the integrity of + update software. From the Authentication Keys + dialog it is possible to view and manage the list authentication keys. + Each key corresponds to a Software Source defined in the + Software Preference dialog (see ). Keys can be added and removed. In the + event of an error it is also possible to restore the default + authentication keys provided by the defined update repositories. + + + + + + + + Managing Authentication Keys + + + + + Adding Authentication Keys + Authentication keys are usually obtained from the software vendor + running the repository. Often the vendor will place a copy of the + authentication key on a key server, for example www.keyserver.net. The key + can then be retrieved using the command gpg + -recv-key. When the key resides on a key server the option + must be used to give the name of this + key server. + +gpg -recv-key --keyserver www.keyserver.net + + + If the key is fetched over a untrusted medium, like the + Internet, additional steps should be taken to verify the key. For + example, getting the fingerprint with a secure method such as by + phone, letter, or business card. Alternately you can check if the + key is signed with a known-good key. + + Once the key is downloaded, select it using the Choose + a key-file dialog that is displayed when the + Add button. + + + + + + + Adding Authentication Keys + + + + + + Removing Authentication Keys + Authentication keys can be removed by selecting a record item then + clicking the Remove + button. + + + Restoring Default Keys + During installation the default Ubuntu Authentication keys are + added to the Ubuntu GPG Keyring package. In + the even of a key being accidentally deleted it can be restored by + clicking the Restore default keys + button. + + + + Managing Settings + The Settings button, located on the + Software Preferences dialog, displays the + Settings dialog. From this interface you can + manage the behavior of the application and pre-update process. + + + + + + + Managing Settings + + + + The following options are available: + + User Interface + + + Show disabled software sources: - When checked + software sources that are not checked in the Software + Preferences dialog are displayed. When unchecked, + these items are not displayed in the list. + + + + Updates + + + + + + Automatically check for software updates: + - When checked the Update interval in + days option is enabled. Update + Manager will poll all enabled software sources + for updates according to the value specified in the + scroll-box. + + + + Download upgradable packages: - When + checked Update Manager will + automatically download any available software update packages. + It will not install them until the user has defined the + installation list (see ). + + + + + + + Temporary files + + + Automatically clean temporary packages files: - + When checked the Clean interval in days option + is enabled. Update Manager automatically + removes any temporary files created by the upgrade process according + to the value specified in the scroll-box. + + + Set maximum size of the package cache: When checked the size of + the package cache is limited to the value specified in the Maximum size in + MB spin-box. + + + Delete old packages in the package cache: When checked cached + packaged with a date older than the value specified in the Maximum age in + days spin-box will be automatically purged from the cache. + + + + + Install Progress for Terminal View Only + It is also possible to configure the installation progress to use + only a terminal view. That is to say, no progress bar is displayed, only + a terminal view. + + + + + + + Monitoring Installation Progress + + + + + Do not terminate the installation process. This may lead to + corruption of installed programs and general system + instability. + + Changing between 'Progress Bar' and + 'Terminal View,' modes is managed via + Synaptic. To change modes proceed as + follows: + + + Start Synaptic by selecting + System + Administration + Synaptic Package Manager + from the Desktop menu system. + + + When prompted, enter your password. + + + From the main menu, select + Settings + Preferences + . The Preferences dialog is + displayed. + + + From the General tab, Apply + Changes group, check or + uncheck the Apply changes in terminal + window checkbox. + + + + + + + Synaptic Preferences - General Tab + + + + + + + Click + OK and exit + Synaptic. + + + + + + About Update Manager + The Update Manager was written by Michiel + Sikkes michiel@eyeopened.nl and Michael Vogt + michael.vogt@ubuntu.com as an + apt update manager for the GNOME Desktop of the + Ubuntu distribution. The user manual was written by Sean Wheller + sean@inwords.co.za. + To report a bug or make a suggestion regarding this package or this + manual, send mail to ubuntu-users@lists.ubuntu.com. + &GFDL;
diff -Nru update-manager-17.10.11/hwe-support-status update-manager-0.156.14.15/hwe-support-status --- update-manager-17.10.11/hwe-support-status 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/hwe-support-status 2017-12-23 05:00:38.000000000 +0000 @@ -4,14 +4,12 @@ import optparse import datetime -import distro_info import os import re -import subprocess import sys import apt -from UpdateManager.Core.utils import twrap, get_dist +from UpdateManager.Core.utils import twrap # set locale early so that the subsequent imports have localized # strings @@ -28,68 +26,58 @@ from HweSupportStatus.consts import ( Messages, - LTS_EOL_DATE, - HWE_EOL_DATE, - NEXT_LTS_DOT1_DATE, + PRECISE_EOL_DATE, + PRECISE_HWE_EOL_DATE, + TRUSTY_DOT1_DATE, ) + - -# HWE stack with a short support period +# HWE backport names that are no longer supported HWE_UNSUPPORTED_BACKPORTS = ( - "-lts-utopic", - "-lts-vivid", - "-lts-wily" + "-lts-quantal", + "-lts-raring", + "-lts-saucy" ) # from https://wiki.ubuntu.com/Kernel/LTSEnablementStack -UNSUPPORTED_KERNEL_IMAGE_REGEX = \ - r'linux-image.*-(3\.16|3\.19|4\.2)(\.[0-9]+)?-.*' + # version 3.11.x 3.8.x and 3.5.x are unsupported in precise +UNSUPPORTED_KERNEL_IMAGE_REGEX = r'linux-.*-3\.(11|8|5)(\.[0-9]+)?-.*' -# HWE stack with a long support period -HWE_SUPPORTED_BACKPORT = "-lts-xenial" -SUPPORTED_KERNEL_IMAGE_REGEX = r'linux-image.*-4\.4(\.[0-9]+)?-.*' +# supported HWE stack +HWE_SUPPORTED_BACKPORT = "-lts-trusty" +SUPPORTED_KERNEL_IMAGE_REGEX = r'linux-.*-3\.13(\.[0-9]+)?-.*' KERNEL_METAPKGS = ( "linux-generic", "linux-image-generic", - "linux-signed-generic", - "linux-signed-image-generic", ) XORG_METAPKGS = ( "xserver-xorg", "libgl1-mesa-glx", - # LP: #1610434 - Ubuntu GNOME needed libwayland - "libwayland-egl1-mesa", -) -VBOX_METAPKGS = ( - "virtualbox-guest-utils", - "virtualbox-guest-source" ) -METAPKGS = KERNEL_METAPKGS + XORG_METAPKGS + VBOX_METAPKGS +METAPKGS = KERNEL_METAPKGS + XORG_METAPKGS class Package: """A lightweight apt package """ - def __init__(self, name, version, arch, foreign=False): + def __init__(self, name, version): self.name = name self.installed_version = version - self.arch = arch - self.foreign = foreign def find_hwe_packages(installed_packages): unsupported_hwe_packages = set() supported_hwe_packages = set() for pkg in installed_packages: - # metapackages and X are marked with the -lts-$distro string + # metapackages and X are marked with the -lts-distro string for name in HWE_UNSUPPORTED_BACKPORTS: if pkg.name.endswith(name): unsupported_hwe_packages.add(pkg) - # The individual backported kernels have names like + # The individual backported kernels have names like # linux-image-3.11.0-17-generic # so we match via a regexp. - # - # The linux-image-generic-lts-$distro metapkg has additional + # + # The linux-image-generic-lts-saucy metapkg has additional # dependencies (like linux-firmware) so we can't just walk the # dependency chain. if re.match(UNSUPPORTED_KERNEL_IMAGE_REGEX, pkg.name): @@ -119,7 +107,7 @@ def is_unsupported_xstack_running(unsupported_hwe_packages): # the HWE xstacks conflict with each other, so we can simply test - # for existence in the installed unsupported hwe packages + # for existance in the installed unsupported hwe packages for pkg in unsupported_hwe_packages: for xorg_meta in XORG_METAPKGS: if pkg.name.startswith(xorg_meta): @@ -127,22 +115,18 @@ return False -def find_supported_replacement_hwe_packages(unsupported_hwe_packages, - installed_packages): +def find_supported_replacement_hwe_packages(unsupported_hwe_packages): unsupported_metapkg_names = set() replacement_names = set() + unsupported_hwe_package_names = set( + [pkg.name for pkg in unsupported_hwe_packages]) for metapkg in METAPKGS: for unsupported_backport in HWE_UNSUPPORTED_BACKPORTS: metapkg_name = metapkg + unsupported_backport - for pkg in unsupported_hwe_packages: - if pkg.name == metapkg_name: - replacement_name = metapkg + HWE_SUPPORTED_BACKPORT - if (replacement_name, pkg.arch) not in \ - [(p.name, p.arch) for p in installed_packages]: - if pkg.foreign: - replacement_name += ':' + pkg.arch - replacement_names.add(replacement_name) - unsupported_metapkg_names.add(metapkg_name) + if metapkg_name in unsupported_hwe_package_names: + replacement_name = metapkg + HWE_SUPPORTED_BACKPORT + replacement_names.add(replacement_name) + unsupported_metapkg_names.add(metapkg_name) return unsupported_metapkg_names, replacement_names @@ -152,38 +136,30 @@ def advice_about_hwe_status(unsupported_hwe_packages, supported_hwe_packages, - installed_packages, has_update_manager, today, - verbose): + has_update_manager, verbose): unsupported_hwe_stack_running = is_unsupported_hwe_running( unsupported_hwe_packages) unsupported_hwe_metapkgs, supported_replacement_hwe = \ - find_supported_replacement_hwe_packages(unsupported_hwe_packages, - installed_packages) - # we need the "-p" option until the next LTS point release is available - if today < NEXT_LTS_DOT1_DATE: + find_supported_replacement_hwe_packages(unsupported_hwe_packages) + # we need the "-p" option until 14.04.1 is released on 2014-07-15 + if datetime.date.today() < TRUSTY_DOT1_DATE: do_release_upgrade_option = "-p" else: do_release_upgrade_option = "" if unsupported_hwe_stack_running: - if today < HWE_EOL_DATE: + if datetime.date.today() < PRECISE_HWE_EOL_DATE: s = Messages.HWE_SUPPORT_ENDS else: s = Messages.HWE_SUPPORT_HAS_ENDED if has_update_manager: print(s + Messages.UM_UPGRADE) else: - # bug #1341320 - if no metapkg is left we need to show - # what is no longer supported - if supported_replacement_hwe: - print(s + Messages.APT_UPGRADE % ( - do_release_upgrade_option, - " ".join(supported_replacement_hwe))) - else: - print(s + Messages.APT_SHOW_UNSUPPORTED % ( - " ".join([pkg.name for pkg in unsupported_hwe_packages]))) + print(s + Messages.APT_UPGRADE % ( + do_release_upgrade_option, + " ".join(supported_replacement_hwe))) - # some unsupported package installed but not running and not superseded + # some unsupported package installed but not running and not superseeded # - this is worth reporting elif (unsupported_hwe_packages and not supported_hwe_packages and @@ -191,40 +167,40 @@ s = _(""" You have packages from the Hardware Enablement Stack (HWE) installed that are going out of support on %s. - """) % HWE_EOL_DATE + """) % PRECISE_HWE_EOL_DATE if has_update_manager: print(s + Messages.UM_UPGRADE) else: print(s + Messages.APT_UPGRADE % ( do_release_upgrade_option, " ".join(supported_replacement_hwe))) + elif supported_hwe_packages: print(Messages.HWE_SUPPORTED) elif verbose: print( _("You are not running a system with a Hardware Enablement Stack. " "Your system is supported until %(month)s %(year)s.") % { - 'month': LTS_EOL_DATE.strftime("%B"), - 'year': LTS_EOL_DATE.year}) + 'month': PRECISE_EOL_DATE.strftime("%B"), + 'year': PRECISE_EOL_DATE.year}) if __name__ == "__main__": parser = optparse.OptionParser(description=_("Check HWE support status")) parser.add_option('--quiet', action='store_true', default=False, - help="No output, exit code 10 on unsupported HWE " - "packages") + help="No output, exit code 1 on unsupported HWE " + "packages") parser.add_option('--verbose', action='store_true', default=False, - help="more verbose output") + help="more verbose output") parser.add_option('--show-all-unsupported', action='store_true', - default=False, - help="Show unsupported HWE packages") + default=False, + help="Show unsupported HWE packages") parser.add_option('--show-replacements', action='store_true', default=False, - help="show what packages need installing to be " - "supported") + help='show what packages need installing to be supported') # hidden, only useful for testing parser.add_option( - '--disable-hwe-check-semaphore-file', + '--disable-hwe-check-semaphore-file', default="/var/lib/update-notifier/disable-hwe-eol-messages", help=optparse.SUPPRESS_HELP) options, args = parser.parse_args() @@ -233,17 +209,7 @@ nullfd = os.open(os.devnull, os.O_WRONLY) os.dup2(nullfd, sys.stdout.fileno()) - # Check to see if we are an LTS release - di = distro_info.UbuntuDistroInfo() - codename = get_dist() - lts = di.is_lts(codename) - if not lts: - if options.verbose: - print("Only LTS releases have Hardware Enablement stacks", - file=sys.stderr) - sys.exit(0) - - # request from PSE to be able to disable the hwe check via a special + # request from PSE to be able to disabled the hwe check via a special # semaphore file HWE_CHECK_DISABLED_FILE = options.disable_hwe_check_semaphore_file if os.path.exists(HWE_CHECK_DISABLED_FILE): @@ -252,47 +218,32 @@ HWE_CHECK_DISABLED_FILE, file=sys.stderr) sys.exit(0) - foreign_archs = set(subprocess.check_output( - ['dpkg', '--print-foreign-architectures'], - universal_newlines=True).split()) - # do the actual check installed_packages = set() - today = datetime.date.today() tagf = apt.apt_pkg.TagFile("/var/lib/dpkg/status") while tagf.step(): if tagf.section.find("Status", "") != "install ok installed": continue pkgname = tagf.section.find("Package") version = tagf.section.find("Version") - arch = tagf.section.find("Architecture") - foreign = arch in foreign_archs - installed_packages.add(Package(pkgname, version, arch, foreign)) + installed_packages.add(Package(pkgname, version)) - has_update_manager = "update-manager" in [ - pkg.name for pkg in installed_packages] + has_update_manager = "update-manager" in installed_packages unsupported_hwe_packages, supported_hwe_packages = find_hwe_packages( installed_packages) - if options.show_all_unsupported: - if today > HWE_EOL_DATE: - print(twrap(" ".join([ - pkg.foreign and pkg.name + ':' + pkg.arch or pkg.name - for pkg in unsupported_hwe_packages]))) - + print(twrap(" ".join(unsupported_hwe_packages))) if options.show_replacements: - unsupported, replacements = find_supported_replacement_hwe_packages( - unsupported_hwe_packages, installed_packages) - if replacements: - print(" ".join(replacements)) - + unsupported, replacements = find_supported_replacement_hwe_packages( + unsupported_hwe_packages) + print(" ".join(replacements)) + if not options.show_all_unsupported and not options.show_replacements: advice_about_hwe_status( - unsupported_hwe_packages, supported_hwe_packages, - installed_packages, has_update_manager, today, - options.verbose) - if is_unsupported_hwe_running(unsupported_hwe_packages) and \ - today > HWE_EOL_DATE: + unsupported_hwe_packages, supported_hwe_packages, + has_update_manager, options.verbose) + + if is_unsupported_hwe_running(unsupported_hwe_packages): sys.exit(10) sys.exit(0) diff -Nru update-manager-17.10.11/HweSupportStatus/consts.py update-manager-0.156.14.15/HweSupportStatus/consts.py --- update-manager-17.10.11/HweSupportStatus/consts.py 2017-08-07 19:24:17.000000000 +0000 +++ update-manager-0.156.14.15/HweSupportStatus/consts.py 2017-12-23 05:00:38.000000000 +0000 @@ -5,52 +5,44 @@ from gettext import gettext as _ -# the day on which the short support HWE stack goes EoL -HWE_EOL_DATE = datetime.date(2016, 8, 4) -# the day on which the next LTS first point release is available -# used to propose a release upgrade -NEXT_LTS_DOT1_DATE = datetime.date(2016, 7, 21) +# the day on which the PRECISE (12.04) HWE stack goes out of support +PRECISE_HWE_EOL_DATE = datetime.date(2014, 8, 7) -# end of the month in which this LTS goes EoL -LTS_EOL_DATE = datetime.date(2019, 4, 30) +# the date 14.04.1 is available +TRUSTY_DOT1_DATE = datetime.date(2014, 7, 16) + +# the month in wich PRECISE (12.04) goes out of support +PRECISE_EOL_DATE = datetime.date(2017, 4, 1) class Messages: UM_UPGRADE = _(""" -There is a graphics stack installed on this system. An upgrade to a -configuration supported for the full lifetime of the LTS will become -available on %(date)s and can be installed by running 'update-manager' -in the Dash. - """) % {'date': NEXT_LTS_DOT1_DATE.isoformat()} +There is a graphics stack installed on this system. An upgrade to a +supported (or longer supported) configuration will become available +on %(date)s and can be invoked by running 'update-manager' in the +Dash. + """) % {'date': TRUSTY_DOT1_DATE.strftime("%x"), + } APT_UPGRADE = _(""" -To upgrade to a supported (or longer-supported) configuration: +To upgrade to a supported (or longer supported) configuration: -* Upgrade from Ubuntu 14.04 LTS to Ubuntu 16.04 LTS by running: +* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running: sudo do-release-upgrade %s OR -* Switch to the current security-supported stack by running: +* Install a newer HWE version by running: sudo apt-get install %s and reboot your system.""") - # this message is shown if there is no clear upgrade path via a - # meta pkg that we recognize - APT_SHOW_UNSUPPORTED = _(""" -The following packages are no longer supported: - %s - -Please upgrade them to a supported HWE stack or remove them if you -no longer need them. -""") - HWE_SUPPORTED = _("Your Hardware Enablement Stack (HWE) is " "supported until %(month)s %(year)s.") % { - 'month': LTS_EOL_DATE.strftime("%B"), - 'year': LTS_EOL_DATE.year} + 'month': PRECISE_EOL_DATE.strftime("%B"), + 'year': PRECISE_EOL_DATE.year, + } HWE_SUPPORT_ENDS = _(""" Your current Hardware Enablement Stack (HWE) is going out of support @@ -58,11 +50,14 @@ and graphics stack) of your system will no longer be available. For more information, please see: -http://wiki.ubuntu.com/1404_HWE_EOL -""") % HWE_EOL_DATE.isoformat() +http://wiki.ubuntu.com/1204_HWE_EOL +""") % PRECISE_HWE_EOL_DATE.strftime("%x") HWE_SUPPORT_HAS_ENDED = _(""" -WARNING: Security updates for your current Hardware Enablement -Stack ended on %s: - * http://wiki.ubuntu.com/1404_HWE_EOL -""") % HWE_EOL_DATE.isoformat() +Your current Hardware Enablement Stack (HWE) is no longer supported +since %s. Security updates for critical parts (kernel +and graphics stack) of your system are no longer available. + +For more information, please see: +http://wiki.ubuntu.com/1204_HWE_EOL +""") % PRECISE_HWE_EOL_DATE.strftime("%x") diff -Nru update-manager-17.10.11/janitor/__init__.py update-manager-0.156.14.15/janitor/__init__.py --- update-manager-17.10.11/janitor/__init__.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/__init__.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -# Copyright (C) 2008-2012 Canonical, Ltd. -# -# The following license applies to all files (including the icons): -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - - -# This is a namespace package. -try: - import pkg_resources - pkg_resources.declare_namespace(__name__) -except ImportError: - import pkgutil - __path__ = pkgutil.extend_path(__path__, __name__) diff -Nru update-manager-17.10.11/janitor/plugincore/core/file_cruft.py update-manager-0.156.14.15/janitor/plugincore/core/file_cruft.py --- update-manager-17.10.11/janitor/plugincore/core/file_cruft.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/core/file_cruft.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -# Copyright (C) 2008-2012 Canonical, Ltd. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -import os - -from janitor.plugincore.cruft import Cruft -from janitor.plugincore.i18n import setup_gettext -_ = setup_gettext() - - -class FileCruft(Cruft): - """Cruft that is individual files. - - This type of cruft consists of individual files that should be removed. - Various plugins may decide that various files are cruft; they can all use - objects of FileCruft type to mark such files, regardless of the reason the - files are considered cruft. - """ - - def __init__(self, pathname, description): - self.pathname = pathname - self._disk_usage = os.stat(pathname).st_blocks * 512 - self._description = description - - def get_prefix(self): - return 'file' - - def get_prefix_description(self): - return _('A file on disk') - - def get_shortname(self): - return self.pathname - - def get_description(self): - return '{}\n'.format(self._description) - - def get_disk_usage(self): - return self._disk_usage - - def cleanup(self): - os.remove(self.pathname) diff -Nru update-manager-17.10.11/janitor/plugincore/core/missing_package_cruft.py update-manager-0.156.14.15/janitor/plugincore/core/missing_package_cruft.py --- update-manager-17.10.11/janitor/plugincore/core/missing_package_cruft.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/core/missing_package_cruft.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -# Copyright (C) 2009-2012 Canonical, Ltd. -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - -from __future__ import absolute_import, print_function, unicode_literals - -__metaclass__ = type -__all__ = [ - 'MissingPackageCruft', -] - - -from janitor.plugincore.cruft import Cruft -from janitor.plugincore.i18n import setup_gettext -_ = setup_gettext() - - -class MissingPackageCruft(Cruft): - """Install a missing package.""" - - def __init__(self, package, description=None): - self.package = package - self._description = description - - def get_prefix(self): - return 'install-deb' - - def get_prefix_description(self): - return _('Install missing package.') - - def get_shortname(self): - return self.package.name - - def get_description(self): - if self._description: - return self._description - else: - # 2012-06-08 BAW: i18n string; don't use {} or PEP 292. - return _('Package %s should be installed.') % self.package.name - - def cleanup(self): - self.package.markInstall() diff -Nru update-manager-17.10.11/janitor/plugincore/core/package_cruft.py update-manager-0.156.14.15/janitor/plugincore/core/package_cruft.py --- update-manager-17.10.11/janitor/plugincore/core/package_cruft.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/core/package_cruft.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,62 +0,0 @@ -# Copyright (C) 2008-2012 Canonical, Ltd. -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - -from __future__ import absolute_import, print_function, unicode_literals - -__metaclass__ = type -__all__ = [ - 'PackageCruft', -] - - -from janitor.plugincore.cruft import Cruft -from janitor.plugincore.i18n import setup_gettext -_ = setup_gettext() - - -class PackageCruft(Cruft): - """Cruft that is .deb packages. - - This type of cruft consists of .deb packages installed onto the system - which can be removed. Various plugins may decide that various packages - are cruft; they can all use objects of PackageCruft type to mark such - packages, regardless of the reason the packages are considered cruft. - - When PackageCruft instantiated, the package is identified by an - apt.Package object. That object is used for all the real operations, so - this class is merely a thin wrapper around it. - """ - - def __init__(self, pkg, description): - self._pkg = pkg - self._description = description - - def get_prefix(self): - return 'deb' - - def get_prefix_description(self): - return _('.deb package') - - def get_shortname(self): - return self._pkg.name - - def get_description(self): - return '{}\n\n{}'.format(self._description, self._pkg.summary) - - def get_disk_usage(self): - return self._pkg.installedSize - - def cleanup(self): - self._pkg.markDelete() diff -Nru update-manager-17.10.11/janitor/plugincore/cruft.py update-manager-0.156.14.15/janitor/plugincore/cruft.py --- update-manager-17.10.11/janitor/plugincore/cruft.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/cruft.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,158 +0,0 @@ -# Copyright (C) 2008-2012 Canonical, Ltd. -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - - -from __future__ import absolute_import, print_function, unicode_literals - -__metaclass__ = type -__all__ = [ - 'Cruft'] - - -from janitor.plugincore.i18n import setup_gettext -_ = setup_gettext() - - -from janitor.plugincore.exceptions import UnimplementedMethod - - -class Cruft: - """One piece of cruft to be cleaned out. - - A piece of cruft can be a file, a package, a configuration tweak that is - missing, or something else. - - This is a base class, which does nothing. Subclasses do the actual work, - though they must override the `get_shortname()` and `cleanup()` methods. - """ - - def get_prefix(self): - """Return the unique prefix used to group this type of cruft. - - For example, the .deb package called 'foo' would have a prefix - of 'deb'. This way, the package foo is not confused with the - file foo, or the username foo. - - Subclasses SHOULD define this. The default implementation - returns the name of the class, which is rarely useful to - the user. - """ - return self.__class__.__name__ - - @property - def prefix(self): - return self.get_prefix() - - def get_prefix_description(self): - """Return human-readable description of class of cruft.""" - return self.get_description() - - @property - def prefix_description(self): - return self.get_prefix_description() - - def get_shortname(self): - """Return the name of this piece of cruft. - - The name should be something that the user will understand. For - example, it might be the name of a package, or the full path to a - file. - - The name should be unique within the unique prefix returned by - `get_prefix()`. The prefix MUST NOT be included by this method, the - `get_name()` method does that instead. The intent is that - `get_shortname()` will be used by the user interface in contexts where - the prefix is shown separately from the short name, and `get_name()` - when a single string is used. - - Subclasses MUST define this. The default implementation raises an - exception. - """ - raise UnimplementedMethod(self.get_shortname) - - @property - def shortname(self): - return self.get_shortname() - - def get_name(self): - """Return prefix plus name. - - See `get_prefix()` and `get_shortname()` for a discussion of the - prefix and the short name. This method will return the prefix, a - colon, and the short name. - - The long name will used to store state/configuration data: _this_ - package should not be removed. - """ - return '{}:{}'.format(self.prefix, self.shortname) - - @property - def name(self): - return self.get_name() - - def __repr__(self): - return '<{} "{}">'.format(self.__class__.__name__, self.name) - - def get_description(self): - """Return a description of this piece of cruft. - - This may be arbitrarily long. The user interface will take care of - breaking it into lines or otherwise presenting it to the user in a - nice manner. The description should be plain text UTF-8 unicode. - - The default implementation returns the empty string. Subclasses MAY - override this as they wish. - """ - return '' - - @property - def description(self): - return self.get_description() - - def get_disk_usage(self): - """Return amount of disk space reserved by this piece of cruft. - - The unit is bytes. - - The disk space in question should be the amount that will be freed if - the cruft is cleaned up. The amount may be an estimate (i.e. a - guess). It is intended to be shown to the user to help them decide - what to remove and what to keep. - - This will also be used by the user interface to better estimate how - much remaining time there is when cleaning up a lot of cruft. - - For some types of cruft, this is not applicable and they should return - `None`. The base class implementation does that, so subclasses MUST - define this method if it is useful for them to return something else. - - The user interface will distinguish between None (not applicable) and - 0 (no disk space being used). - """ - return None - - @property - def disk_usage(self): - return self.get_disk_usage() - - def cleanup(self): - """Clean up this piece of cruft. - - Depending on the type of cruft, this may mean removing files, - packages, modifying configuration files, or something else. - - The default implementation raises an exception. Subclasses MUST - override this. - """ - raise UnimplementedMethod(self.cleanup) diff -Nru update-manager-17.10.11/janitor/plugincore/docs/README.rst update-manager-0.156.14.15/janitor/plugincore/docs/README.rst --- update-manager-17.10.11/janitor/plugincore/docs/README.rst 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/docs/README.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,201 +0,0 @@ -========================= -Computer Janitor plugins -========================= - -Computer Janitor supports a plugin architecture which allows you to add -additional ways of identifying and cleaning up *cruft*. Cruft is anything on -your system that is no longer necessary and can be safely removed. - -Identifying cruft is the primary purpose of plugins, and each plugin should -identify exactly one kind of cruft. - -The primary interface for this is the `get_cruft()` method on each plugin. -This method should return an iterator over cruft objects, which allows for the -UI to provide useful progress feedback. - - -Cruft -===== - -Cruft objects themselves must implement a specific interface, which is used to -provide information to the user, and to perform the actual clean up -operations. There is a useful base class that you can start with. - - >>> from janitor.plugincore.cruft import Cruft - -You can derive from this base class, but you must implement a couple of -methods, or your cruft class will not be usable. - - >>> cruft = Cruft() - >>> cruft.get_shortname() - Traceback (most recent call last): - ... - UnimplementedMethod: Unimplemented method: get_shortname - >>> cruft.cleanup() - Traceback (most recent call last): - ... - UnimplementedMethod: Unimplemented method: cleanup - -Here is a cruft subclass that is usable in a plugin. - - >>> class MyCruft(Cruft): - ... cruft_id = 1 - ... def __init__(self): - ... self.cleanup_count = 0 - ... self._prefix = 'MyCruft{:02d}'.format(MyCruft.cruft_id) - ... MyCruft.cruft_id += 1 - ... super(MyCruft, self).__init__() - ... def get_shortname(self): - ... return 'Example' - ... def get_prefix(self): - ... return self._prefix - ... def cleanup(self): - ... self.cleanup_count += 1 - -Not only do the above methods work, but you can also use a more modern -interface for getting information about the cruft. - - >>> mycruft = MyCruft() - >>> print(mycruft.shortname) - Example - >>> print(mycruft.prefix) - MyCruft01 - >>> print(mycruft.prefix_description) - - >>> print(mycruft.name) - MyCruft01:Example - >>> print(mycruft.description) - - >>> print(mycruft.disk_usage) - None - >>> mycruft.cleanup() - >>> mycruft.cleanup_count - 1 - -Cruft objects also have a reasonable repr. - - >>> mycruft - - - -Plugins -======= - -Computer Janitor plugins identify cruft. They use whatever algorithm -necessary to return iterators over cruft in their `get_cruft()` method. -Plugins must derived from the abstract base class, and must override certain -methods. - - >>> from janitor.plugincore.plugin import Plugin - >>> Plugin().get_cruft() - Traceback (most recent call last): - ... - UnimplementedMethod: Unimplemented method: cleanup - -By subclassing the base class, we can provide a way to find cruft. - - >>> class MyPlugin(Plugin): - ... def __init__(self): - ... self.post_cleanup_count = 0 - ... self._my_cruft = [MyCruft()] - ... super(MyPlugin, self).__init__() - ... def get_cruft(self): - ... for cruft in self._my_cruft: - ... yield cruft - ... def post_cleanup(self): - ... self.post_cleanup_count += 1 - -Now the plugin returns one piece of cruft. - - >>> plugin = MyPlugin() - >>> for cruft in plugin.cruft: - ... print(cruft) - - -Plugins are also the way to clean up all their cruft. - - >>> plugin.do_cleanup_cruft() - >>> for cruft in plugin.cruft: - ... print(cruft.name, 'clean ups:', cruft.cleanup_count) - MyCruft02:Example clean ups: 1 - -The plugin also gets a chance to perform post-cleanup operations. - - >>> plugin.post_cleanup_count - 1 - -For historical API reasons, plugins have conditions which are set to the empty -list by default. - - >>> plugin.condition - [] - -These conditions can be set. - - >>> plugin.condition = 'my condition' - >>> print(plugin.condition) - my condition - -Plugins also have optional applications, but by default there is no `app` -attribute (this is for historical API reasons). - - >>> print(plugin.app) - Traceback (most recent call last): - ... - AttributeError: app - -The `app` can be set through this historical API. - - >>> plugin.set_application('my application') - >>> print(plugin.app) - my application - - -Plugin manager -============== - -The plugin manager is used to find and load plugins. It searches a list of -directories for files that end in `_plugin.py`. -:: - - >>> from janitor.plugincore.testing.helpers import ( - ... setup_plugins, Application) - >>> plugin_dir, cleanup = setup_plugins('alpha_plugin.py') - >>> cleanups.append(cleanup) - >>> app = Application() - - >>> from janitor.plugincore.manager import PluginManager - >>> manager = PluginManager(app, [plugin_dir]) - >>> for filename in manager.plugin_files: - ... print('plugin file:', filename) - plugin file: .../alpha_plugin.py - -The plugin manager can import each plugin module found and instantiate all -`Plugin` base classes it finds. After each plugin is found, a callback is -called, which can be used to inform the user of progress. The arguments of -the callback are: - - * The plugin filename. - * This plugin number in the total list of plugins found, starting from 0 - * The total number of plugin files to be examined. - - >>> def callback(filename, i, total): - ... print('[{:02d}/{:02d}] {}'.format(i, total, filename)) - -The loaded plugins are cached, so the modules are only imported once. We'll -use the wildcard condition which matches all plugins. - - >>> plugins = manager.get_plugins(condition='*', callback=callback) - [00/01] .../alpha_plugin.py - >>> for plugin in plugins: - ... print(plugin) - - -However, plugins can have conditions and we can use these conditions to get -back a different set of plugins from the manager. - - >>> plugins[0].condition = 'happy' - >>> len(manager.get_plugins(condition='sad')) - 0 - >>> len(manager.get_plugins(condition='happy')) - 1 diff -Nru update-manager-17.10.11/janitor/plugincore/exceptions.py update-manager-0.156.14.15/janitor/plugincore/exceptions.py --- update-manager-17.10.11/janitor/plugincore/exceptions.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/exceptions.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -# Copyright (C) 2008-2012 Canonical, Ltd. -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - - -from __future__ import absolute_import, print_function, unicode_literals - -__metaclass__ = type -__all__ = [ - 'ComputerJanitorException', - 'UnimplementedMethod', -] - - -from janitor.plugincore.i18n import setup_gettext -_ = setup_gettext() - - -class ComputerJanitorException(Exception): - """Base class for all Computer Janitor exceptions.""" - - -class UnimplementedMethod(ComputerJanitorException, NotImplementedError): - """A method expected by the Computer Janitor API is unimplemented.""" - - def __init__(self, method): - self._method = method - - def __str__(self): - # Why do we use %s here instead of $strings or {} format placeholders? - # It's because we don't want to break existing translations. - return _('Unimplemented method: %s') % self._method.__name__ diff -Nru update-manager-17.10.11/janitor/plugincore/i18n.py update-manager-0.156.14.15/janitor/plugincore/i18n.py --- update-manager-17.10.11/janitor/plugincore/i18n.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/i18n.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -# Copyright (C) 2008-2012 Canonical, Ltd. -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - -"""Set up the gettext context.""" - - -import os -import gettext - - -def setup_gettext(): - """Set up gettext for a module.""" - domain = 'update-manager' - localedir = os.environ.get('LOCPATH', None) - t = gettext.translation(domain, localedir=localedir, fallback=True) - try: - # We must receive unicodes from the catalog. Python 2 by default - # returns 8-bit strings from the .gettext() method, so use the unicode - # variant. If this doesn't exist, we're in Python 3 and there, - # .gettext does the right thing. - return t.ugettext - except AttributeError: - return t.gettext diff -Nru update-manager-17.10.11/janitor/plugincore/__init__.py update-manager-0.156.14.15/janitor/plugincore/__init__.py --- update-manager-17.10.11/janitor/plugincore/__init__.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/__init__.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -# Copyright (C) 2008-2012 Canonical, Ltd. -# -# The following license applies to all files (including the icons): -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - -__version__ = '1.0' diff -Nru update-manager-17.10.11/janitor/plugincore/manager.py update-manager-0.156.14.15/janitor/plugincore/manager.py --- update-manager-17.10.11/janitor/plugincore/manager.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/manager.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,186 +0,0 @@ -# Copyright (C) 2008-2012 Canonical, Ltd. -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - - -from __future__ import absolute_import, print_function, unicode_literals - -__metaclass__ = type -__all__ = [ - 'PluginManager', -] - - -import os -import imp -import sys -import errno -import inspect -import logging - -from janitor.plugincore.plugin import Plugin - - -SPACE = ' ' -STR_TYPES = (basestring if str is bytes else str) - - -class PluginManager: - """Find and load plugins. - - Plugins are stored in files named '*_plugin.py' in the list of directories - given to the constructor. - """ - - def __init__(self, app, plugin_dirs): - self._app = app - # Make a copy to immune ourselves from mutability. For safety, double - # check a common mistake. - if isinstance(plugin_dirs, STR_TYPES): - raise TypeError( - 'Expected sequence, got {}'.format(type(plugin_dirs))) - self._plugin_dirs = list(plugin_dirs) - self._plugins = None - - def get_plugin_files(self): - """Return all filenames in which plugins may be stored.""" - - for dirname in self._plugin_dirs: - try: - basenames = [filename for filename in os.listdir(dirname) - if filename.endswith('_plugin.py')] - except OSError as error: - if error.errno != errno.ENOENT: - raise - logging.debug('No such plugin directory: {}'.format(dirname)) - continue - logging.debug( - 'Plugin modules in {}: {}'.format( - dirname, SPACE.join(basenames))) - # Sort the base names alphabetically for predictability. - for filename in sorted(basenames): - yield os.path.join(dirname, filename) - - @property - def plugin_files(self): - for filename in self.get_plugin_files(): - yield filename - - def _find_plugins(self, module): - """Find and instantiate all plugins in a module.""" - def is_plugin(target): - # Don't return the base class itself. - return (inspect.isclass(target) and - issubclass(target, Plugin) and - target is not Plugin) - plugin_classes = [ - member - for name, member in inspect.getmembers(module, is_plugin) - ] - logging.debug('Plugins in {}: {}'.format( - module, SPACE.join(str(plugin) for plugin in plugin_classes))) - for plugin_class in plugin_classes: - yield plugin_class() - - def _load_module(self, filename): - """Load a module from a filename.""" - logging.debug('Loading module from file {}'.format(filename)) - # 2012-06-08 BAW: I don't particularly like putting an entry in - # sys.modules with the basename of the file. Note that - # imp.load_module() will reload the plugin if it's already been - # imported, so check sys.modules first and don't reload the plugin - # (this is a change in behavior from older versions, but a valid one I - # think - reloading modules is problematic). Ideally, we'd be using - # __import__() but we can't guarantee that the path to the filename is - # on sys.path, so we'll just live with this as the most backward - # compatible implementation. - # - # The other problem is that the module could be encoded, but this - # mechanism doesn't support PEP 263 style source file encoding - # specifications. To make matters worse, we can't use codecs.open() - # with encoding='UTF-8' because imp.load_module() requires an actual - # file object, not whatever codecs wrapper is used. If we were Python - # 3 only, we could use the built-in open(), but since we have to also - # support Python 3, we just have to live with the platform dependent - # default text encoding of built-in open(). - module_name, ignore = os.path.splitext(os.path.basename(filename)) - if module_name in sys.modules: - return sys.modules[module_name] - with open(filename, 'r') as fp: - try: - module = imp.load_module( - module_name, fp, filename, - ('.py', 'r', imp.PY_SOURCE)) - except Exception as error: - logging.warning("Failed to load plugin '{}' ({})".format( - module_name, error)) - return None - else: - return module - - def get_plugins(self, condition=None, callback=None): - """Return all plugins that have been found. - - Loaded plugins are cached, so they will only be loaded once. - - `condition` is matched against each plugin to determine whether it - will be returned or not. A `condition` of the string '*' matches all - plugins. The default condition matches all default plugins, since by - default, plugins have a condition of the empty list. - - If `condition` matches the plugin's condition exactly, the plugin is - returned. The plugin's condition can also be a sequence, and if - `condition` is in that sequence, the plugin is returned. - - Note that even though loaded plugins are cached, calling - `get_plugin()` with different a `condition` can return a different set - of plugins. - - If `callback` is specified, it is called after each plugin has - been found, with the following arguments: filename, index of - filename in list of files to be examined (starting with 0), and - total number of files to be examined. The purpose of this is to - allow the callback to inform the user in case things take a long - time. - """ - # By default, plugins have a condition of the empty list, so unless a - # plugin has an explicit condition set, this will match everything. - if condition is None: - condition = [] - # Only load the plugins once, however when different conditions are - # given, a different set of the already loaded plugins may be - # returned. - if self._plugins is None: - self._plugins = [] - filenames = list(self.plugin_files) - total = len(filenames) - for i, filename in enumerate(filenames): - if callback is not None: - callback(filename, i, total) - module = self._load_module(filename) - for plugin in self._find_plugins(module): - plugin.set_application(self._app) - self._plugins.append(plugin) - # Now match each of the plugins against the specified condition, - # returning only those that match, or all of them if there is no - # condition. - plugins = [ - plugin for plugin in self._plugins - if (plugin.condition == condition or - condition in plugin.condition or - condition == '*') - ] - logging.debug("plugins for condition '{}' are '{}'".format( - condition, plugins)) - return plugins diff -Nru update-manager-17.10.11/janitor/plugincore/NEWS.rst update-manager-0.156.14.15/janitor/plugincore/NEWS.rst --- update-manager-17.10.11/janitor/plugincore/NEWS.rst 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/NEWS.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -============================ -NEWS for janitor.plugincore -============================ - -1.0 (2012-XX-XX) -================ - * Initial release since refactoring into a separate package. diff -Nru update-manager-17.10.11/janitor/plugincore/plugin.py update-manager-0.156.14.15/janitor/plugincore/plugin.py --- update-manager-17.10.11/janitor/plugincore/plugin.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/plugin.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,82 +0,0 @@ -# Copyright (C) 2008-2012 Canonical, Ltd. -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - - -from __future__ import absolute_import, print_function, unicode_literals - -__metaclass__ = type -__all__ = [ - 'Plugin', -] - - -from janitor.plugincore.exceptions import UnimplementedMethod - - -class Plugin: - """Base class for plugins. - - These plugins only do one thing: identify cruft. See the 'get_cruft' - method for details. - """ - - # XXX BAW 2012-06-08: For historical reasons, we do not set - # self._condition or self.app in a constructor. This needs to be fixed. - - @property - def condition(self): - return (self._condition if hasattr(self, '_condition') else []) - - @condition.setter - def condition(self, condition): - self._condition = condition - - def set_application(self, app): - """Set the Application instance this plugin belongs to.""" - self.app = app - - def do_cleanup_cruft(self): - """Find cruft and clean it up. - - This is a helper method. - """ - for cruft in self.get_cruft(): - cruft.cleanup() - self.post_cleanup() - - def get_cruft(self): - """Find some cruft in the system. - - This method MUST return an iterator (see 'yield' statement). - This interface design allows cruft to be collected piecemeal, - which makes it easier to show progress in the user interface. - - The base class default implementation of this raises an - exception. Subclasses MUST override this method. - """ - raise UnimplementedMethod(self.get_cruft) - - @property - def cruft(self): - for cruft in self.get_cruft(): - yield cruft - - def post_cleanup(self): - """Do plugin-wide cleanup after the individual cleanup was performed. - - This is useful for stuff that needs to be processed in batches - (e.g. for performance reasons) like package removal. - """ - pass diff -Nru update-manager-17.10.11/janitor/plugincore/plugins/deb_plugin.py update-manager-0.156.14.15/janitor/plugincore/plugins/deb_plugin.py --- update-manager-17.10.11/janitor/plugincore/plugins/deb_plugin.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/plugins/deb_plugin.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -# Copyright (C) 2008-2012 Canonical, Ltd. -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - -from __future__ import absolute_import, print_function, unicode_literals - -__metaclass__ = type -__all__ = [ - 'DebPlugin', -] - - -import apt - -from janitor.plugincore.plugin import Plugin - - -class DebPlugin(Plugin): - """Plugin for post-cleanup processing with apt. - - This plugin does not find any cruft of its own. Instead it centralizes - the post-cleanup handling for all packages that remove .deb packages. - """ - def get_cruft(self): - return [] - - def post_cleanup(self): - try: - self.app.apt_cache.commit(apt.progress.text.AcquireProgress(), - apt.progress.base.InstallProgress()) - finally: - self.app.refresh_apt_cache() diff -Nru update-manager-17.10.11/janitor/plugincore/plugins/dpkg_status_plugin.py update-manager-0.156.14.15/janitor/plugincore/plugins/dpkg_status_plugin.py --- update-manager-17.10.11/janitor/plugincore/plugins/dpkg_status_plugin.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/plugins/dpkg_status_plugin.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -# Copyright (C) 2009-2012 Canonical, Ltd. -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - -from __future__ import absolute_import, print_function, unicode_literals - -__metaclass__ = type -__all__ = [ - 'DpkgStatusCruft', - 'DpkgStatusPlugin', -] - - -import logging -import subprocess - -from apt_pkg import TagFile - -from janitor.plugincore.cruft import Cruft -from janitor.plugincore.i18n import setup_gettext -from janitor.plugincore.plugin import Plugin - -_ = setup_gettext() - - -class DpkgStatusCruft(Cruft): - def __init__(self, n_items): - self.n_items = n_items - - def get_prefix(self): - return 'dpkg-status' - - def get_prefix_description(self): - return _('%i obsolete entries in the status file') % self.n_items - - def get_shortname(self): - return _('Obsolete entries in dpkg status') - - def get_description(self): # pragma: no cover - return _('Obsolete dpkg status entries') - - def cleanup(self): - logging.debug('calling dpkg --forget-old-unavail') - res = subprocess.call('dpkg --forget-old-unavail'.split()) - logging.debug('dpkg --forget-old-unavail returned {}'.format(res)) - - -class DpkgStatusPlugin(Plugin): - def __init__(self, filename=None): - self.status = ('/var/lib/dpkg/status' - if filename is None - else filename) - self.condition = ['PostCleanup'] - - def get_cruft(self): - n_cruft = 0 - with open(self.status) as fp: - tagf = TagFile(fp) - while tagf.step(): - statusline = tagf.section.get('Status') - (want, flag, status) = statusline.split() - if (want == 'purge' and - flag == 'ok' and - status == 'not-installed'): - # Then... - n_cruft += 1 - logging.debug('DpkgStatusPlugin found {} cruft items'.format(n_cruft)) - if n_cruft: - return [DpkgStatusCruft(n_cruft)] - return [] diff -Nru update-manager-17.10.11/janitor/plugincore/plugins/kdelibs4to5_plugin.py update-manager-0.156.14.15/janitor/plugincore/plugins/kdelibs4to5_plugin.py --- update-manager-17.10.11/janitor/plugincore/plugins/kdelibs4to5_plugin.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/plugins/kdelibs4to5_plugin.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -# Copyright (C) 2009-2012 Canonical, Ltd. -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - -"""Install kdelibs5-dev if kdeblibs4-dev is installed.""" - -from __future__ import absolute_import, print_function, unicode_literals - -__metaclass__ = type -__all__ = [ - 'Kdelibs4devToKdelibs5devPlugin', -] - - -from janitor.plugincore.core.missing_package_cruft import MissingPackageCruft -from janitor.plugincore.i18n import setup_gettext -from janitor.plugincore.plugin import Plugin - -_ = setup_gettext() - - -class Kdelibs4devToKdelibs5devPlugin(Plugin): - """Plugin to install kdelibs5-dev if kdelibs4-dev is installed. - - See also LP: #279621. - """ - - def __init__(self): - self.condition = ['from_hardyPostDistUpgradeCache'] - - def get_cruft(self): - fromp = 'kdelibs4-dev' - top = 'kdelibs5-dev' - cache = self.app.apt_cache - if (fromp in cache and cache[fromp].is_installed and - top in cache and not cache[top].is_installed): - yield MissingPackageCruft( - cache[top], - _('When upgrading, if kdelibs4-dev is installed, ' - 'kdelibs5-dev needs to be installed. See ' - 'bugs.launchpad.net, bug #279621 for details.')) diff -Nru update-manager-17.10.11/janitor/plugincore/plugins/langpack_manual_plugin.py update-manager-0.156.14.15/janitor/plugincore/plugins/langpack_manual_plugin.py --- update-manager-17.10.11/janitor/plugincore/plugins/langpack_manual_plugin.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/plugins/langpack_manual_plugin.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -# Copyright (C) 2009-2012 Canonical, Ltd. -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - -"""Mark langpacks to be manually installed.""" - -from __future__ import absolute_import, print_function, unicode_literals - -__metaclass__ = type -__all__ = [ - 'ManualInstallCruft', - 'MarkLangpacksManuallyInstalledPlugin', -] - - -import logging - -from janitor.plugincore.cruft import Cruft -from janitor.plugincore.i18n import setup_gettext -from janitor.plugincore.plugin import Plugin - -_ = setup_gettext() - - -class ManualInstallCruft(Cruft): - def __init__(self, pkg): - self.pkg = pkg - - def get_prefix(self): - return 'mark-manually-installed' - - def get_shortname(self): - return self.pkg.name - - def get_description(self): - return (_('%s needs to be marked as manually installed.') % - self.pkg.name) - - def cleanup(self): - self.pkg.markKeep() - self.pkg.markInstall() - - -class MarkLangpacksManuallyInstalledPlugin(Plugin): - """Plugin to mark language packs as manually installed. - - This works around quirks in the hardy->intrepid upgrade. - """ - - def __init__(self): - self.condition = ['from_hardyPostDistUpgradeCache'] - - def get_cruft(self): - # language-support-* changed its dependencies from "recommends" to - # "suggests" for language-pack-* - this means that apt will think they - # are now auto-removalable if they got installed as a dep of - # language-support-* - we fix this here - cache = self.app.apt_cache - for pkg in cache: - if (pkg.name.startswith('language-pack-') and - not pkg.name.endswith('-base') and - cache._depcache.IsAutoInstalled(pkg._pkg) and - pkg.is_installed): - # Then... - logging.debug("setting '%s' to manual installed" % pkg.name) - yield ManualInstallCruft(pkg) diff -Nru update-manager-17.10.11/janitor/plugincore/plugins/remove_lilo_plugin.py update-manager-0.156.14.15/janitor/plugincore/plugins/remove_lilo_plugin.py --- update-manager-17.10.11/janitor/plugincore/plugins/remove_lilo_plugin.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/plugins/remove_lilo_plugin.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -# Copyright (C) 2009 Canonical, Ltd. -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - -"""Remove lilo if grub is also installed.""" - -from __future__ import absolute_import, print_function, unicode_literals - -__metaclass__ = type -__all__ = [ - 'RemoveLiloPlugin', -] - - -import os -import logging - -from janitor.plugincore.i18n import setup_gettext -from janitor.plugincore.core.package_cruft import PackageCruft -from janitor.plugincore.plugin import Plugin - -_ = setup_gettext() - - -class RemoveLiloPlugin(Plugin): - """Plugin to remove lilo if grub is also installed.""" - - def __init__(self): - self.condition = ['jauntyPostDistUpgradeCache'] - - def get_description(self): - return _('Remove lilo since grub is also installed.' - '(See bug #314004 for details.)') - - def get_cruft(self): - if 'lilo' in self.app.apt_cache and 'grub' in self.app.apt_cache: - lilo = self.app.apt_cache['lilo'] - grub = self.app.apt_cache['grub'] - if lilo.is_installed and grub.is_installed: - if not os.path.exists('/etc/lilo.conf'): - yield PackageCruft(lilo, self.description) - else: - logging.warning('lilo and grub installed, but ' - 'lilo.conf exists') diff -Nru update-manager-17.10.11/janitor/plugincore/testing/helpers.py update-manager-0.156.14.15/janitor/plugincore/testing/helpers.py --- update-manager-17.10.11/janitor/plugincore/testing/helpers.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/testing/helpers.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -# Copyright (C) 2008-2012 Canonical, Ltd. -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - -from __future__ import absolute_import, print_function, unicode_literals - - -__metaclass__ = type -__all__ = [ - 'Application', - 'MockAptPackage', - 'setup_plugins', -] - - -import os -import shutil -import tempfile -import pkg_resources - - -def setup_plugins(*plugin_filenames): - plugin_dir = tempfile.mkdtemp() - for filename in plugin_filenames: - src = pkg_resources.resource_filename( - 'janitor.plugincore.tests.data', filename) - dst = os.path.join(plugin_dir, filename) - shutil.copyfile(src, dst) - return (plugin_dir, lambda: shutil.rmtree(plugin_dir)) - - -class Application: - def __init__(self): - self.notifications = [] - self.commit_called = False - self.refresh_called = False - self.apt_cache = self - - def commit(self, foo, bar): - self.commit_called = True - - def refresh_apt_cache(self): - self.refresh_called = True - - -class MockAptPackage: - def __init__(self): - self.name = 'name' - self.summary = 'summary' - self.installedSize = 12765 - self.installed = False - self.deleted = False - - def markInstall(self): - self.installed = True - - def markDelete(self): - self.deleted = True diff -Nru update-manager-17.10.11/janitor/plugincore/tests/data/alpha_plugin.py update-manager-0.156.14.15/janitor/plugincore/tests/data/alpha_plugin.py --- update-manager-17.10.11/janitor/plugincore/tests/data/alpha_plugin.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/tests/data/alpha_plugin.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -# Copyright (C) 2008-2012 Canonical, Ltd. -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - -"""A test plugin.""" - -from __future__ import absolute_import, print_function, unicode_literals - -__metaclass__ = type -__all__ = [ - 'AlphaCruft', - 'AlphaPlugin', -] - -from janitor.plugincore.cruft import Cruft -from janitor.plugincore.plugin import Plugin - - -class AlphaCruft(Cruft): - def __init__(self, app): - self.app = app - - def get_shortname(self): - return 'Alpha' - - def cleanup(self): - # Tell the app we're cleaning up this cruft. - self.app.notifications.append((self, 'cruft')) - - -class AlphaPlugin(Plugin): - def get_cruft(self): - yield AlphaCruft(self.app) - - def post_cleanup(self): - self.app.notifications.append((self, 'post')) diff -Nru update-manager-17.10.11/janitor/plugincore/tests/data/bravo_plugin.py update-manager-0.156.14.15/janitor/plugincore/tests/data/bravo_plugin.py --- update-manager-17.10.11/janitor/plugincore/tests/data/bravo_plugin.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/tests/data/bravo_plugin.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -# Copyright (C) 2008-2012 Canonical, Ltd. -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - -"""A test plugin.""" - - -from __future__ import absolute_import, print_function, unicode_literals - -__metaclass__ = type -__all__ = [ - 'BravoCruft', - 'BravoPlugin', -] - -from janitor.plugincore.cruft import Cruft -from janitor.plugincore.plugin import Plugin - - -class BravoCruft(Cruft): - def __init__(self, app): - self.app = app - - def get_shortname(self): - return 'Bravo' - - def cleanup(self): - # Tell the app we're cleaning up this cruft. - self.app.notifications.append((self, 'cruft')) - - -class BravoPlugin(Plugin): - def get_cruft(self): - yield BravoCruft(self.app) - - def post_cleanup(self): - self.app.notifications.append((self, 'post')) diff -Nru update-manager-17.10.11/janitor/plugincore/tests/data/charlie_plugin.py update-manager-0.156.14.15/janitor/plugincore/tests/data/charlie_plugin.py --- update-manager-17.10.11/janitor/plugincore/tests/data/charlie_plugin.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/tests/data/charlie_plugin.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -# Copyright (C) 2008-2012 Canonical, Ltd. -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - -"""A test plugin.""" - -from __future__ import absolute_import, print_function, unicode_literals - -__metaclass__ = type -__all__ = [ - 'CharlieCruft', - 'CharliePlugin', -] - -from janitor.plugincore.cruft import Cruft -from janitor.plugincore.plugin import Plugin - - -class CharlieCruft(Cruft): - def __init__(self, app): - self.app = app - - def get_shortname(self): - return 'Charlie' - - def cleanup(self): - # Tell the app we're cleaning up this cruft. - self.app.notifications.append((self, 'cruft')) - - -class CharliePlugin(Plugin): - def get_cruft(self): - yield CharlieCruft(self.app) - - def post_cleanup(self): - self.app.notifications.append((self, 'post')) diff -Nru update-manager-17.10.11/janitor/plugincore/tests/test_deb_plugin.py update-manager-0.156.14.15/janitor/plugincore/tests/test_deb_plugin.py --- update-manager-17.10.11/janitor/plugincore/tests/test_deb_plugin.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/tests/test_deb_plugin.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -# Copyright (C) 2008-2012 Canonical, Ltd. -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - -from __future__ import absolute_import, print_function, unicode_literals - -__metaclass__ = type -__all__ = [ - 'DebPluginTests', -] - - -import unittest - -from janitor.plugincore.plugins.deb_plugin import DebPlugin -from janitor.plugincore.testing.helpers import Application - - -class DebPluginTests(unittest.TestCase): - def setUp(self): - self.plugin = DebPlugin() - self.app = Application() - self.plugin.set_application(self.app) - - def test_no_cruft(self): - self.assertEqual(self.plugin.get_cruft(), []) - - def test_post_cleanup_calls_commit(self): - self.plugin.post_cleanup() - self.assertTrue(self.app.commit_called) - - def test_post_cleanup_calls_refresh(self): - self.plugin.post_cleanup() - self.assertTrue(self.app.refresh_called) diff -Nru update-manager-17.10.11/janitor/plugincore/tests/test_documentation.py update-manager-0.156.14.15/janitor/plugincore/tests/test_documentation.py --- update-manager-17.10.11/janitor/plugincore/tests/test_documentation.py 2017-08-07 19:44:31.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/tests/test_documentation.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -# Copyright (C) 2008-2012 Canonical, Ltd. -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - - -"""Test harness for doctests.""" - -from __future__ import absolute_import, print_function, unicode_literals - -__metaclass__ = type -__all__ = [ - 'additional_tests', -] - -import os -import atexit -import doctest -import unittest - -from pkg_resources import ( - resource_filename, resource_exists, resource_listdir, cleanup_resources) - -COMMASPACE = ', ' -DOT = '.' -DOCTEST_FLAGS = ( - doctest.ELLIPSIS | - doctest.NORMALIZE_WHITESPACE | - doctest.REPORT_NDIFF | - doctest.IGNORE_EXCEPTION_DETAIL) - - -WHOAMI = 'janitor.plugincore' - - -def stop(): - """Call into pdb.set_trace()""" - # Do the import here so that you get the wacky special hacked pdb instead - # of Python's normal pdb. - import pdb - pdb.set_trace() - - -def setup(testobj): - """Test setup.""" - # Make sure future statements in our doctests match the Python code. - try: - testobj.globs['absolute_import'] = absolute_import - testobj.globs['print_function'] = print_function - testobj.globs['unicode_literals'] = unicode_literals - except NameError: - pass - testobj.globs['stop'] = stop - testobj.globs['cleanups'] = [] - - -def teardown(testobj): - for cleanup in testobj.globs['cleanups']: - cleanup() - - -def additional_tests(): - "Run the doc tests (README.rst and docs/*, if any exist)" - doctest_files = [ - # os.path.abspath(resource_filename(WHOAMI, 'README.rst')), - ] - if resource_exists(WHOAMI, 'docs'): - for name in resource_listdir(WHOAMI, 'docs'): - if name.endswith('.rst'): - doctest_files.append( - os.path.abspath( - resource_filename(WHOAMI, 'docs/%s' % name))) - kwargs = dict(module_relative=False, - optionflags=DOCTEST_FLAGS, - setUp=setup, tearDown=teardown, - ) - atexit.register(cleanup_resources) - return unittest.TestSuite(( - doctest.DocFileSuite(*doctest_files, **kwargs))) diff -Nru update-manager-17.10.11/janitor/plugincore/tests/test_dpkg_status_plugin.py update-manager-0.156.14.15/janitor/plugincore/tests/test_dpkg_status_plugin.py --- update-manager-17.10.11/janitor/plugincore/tests/test_dpkg_status_plugin.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/tests/test_dpkg_status_plugin.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -# Copyright (C) 2009-2012 Canonical, Ltd. -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - -from __future__ import absolute_import, print_function, unicode_literals - -__metaclass__ = type -__all__ = [ - 'AutoRemovalPluginTests', -] - - -import os -import tempfile -import unittest - -from janitor.plugincore.plugins.dpkg_status_plugin import DpkgStatusPlugin - - -class AutoRemovalPluginTests(unittest.TestCase): - def setUp(self): - fd, self.filename = tempfile.mkstemp() - self.addCleanup(lambda: os.remove(self.filename)) - try: - os.write(fd, b'Status: purge ok not-installed\n') - finally: - os.close(fd) - self.plugin = DpkgStatusPlugin(self.filename) - - def test_dpkg_status(self): - names = [cruft.get_name() for cruft in self.plugin.get_cruft()] - self.assertEqual( - sorted(names), - ['dpkg-status:Obsolete entries in dpkg status'] - ) diff -Nru update-manager-17.10.11/janitor/plugincore/tests/test_file_cruft.py update-manager-0.156.14.15/janitor/plugincore/tests/test_file_cruft.py --- update-manager-17.10.11/janitor/plugincore/tests/test_file_cruft.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/tests/test_file_cruft.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ -# Copyright (C) 2008-2012 Canonical, Ltd. -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - -from __future__ import absolute_import, print_function, unicode_literals - -__metaclass__ = type -__all__ = [ - 'FileCruftTests', -] - -import os -import errno -import tempfile -import unittest -import subprocess - -from janitor.plugincore.core.file_cruft import FileCruft - - -class FileCruftTests(unittest.TestCase): - def setUp(self): - fd, self.pathname = tempfile.mkstemp() - - def cleanup(): - try: - os.remove(self.pathname) - except OSError as error: - if error.errno != errno.ENOENT: - raise - - self.addCleanup(cleanup) - try: - os.write(fd, b'x' * 1024) - finally: - os.close(fd) - self.cruft = FileCruft(self.pathname, 'description') - - def test_refix(self): - self.assertEqual(self.cruft.get_prefix(), 'file') - self.assertEqual(self.cruft.prefix, 'file') - - def test_prefix_description(self): - self.assertEqual(self.cruft.get_prefix_description(), 'A file on disk') - self.assertEqual(self.cruft.prefix_description, 'A file on disk') - - def test_shortname(self): - self.assertEqual(self.cruft.get_shortname(), self.pathname) - self.assertEqual(self.cruft.shortname, self.pathname) - - def test_name(self): - expected = 'file:{}'.format(self.pathname) - self.assertEqual(self.cruft.get_name(), expected) - self.assertEqual(self.cruft.name, expected) - - def test_description(self): - self.assertEqual(self.cruft.get_description(), 'description\n') - self.assertEqual(self.cruft.description, 'description\n') - - def test_disk_usage(self): - stdout = subprocess.check_output( - ('du -s -B 1 {}'.format(self.pathname)).split(), - # Decode output as UTF-8 and convert line endings to \n - universal_newlines=True) - du = int(stdout.splitlines()[0].split('\t')[0]) - self.assertEqual(self.cruft.get_disk_usage(), du) - self.assertEqual(self.cruft.disk_usage, du) - - def test_cleanup(self): - self.assertTrue(os.path.exists(self.pathname)) - self.cruft.cleanup() - self.assertFalse(os.path.exists(self.pathname)) diff -Nru update-manager-17.10.11/janitor/plugincore/tests/test_manager.py update-manager-0.156.14.15/janitor/plugincore/tests/test_manager.py --- update-manager-17.10.11/janitor/plugincore/tests/test_manager.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/tests/test_manager.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,175 +0,0 @@ -# Copyright (C) 2008-2012 Canonical, Ltd. -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - -from __future__ import absolute_import, print_function, unicode_literals - -__metaclass__ = type -__all__ = [ - 'ManagerTests', -] - -import os -import sys -import unittest - -from janitor.plugincore.manager import PluginManager -from janitor.plugincore.plugin import Plugin -from janitor.plugincore.testing.helpers import setup_plugins, Application - - -class ManagerTests(unittest.TestCase): - """Test of the plugin manager.""" - - def setUp(self): - self._app = Application() - self._sys_path = sys.path[:] - - def tearDown(self): - # The tests which actually load plugins pollutes sys.path, so save and - # restore it around tests. - sys.path = self._sys_path - - def test_missing_plugindir_is_ignored(self): - plugin_dir, cleanup = setup_plugins() - self.addCleanup(cleanup) - missing_dir = os.path.join(plugin_dir, 'does', 'not', 'exist') - manager = PluginManager(self._app, [missing_dir]) - # Even though the manager is pointing to a missing plugins dir, - # getting all the plugin files will not crash, it will just return an - # empty sequence. - self.assertEqual(list(manager.plugin_files), []) - - def test_finds_no_plugins_in_empty_directory(self): - plugin_dir, cleanup = setup_plugins() - self.addCleanup(cleanup) - manager = PluginManager(self._app, [plugin_dir]) - self.assertEqual(len(manager.get_plugins()), 0) - - def test_finds_one_plugin_file(self): - plugin_dir, cleanup = setup_plugins('alpha_plugin.py') - self.addCleanup(cleanup) - manager = PluginManager(self._app, [plugin_dir]) - self.assertEqual(list(manager.plugin_files), - [os.path.join(plugin_dir, 'alpha_plugin.py')]) - - def test_finds_one_plugin(self): - plugin_dir, cleanup = setup_plugins('alpha_plugin.py') - self.addCleanup(cleanup) - manager = PluginManager(self._app, [plugin_dir]) - plugins = list(manager.get_plugins()) - self.assertEqual(len(plugins), 1) - self.assertTrue(isinstance(plugins[0], Plugin)) - - def test_plugin_loading_sets_application(self): - plugin_dir, cleanup = setup_plugins('alpha_plugin.py') - self.addCleanup(cleanup) - manager = PluginManager(self._app, [plugin_dir]) - plugins = list(manager.get_plugins()) - self.assertEqual(plugins[0].app, self._app) - - def test_plugin_loading_callback(self): - callback_calls = [] - - def callback(filename, i, total): - callback_calls.append((os.path.basename(filename), i, total)) - - plugin_dir, cleanup = setup_plugins('alpha_plugin.py') - manager = PluginManager(self._app, [plugin_dir]) - manager.get_plugins(callback=callback) - self.assertEqual(callback_calls, [('alpha_plugin.py', 0, 1)]) - - def test_plugin_loading_callback_with_multiple_plugins(self): - callback_calls = [] - - def callback(filename, i, total): - callback_calls.append((os.path.basename(filename), i, total)) - - plugin_dir, cleanup = setup_plugins( - 'alpha_plugin.py', 'bravo_plugin.py') - manager = PluginManager(self._app, [plugin_dir]) - manager.get_plugins(callback=callback) - self.assertEqual(callback_calls, [ - ('alpha_plugin.py', 0, 2), - ('bravo_plugin.py', 1, 2), - ]) - - def test_condition_equality(self): - # The first part of the conditions test looks for exactly equality - # between the condition argument and the plugin's condition - # attribute. - plugin_dir, cleanup = setup_plugins( - 'alpha_plugin.py', 'bravo_plugin.py') - manager = PluginManager(self._app, [plugin_dir]) - # Start by getting all the plugins. - all_plugins = manager.get_plugins() - # Set some conditions on the plugins. - all_plugins[0].condition = 'alpha' - all_plugins[1].condition = 'bravo' - self.assertEqual(manager.get_plugins(condition='zero'), []) - self.assertEqual(manager.get_plugins(condition='alpha'), - [all_plugins[0]]) - self.assertEqual(manager.get_plugins(condition='bravo'), - [all_plugins[1]]) - - def test_condition_in(self): - # The second part of the conditions test checks for the given - # condition being in the sequence of conditions in the plugin. This - # is kind of crappy because let's say a plugin's condition is - # 'happy_days' and you pass in condition='happy', you'll get a match. - # Oh well, it's been this way forever. - plugin_dir, cleanup = setup_plugins( - 'alpha_plugin.py', 'bravo_plugin.py') - manager = PluginManager(self._app, [plugin_dir]) - # Start by getting all the plugins. - all_plugins = manager.get_plugins() - # Set some conditions on the plugins. - all_plugins[0].condition = ['alpha', 'happy'] - all_plugins[1].condition = ['bravo', 'happy', 'sad'] - self.assertEqual(manager.get_plugins(condition='zero'), []) - self.assertEqual(manager.get_plugins(condition='alpha'), - [all_plugins[0]]) - self.assertEqual(manager.get_plugins(condition='bravo'), - [all_plugins[1]]) - self.assertEqual(manager.get_plugins(condition='happy'), all_plugins) - self.assertEqual(manager.get_plugins(condition='sad'), - [all_plugins[1]]) - - def test_condition_wildcard(self): - # The third conditions test matches everything. - plugin_dir, cleanup = setup_plugins( - 'alpha_plugin.py', 'bravo_plugin.py', 'charlie_plugin.py') - manager = PluginManager(self._app, [plugin_dir]) - # Start by getting all the plugins. - all_plugins = manager.get_plugins() - self.assertEqual(len(all_plugins), 3) - # Set some conditions on the plugins. - all_plugins[0].condition = ['alpha', 'happy'] - all_plugins[1].condition = ['bravo', 'happy', 'sad'] - # Do not give the third plugin an explicit condition. - self.assertEqual(manager.get_plugins(condition='*'), all_plugins) - - def test_condition_default_matches_conditionless(self): - # By default, only conditionless plugins match the manager default. - plugin_dir, cleanup = setup_plugins( - 'alpha_plugin.py', 'bravo_plugin.py', 'charlie_plugin.py') - manager = PluginManager(self._app, [plugin_dir]) - # Start by getting all the plugins. - all_plugins = manager.get_plugins() - self.assertEqual(len(all_plugins), 3) - # Set some conditions on the plugins. - all_plugins[0].condition = ['alpha', 'happy'] - all_plugins[1].condition = ['bravo', 'happy', 'sad'] - # Do not give the third plugin an explicit condition. - self.assertEqual(manager.get_plugins(), [all_plugins[2]]) diff -Nru update-manager-17.10.11/janitor/plugincore/tests/test_missing_package_cruft.py update-manager-0.156.14.15/janitor/plugincore/tests/test_missing_package_cruft.py --- update-manager-17.10.11/janitor/plugincore/tests/test_missing_package_cruft.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/tests/test_missing_package_cruft.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -# Copyright (C) 2008-2012 Canonical, Ltd. -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - - -from __future__ import absolute_import, print_function, unicode_literals - -__metaclass__ = type -__all__ = [ - 'MissingPackageCruftTests', -] - - -import unittest - -from janitor.plugincore.core.missing_package_cruft import MissingPackageCruft -from janitor.plugincore.testing.helpers import MockAptPackage - - -class MissingPackageCruftTests(unittest.TestCase): - def setUp(self): - self.pkg = MockAptPackage() - self.cruft = MissingPackageCruft(self.pkg) - - def test_prefix(self): - self.assertEqual(self.cruft.get_prefix(), 'install-deb') - self.assertEqual(self.cruft.prefix, 'install-deb') - - def test_prefix_description(self): - self.assertTrue('Install' in self.cruft.get_prefix_description()) - self.assertTrue('Install' in self.cruft.prefix_description) - - def test_shortname(self): - self.assertEqual(self.cruft.get_shortname(), 'name') - self.assertEqual(self.cruft.shortname, 'name') - - def test_name(self): - self.assertEqual(self.cruft.get_name(), 'install-deb:name') - self.assertEqual(self.cruft.name, 'install-deb:name') - - def test_description(self): - self.assertTrue('name' in self.cruft.get_description()) - self.assertTrue('name' in self.cruft.description) - - def test_explicit_description(self): - pkg = MissingPackageCruft(self.pkg, 'foo') - self.assertEqual(pkg.get_description(), 'foo') - self.assertEqual(pkg.description, 'foo') - - def test_cleanup(self): - self.cruft.cleanup() - self.assertTrue(self.pkg.installed) diff -Nru update-manager-17.10.11/janitor/plugincore/tests/test_package_cruft.py update-manager-0.156.14.15/janitor/plugincore/tests/test_package_cruft.py --- update-manager-17.10.11/janitor/plugincore/tests/test_package_cruft.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/janitor/plugincore/tests/test_package_cruft.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -# Copyright (C) 2008-2012 Canonical, Ltd. -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, version 3 of the License. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program. If not, see . - -from __future__ import absolute_import, print_function, unicode_literals - -__metaclass__ = type -__all__ = [ - 'PackageCruftTests', -] - -import unittest - -from janitor.plugincore.core.package_cruft import PackageCruft -from janitor.plugincore.testing.helpers import MockAptPackage - - -class PackageCruftTests(unittest.TestCase): - def setUp(self): - self.pkg = MockAptPackage() - self.cruft = PackageCruft(self.pkg, 'description') - - def test_prefix(self): - self.assertEqual(self.cruft.get_prefix(), 'deb') - self.assertEqual(self.cruft.prefix, 'deb') - - def test_prefix_description(self): - self.assertEqual(self.cruft.get_prefix_description(), '.deb package') - self.assertEqual(self.cruft.prefix_description, '.deb package') - - def test_shortname(self): - self.assertEqual(self.cruft.get_shortname(), 'name') - self.assertEqual(self.cruft.shortname, 'name') - - def test_name(self): - self.assertEqual(self.cruft.get_name(), 'deb:name') - self.assertEqual(self.cruft.name, 'deb:name') - - def test_description(self): - self.assertEqual(self.cruft.get_description(), - 'description\n\nsummary') - self.assertEqual(self.cruft.description, 'description\n\nsummary') - - def test_disk_usage(self): - self.assertEqual(self.cruft.get_disk_usage(), 12765) - self.assertEqual(self.cruft.disk_usage, 12765) - - def test_cleanup(self): - self.cruft.cleanup() - self.assertTrue(self.pkg.deleted) diff -Nru update-manager-17.10.11/Janitor/computerjanitor/cruft.py update-manager-0.156.14.15/Janitor/computerjanitor/cruft.py --- update-manager-17.10.11/Janitor/computerjanitor/cruft.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/Janitor/computerjanitor/cruft.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,138 @@ +# cruft.py - base class for different kinds of cruft +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import computerjanitor + + +class Cruft(object): + + """One piece of cruft to be cleaned out. + + A piece of cruft can be a file, a package, a configuration tweak + that is missing, or something else. + + This is a base class, which does nothing. Subclasses do the + actual work. + + """ + + def get_prefix(self): + """Return the unique prefix used to group this type of cruft. + + For example, the .deb package called 'foo' would have a prefix + of 'deb'. This way, the package foo is not confused with the + file foo, or the username foo. + + Subclasses SHOULD define this. The default implementation + returns the name of the class, which is rarely useful to + the user. + + """ + + return self.__class__.__name__ + + def get_prefix_description(self): + """Return human-readable description of class of cruft.""" + return self.get_description() + + def get_shortname(self): + """Return the name of this piece of cruft. + + The name should be something that the user will understand. + For example, it might be the name of a package, or the full + path to a file. + + The name should be unique within the unique prefix returned + by get_prefix. The prefix MUST NOT be included by this method, + the get_name() method does that instead. The intent is that + get_shortname() will be used by the user interface in contexts + where the prefix is shown separately from the short name, + and get_name() when a single string is used. + + Subclasses MUST define this. The default implementation + raises an exception. + + """ + + raise computerjanitor.UnimplementedMethod(self.get_shortname) + + def get_name(self): + """Return prefix plus name. + + See get_prefix() and get_shortname() for a discussion of + the prefix and the short name. This method will return + the prefix, a colon, and the short name. + + The long name will used to store state/configuration data: + _this_ package should not be removed. + + """ + + return "%s:%s" % (self.get_prefix(), self.get_shortname()) + + def get_description(self): + """Return a description of this piece of cruft. + + This may be arbitrarily long. The user interface will take + care of breaking it into lines or otherwise presenting it to + the user in a nice manner. The description should be plain + text, in UTF-8. + + The default implementation returns the empty string. Subclasses + MAY override this as they wish. + + """ + + return "" + + def get_disk_usage(self): + """Return amount of disk space reserved by this piece of cruft. + + The unit is bytes. + + The disk space in question should be the amount that will be + freed if the cruft is cleaned up. The amount may be an estimate + (read: guess). It is intended to be shown to the user to help + them decide what to remove and what to keep. + + This will also be used by the user interface to better + estimate how much remaining time there is when cleaning + up a lot of cruft. + + For some types of cruft, this is not applicable and they should + return None. The base class implementation does that, so + subclasses MUST define this method if it is useful for them to + return something else. + + The user interface will distinguish between None (not + applicable) and 0 (no disk space being used). + + """ + + return None + + def cleanup(self): + """Clean up this piece of cruft. + + Depending on the type of cruft, this may mean removing files, + packages, modifying configuration files, or something else. + + The default implementation raises an exception. Subclasses + MUST override this. + + """ + + raise computerjanitor.UnimplementedMethod(self.cleanup) diff -Nru update-manager-17.10.11/Janitor/computerjanitor/cruft_tests.py update-manager-0.156.14.15/Janitor/computerjanitor/cruft_tests.py --- update-manager-17.10.11/Janitor/computerjanitor/cruft_tests.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/Janitor/computerjanitor/cruft_tests.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,56 @@ +# cruft_tests.py - unit tests for cruft.py +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import unittest + +import computerjanitor + + +class CruftTests(unittest.TestCase): + + def setUp(self): + self.cruft = computerjanitor.Cruft() + + def testReturnsClassNameAsDefaultPrefix(self): + class Mockup(computerjanitor.Cruft): + pass + self.assertEqual(Mockup().get_prefix(), "Mockup") + + def testReturnsEmptyStringAsDefaultPrefixDescription(self): + self.assertEqual(self.cruft.get_prefix_description(), "") + + def testReturnsDescriptionAsDefaultPrefixDescription(self): + self.cruft.get_description = lambda: "foo" + self.assertEqual(self.cruft.get_prefix_description(), "foo") + + def testRaisesErrorForDefaultGetShortname(self): + self.assertRaises(computerjanitor.UnimplementedMethod, + self.cruft.get_shortname) + + def testReturnsCorrectStringForFullName(self): + self.cruft.get_prefix = lambda *args: "foo" + self.cruft.get_shortname = lambda *args: "bar" + self.assertEqual(self.cruft.get_name(), "foo:bar") + + def testReturnsEmptyStringAsDefaultDescription(self): + self.assertEqual(self.cruft.get_description(), "") + + def testReturnsNoneForDiskUsage(self): + self.assertEqual(self.cruft.get_disk_usage(), None) + + def testRaisesErrorForDefaultCleanup(self): + self.assertRaises(computerjanitor.UnimplementedMethod, + self.cruft.cleanup) diff -Nru update-manager-17.10.11/Janitor/computerjanitor/exc.py update-manager-0.156.14.15/Janitor/computerjanitor/exc.py --- update-manager-17.10.11/Janitor/computerjanitor/exc.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/Janitor/computerjanitor/exc.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,30 @@ +# exc.py - exceptions for computerjanitor +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import computerjanitor +_ = computerjanitor.setup_gettext() + + +class ComputerJanitorException(Exception): + + def __str__(self): + return self._str + + +class UnimplementedMethod(ComputerJanitorException): + + def __init__(self, method): + self._str = _("Unimplemented method: %s") % str(method) diff -Nru update-manager-17.10.11/Janitor/computerjanitor/exc_tests.py update-manager-0.156.14.15/Janitor/computerjanitor/exc_tests.py --- update-manager-17.10.11/Janitor/computerjanitor/exc_tests.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/Janitor/computerjanitor/exc_tests.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,34 @@ +# exc_tests.py - unit tests for exc.py +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import unittest + +import computerjanitor + + +class ComputerJanitorExceptionTests(unittest.TestCase): + + def testReturnsStrCorrectly(self): + e = computerjanitor.Exception() + e._str = "pink" + self.assertEqual(str(e), "pink") + + +class UnimplementedMethodTests(unittest.TestCase): + + def testErrorMessageContainsMethodName(self): + e = computerjanitor.UnimplementedMethod(self.__init__) + self.assert_("__init__" in str(e)) \ No newline at end of file diff -Nru update-manager-17.10.11/Janitor/computerjanitor/file_cruft.py update-manager-0.156.14.15/Janitor/computerjanitor/file_cruft.py --- update-manager-17.10.11/Janitor/computerjanitor/file_cruft.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/Janitor/computerjanitor/file_cruft.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,58 @@ +# file_cruft.py - implementation of file cruft +# Copyright (C) 2008, 2009 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import os + +import computerjanitor +_ = computerjanitor.setup_gettext() + + +class FileCruft(computerjanitor.Cruft): + + """Cruft that is individual files. + + This type of cruft consists of individual files that should be + removed. Various plugins may decide that various files are cruft; + they can all use objects of FileCruft type to mark such files, + regardless of the reason the files are considered cruft. + + When FileCruft instantiated, the file is identified by a pathname. + + """ + + def __init__(self, pathname, description): + self.pathname = pathname + st = os.stat(pathname) + self.disk_usage = st.st_blocks * 512 + self.description = description + + def get_prefix(self): + return "file" + + def get_prefix_description(self): + return _("A file on disk") + + def get_shortname(self): + return self.pathname + + def get_description(self): + return "%s\n" % self.description + + def get_disk_usage(self): + return self.disk_usage + + def cleanup(self): + os.remove(self.pathname) diff -Nru update-manager-17.10.11/Janitor/computerjanitor/file_cruft_tests.py update-manager-0.156.14.15/Janitor/computerjanitor/file_cruft_tests.py --- update-manager-17.10.11/Janitor/computerjanitor/file_cruft_tests.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/Janitor/computerjanitor/file_cruft_tests.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,63 @@ +# file_cruft_tests.py - unit tests for file_cruft.py +# Copyright (C) 2008, 2009 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import os +import subprocess +import tempfile + +import unittest + +import computerjanitor + + +class FileCruftTests(unittest.TestCase): + + def setUp(self): + fd, self.pathname = tempfile.mkstemp() + os.write(fd, "x" * 1024) + os.close(fd) + self.cruft = computerjanitor.FileCruft(self.pathname, "description") + + def tearDown(self): + if False and os.path.exists(self.pathname): + os.remove(self.pathname) + + def testReturnsCorrectPrefix(self): + self.assertEqual(self.cruft.get_prefix(), "file") + + def testReturnsCorrectPrefixDescription(self): + self.assertEqual(self.cruft.get_prefix_description(), "A file on disk") + + def testReturnsCorrectShortname(self): + self.assertEqual(self.cruft.get_shortname(), self.pathname) + + def testReturnsCorrectName(self): + self.assertEqual(self.cruft.get_name(), "file:%s" % self.pathname) + + def testReturnsCorrectDescription(self): + self.assertEqual(self.cruft.get_description(), "description\n") + + def testReturnsCorrectDiskUsage(self): + p = subprocess.Popen(["du", "-s", "-B", "1", self.pathname], + stdout=subprocess.PIPE) + stdout, stderr = p.communicate() + du = int(stdout.splitlines()[0].split("\t")[0]) + self.assertEqual(self.cruft.get_disk_usage(), du) + + def testDeletesPackage(self): + self.assert_(os.path.exists(self.pathname)) + self.cruft.cleanup() + self.assertFalse(os.path.exists(self.pathname)) diff -Nru update-manager-17.10.11/Janitor/computerjanitor/__init__.py update-manager-0.156.14.15/Janitor/computerjanitor/__init__.py --- update-manager-17.10.11/Janitor/computerjanitor/__init__.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/Janitor/computerjanitor/__init__.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,60 @@ +# __init__.py for computerjanitor +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +VERSION = "1.11" + + +# Set up gettext. This needs to be before the import statements below +# so that if any modules call it right after importing, they find +# setup_gettext. + +def setup_gettext(): + """Set up gettext for a module. + + Return a method to be used for looking up translations. Usage: + + import computerjanitor + _ = computerjanitor.setup_gettext() + + """ + + import gettext + import os + + domain = 'update-manager' + localedir = os.environ.get('LOCPATH', None) + t = gettext.translation(domain, localedir=localedir, fallback=True) + return t.ugettext + + +from cruft import Cruft +from file_cruft import FileCruft +from package_cruft import PackageCruft +from missing_package_cruft import MissingPackageCruft +from exc import ComputerJanitorException as Exception, UnimplementedMethod +from plugin import Plugin, PluginManager + +# reference it here to make pyflakes happy +Cruft +FileCruft +PackageCruft +Exception +UnimplementedMethod +MissingPackageCruft +Plugin +PluginManager + + diff -Nru update-manager-17.10.11/Janitor/computerjanitor/missing_package_cruft.py update-manager-0.156.14.15/Janitor/computerjanitor/missing_package_cruft.py --- update-manager-17.10.11/Janitor/computerjanitor/missing_package_cruft.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/Janitor/computerjanitor/missing_package_cruft.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,45 @@ +# missing_package_cruft.py - install a missing package +# Copyright (C) 2009 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import computerjanitor +_ = computerjanitor.setup_gettext() + + +class MissingPackageCruft(computerjanitor.Cruft): + + """Install a missing package.""" + + def __init__(self, package, description=None): + self.package = package + self.description = description + + def get_prefix(self): + return "install-deb" + + def get_prefix_description(self): + return _("Install missing package.") + + def get_shortname(self): + return self.package.name + + def get_description(self): + if self.description: + return self.description + else: + return _("Package %s should be installed.") % self.package.name + + def cleanup(self): + self.package.markInstall() diff -Nru update-manager-17.10.11/Janitor/computerjanitor/missing_package_cruft_tests.py update-manager-0.156.14.15/Janitor/computerjanitor/missing_package_cruft_tests.py --- update-manager-17.10.11/Janitor/computerjanitor/missing_package_cruft_tests.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/Janitor/computerjanitor/missing_package_cruft_tests.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,61 @@ +# missing_package_cruft_tests.py - unit tests for missing_package_cruft.py +# Copyright (C) 2008, 2009 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import unittest + +import computerjanitor + + +class MockAptPackage(object): + + def __init__(self): + self.name = "name" + self.summary = "summary" + self.installedSize = 12765 + self.installed = False + + def markInstall(self): + self.installed = True + + +class MissingPackageCruftTests(unittest.TestCase): + + def setUp(self): + self.pkg = MockAptPackage() + self.cruft = computerjanitor.MissingPackageCruft(self.pkg) + + def testReturnsCorrectPrefix(self): + self.assertEqual(self.cruft.get_prefix(), "install-deb") + + def testReturnsCorrectPrefixDescription(self): + self.assert_("Install" in self.cruft.get_prefix_description()) + + def testReturnsCorrectShortname(self): + self.assertEqual(self.cruft.get_shortname(), "name") + + def testReturnsCorrectName(self): + self.assertEqual(self.cruft.get_name(), "install-deb:name") + + def testReturnsCorrectDescription(self): + self.assert_("name" in self.cruft.get_description()) + + def testSetsDescriptionWhenAsked(self): + pkg = computerjanitor.MissingPackageCruft(self.pkg, "foo") + self.assertEqual(pkg.get_description(), "foo") + + def testInstallsPackage(self): + self.cruft.cleanup() + self.assert_(self.pkg.installed) diff -Nru update-manager-17.10.11/Janitor/computerjanitor/package_cruft.py update-manager-0.156.14.15/Janitor/computerjanitor/package_cruft.py --- update-manager-17.10.11/Janitor/computerjanitor/package_cruft.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/Janitor/computerjanitor/package_cruft.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,57 @@ +# package_cruft.py - implementation for the package craft +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import computerjanitor +_ = computerjanitor.setup_gettext() + + +class PackageCruft(computerjanitor.Cruft): + + """Cruft that is .deb packages. + + This type of cruft consists of .deb packages installed onto the + system which can be removed. Various plugins may decide that + various packages are cruft; they can all use objects of PackageCruft + type to mark such packages, regardless of the reason the packages + are considered cruft. + + When PackageCruft instantiated, the package is identified by an + apt.Package object. That object is used for all the real operations, + so this class is merely a thin wrapper around it. + + """ + + def __init__(self, pkg, description): + self._pkg = pkg + self._description = description + + def get_prefix(self): + return "deb" + + def get_prefix_description(self): + return _(".deb package") + + def get_shortname(self): + return self._pkg.name + + def get_description(self): + return u"%s\n\n%s" % (self._description, self._pkg.summary) + + def get_disk_usage(self): + return self._pkg.installedSize + + def cleanup(self): + self._pkg.markDelete() diff -Nru update-manager-17.10.11/Janitor/computerjanitor/package_cruft_tests.py update-manager-0.156.14.15/Janitor/computerjanitor/package_cruft_tests.py --- update-manager-17.10.11/Janitor/computerjanitor/package_cruft_tests.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/Janitor/computerjanitor/package_cruft_tests.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,61 @@ +# package_cruft_tests.py - unit tests for package_cruft.py +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import unittest + +import computerjanitor + + +class MockAptPackage(object): + + def __init__(self): + self.name = "name" + self.summary = "summary" + self.installedSize = 12765 + self.deleted = False + + def markDelete(self): + self.deleted = True + + +class PackageCruftTests(unittest.TestCase): + + def setUp(self): + self.pkg = MockAptPackage() + self.cruft = computerjanitor.PackageCruft(self.pkg, "description") + + def testReturnsCorrectPrefix(self): + self.assertEqual(self.cruft.get_prefix(), "deb") + + def testReturnsCorrectPrefixDescription(self): + self.assertEqual(self.cruft.get_prefix_description(), ".deb package") + + def testReturnsCorrectShortname(self): + self.assertEqual(self.cruft.get_shortname(), "name") + + def testReturnsCorrectName(self): + self.assertEqual(self.cruft.get_name(), "deb:name") + + def testReturnsCorrectDescription(self): + self.assertEqual(self.cruft.get_description(), + "description\n\nsummary") + + def testReturnsCorrectDiskUsage(self): + self.assertEqual(self.cruft.get_disk_usage(), 12765) + + def testDeletesPackage(self): + self.cruft.cleanup() + self.assert_(self.pkg.deleted) diff -Nru update-manager-17.10.11/Janitor/computerjanitor/plugin.py update-manager-0.156.14.15/Janitor/computerjanitor/plugin.py --- update-manager-17.10.11/Janitor/computerjanitor/plugin.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/Janitor/computerjanitor/plugin.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,184 @@ +# plugin.py - plugin base class for computerjanitor +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import imp +import inspect +import logging +import os + +import computerjanitor +_ = computerjanitor.setup_gettext() + +class Plugin(object): + + """Base class for plugins. + + These plugins only do one thing: identify cruft. See the 'get_cruft' + method for details. + + """ + + def get_condition(self): + if hasattr(self, "_condition"): + return self._condition + else: + return [] + + def set_condition(self, condition): + self._condition = condition + + condition = property(get_condition, set_condition) + + def set_application(self, app): + """Set the Application instance this plugin belongs to. + + This is used by the plugin manager when creating the plugin + instance. In a perfect world, this would be done via the + __init__ method, but since I took a wrong left turn, I ended + up in an imperfect world, and therefore giving the Application + instance to __init__ would mandate that all sub-classes would + have to deal with that explicitly. That is a lot of unnecessary + make-work, which we should avoid. Therefore, we do it via this + method. + + The class may access the Application instance via the + 'app' attribute. + + """ + + self.app = app + + def do_cleanup_cruft(self): # pragma: no cover + """Find cruft and clean it up. + + This is a helper method. + """ + + for cruft in self.get_cruft(): + cruft.cleanup() + self.post_cleanup() + + def get_cruft(self): + """Find some cruft in the system. + + This method MUST return an iterator (see 'yield' statement). + This interface design allows cruft to be collected piecemeal, + which makes it easier to show progress in the user interface. + + The base class default implementation of this raises an + exception. Subclasses MUST override this method. + + """ + + raise computerjanitor.UnimplementedMethod(self.get_cruft) + + def post_cleanup(self): + """Does plugin wide cleanup after the individual cleanup + was performed. + + This is useful for stuff that needs to be proccessed + in batches (e.g. for performance reasons) like package + removal. + """ + pass + + +class PluginManager(object): + + """Class to find and load plugins. + + Plugins are stored in files named '*_plugin.py' in the list of + directories given to the initializer. + + """ + + def __init__(self, app, plugin_dirs): + self._app = app + self._plugin_dirs = plugin_dirs + self._plugins = None + + def get_plugin_files(self): + """Return all filenames in which plugins may be stored.""" + + names = [] + + + for dirname in self._plugin_dirs: + if not os.path.exists(dirname): + continue + basenames = [x for x in os.listdir(dirname) + if x.endswith("_plugin.py")] + logging.debug("Plugin modules in %s: %s" % + (dirname, " ".join(basenames))) + names += [os.path.join(dirname, x) for x in basenames] + + return names + + def _find_plugins(self, module): + """Find and instantiate all plugins in a module.""" + plugins = [] + for dummy, member in inspect.getmembers(module): + if inspect.isclass(member) and issubclass(member, Plugin): + plugins.append(member) + logging.debug("Plugins in %s: %s" % + (module, " ".join(str(x) for x in plugins))) + return [plugin() for plugin in plugins] + + def _load_module(self, filename): + """Load a module from a filename.""" + logging.debug("Loading module %s" % filename) + module_name, dummy = os.path.splitext(os.path.basename(filename)) + f = file(filename, "r") + try: + module = imp.load_module(module_name, f, filename, + (".py", "r", imp.PY_SOURCE)) + except Exception, e: # pragma: no cover + logging.warning("Failed to load plugin '%s' (%s)" % + (module_name, e)) + return None + f.close() + return module + + def get_plugins(self, condition=[], callback=None): + """Return all plugins that have been found. + + If callback is specified, it is called after each plugin has + been found, with the following arguments: filename, index of + filename in list of files to be examined (starting with 0), and + total number of files to be examined. The purpose of this is to + allow the callback to inform the user in case things take a long + time. + + """ + + if self._plugins is None: + self._plugins = [] + filenames = self.get_plugin_files() + for i in range(len(filenames)): + if callback: + callback(filenames[i], i, len(filenames)) + module = self._load_module(filenames[i]) + for plugin in self._find_plugins(module): + plugin.set_application(self._app) + self._plugins.append(plugin) + # get the matching plugins + plugins = [p for p in self._plugins + if (p.condition == condition) or + (condition in p.condition) or + (condition == "*") ] + logging.debug("plugins for condition '%s' are '%s'" % + (condition, plugins)) + return plugins diff -Nru update-manager-17.10.11/Janitor/computerjanitor/plugin_tests.py update-manager-0.156.14.15/Janitor/computerjanitor/plugin_tests.py --- update-manager-17.10.11/Janitor/computerjanitor/plugin_tests.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/Janitor/computerjanitor/plugin_tests.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,112 @@ +# plugin_tests.py - unit tests for plugin.py +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import os +import tempfile +import unittest + +import computerjanitor + + +class PluginTests(unittest.TestCase): + + def testGetCruftRaisesException(self): + p = computerjanitor.Plugin() + self.assertRaises(computerjanitor.UnimplementedMethod, p.get_cruft) + + def testPostCleanupReturnsNone(self): + p = computerjanitor.Plugin() + self.assertEqual(p.post_cleanup(), None) + + def testDoesNotHaveAppAttributeByDefault(self): + p = computerjanitor.Plugin() + self.assertFalse(hasattr(p, "app")) + + def testSetApplicationSetsApp(self): + p = computerjanitor.Plugin() + p.set_application("foo") + self.assertEqual(p.app, "foo") + + def testSetsRequiredConditionToNoneByDefault(self): + p = computerjanitor.Plugin() + self.assertEqual(p.condition, []) + + +class PluginManagerTests(unittest.TestCase): + + def testFindsNoPluginsInEmptyDirectory(self): + tempdir = tempfile.mkdtemp() + pm = computerjanitor.PluginManager(None, [tempdir]) + plugins = pm.get_plugins() + os.rmdir(tempdir) + self.assertEqual(plugins, []) + + def testFindsOnePluginFileInTestPluginDirectory(self): + pm = computerjanitor.PluginManager(None, ["testplugins"]) + self.assertEqual(pm.get_plugin_files(), + ["testplugins/hello_plugin.py"]) + + def testFindsOnePluginInTestPluginDirectory(self): + pm = computerjanitor.PluginManager(None, ["testplugins"]) + self.assertEqual(len(pm.get_plugins()), 1) + + def testFindPluginsSetsApplicationInPluginsFound(self): + pm = computerjanitor.PluginManager("foo", ["testplugins"]) + self.assertEqual(pm.get_plugins()[0].app, "foo") + + def callback(self, filename, index, count): + self.callback_called = True + + def testCallsCallbackWhenFindingPlugins(self): + pm = computerjanitor.PluginManager(None, ["testplugins"]) + self.callback_called = False + pm.get_plugins(callback=self.callback) + self.assert_(self.callback_called) + + +class ConditionTests(unittest.TestCase): + + def setUp(self): + self.pm = computerjanitor.PluginManager(None, ["testplugins"]) + + class White(computerjanitor.Plugin): + pass + + class Red(computerjanitor.Plugin): + def __init__(self): + self.condition = ["red"] + + class RedBlack(computerjanitor.Plugin): + def __init__(self): + self.condition = ["red","black"] + + self.white = White() + self.red = Red() + self.redblack = RedBlack() + self.pm._plugins = [self.white, self.red, self.redblack] + + def testReturnsOnlyConditionlessPluginByDefault(self): + self.assertEqual(self.pm.get_plugins(), [self.white]) + + def testReturnsOnlyRedPluginWhenConditionIsRed(self): + self.assertEqual(self.pm.get_plugins(condition="red"), [self.red, self.redblack]) + + def testReturnsOnlyRedPluginWhenConditionIsRedAndBlack(self): + self.assertEqual(self.pm.get_plugins(condition=["red","black"]), [self.redblack]) + + def testReturnsEallPluginsWhenRequested(self): + self.assertEqual(set(self.pm.get_plugins(condition="*")), + set([self.white, self.red, self.redblack])) diff -Nru update-manager-17.10.11/Janitor/find-conffiles-dirs update-manager-0.156.14.15/Janitor/find-conffiles-dirs --- update-manager-17.10.11/Janitor/find-conffiles-dirs 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/Janitor/find-conffiles-dirs 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,37 @@ +#!/bin/sh + +set -e + +temp=$(mktemp -d) + +find "$@" -type f -name '*.deb' | +while read deb +do + rm -rf "$temp/DEBIAN" + dpkg-deb -e "$deb" "$temp/DEBIAN" + if [ -e "$temp/DEBIAN/conffiles" ] + then + cat "$temp/DEBIAN/conffiles" + fi +done | +xargs -n1 dirname | +sort -u | +python -c ' +# remove /some/path from input if its parent exists in input too +# assume sorted input +import sys +dirs = set() +for line in sys.stdin: + line = line.rstrip("\n") + for dir in dirs: + if line.startswith(dir + "/"): + break + else: + dirs.add(line) +for dir in sorted(dirs): + print dir +' + + + +rm -rf "$temp" diff -Nru update-manager-17.10.11/Janitor/Makefile update-manager-0.156.14.15/Janitor/Makefile --- update-manager-17.10.11/Janitor/Makefile 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/Janitor/Makefile 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,43 @@ +# Makefile for Computer Janitor +# Copyright (C) 2008, 2009 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +all: + +check: check-unittests check-has-unit-tests + +check-unittests: + env COMPUTER_JANITOR_UNITTEST=yes LC_ALL=C python -m CoverageTestRunner + rm -f .coverage + +check-has-unit-tests: + find computerjanitor plugins -name '*.py' ! -name '*_tests.py' | \ + grep -Exv '^computerjanitor/(__init__|ui_gtk).py' | \ + grep -Exv '^plugins/(remove_lilo|check_admin_group)_plugin.py' | \ + grep -Exv '^plugins/(add_nfs_common)_plugin.py' | \ + grep -Exv '^plugins/(kdelibs4to5|langpack_manual)_plugin.py' | \ + grep -Exv '^plugins/(add_nfs_common)_plugin.py' | \ + sed 's/\.py$$//' | \ + while read file; do \ + [ -e $${file}_tests.py ] || \ + (echo "Missing unit test: $$file.py"; exit 1); done + +clean: + rm -f computerjanitor/*.py[co] testplugins/*.py[co] .coverage + rm -rf build $(DESKTOP) + +update-po: + (echo '[encoding: UTF-8]'; \ + ls computerjanitor/*.py plugins/*.py) > po/POTFILES.in + python setup.py build_i18n --merge-po --po-dir po diff -Nru update-manager-17.10.11/Janitor/plugins/deb_plugin.py update-manager-0.156.14.15/Janitor/plugins/deb_plugin.py --- update-manager-17.10.11/Janitor/plugins/deb_plugin.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/Janitor/plugins/deb_plugin.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,41 @@ +# deb_plugin.py - common package for post_cleanup for apt/.deb packages +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import computerjanitor +import apt + + +class DebPlugin(computerjanitor.Plugin): + + """Plugin for post_cleanup processing with apt. + + This plugin does not find any cruft of its own. Instead it + centralizes the post_cleanup handling for all packages that remove + .deb packages. + + """ + + def get_cruft(self): + return [] + + def post_cleanup(self): + try: + self.app.apt_cache.commit(apt.progress.text.AcquireProgress(), + apt.progress.base.InstallProgress()) + except Exception: # pragma: no cover + raise + finally: + self.app.refresh_apt_cache() diff -Nru update-manager-17.10.11/Janitor/plugins/deb_plugin_tests.py update-manager-0.156.14.15/Janitor/plugins/deb_plugin_tests.py --- update-manager-17.10.11/Janitor/plugins/deb_plugin_tests.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/Janitor/plugins/deb_plugin_tests.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,52 @@ +# deb_plugin_tests.py - unittests for deb_plugin.py +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import unittest + +import deb_plugin + + +class MockApplication(object): + + def __init__(self): + self.commit_called = False + self.refresh_called = False + self.apt_cache = self + + def commit(self, foo, bar): + self.commit_called = True + + def refresh_apt_cache(self): + self.refresh_called = True + + +class DebPluginTests(unittest.TestCase): + + def setUp(self): + self.plugin = deb_plugin.DebPlugin() + self.app = MockApplication() + self.plugin.set_application(self.app) + + def testReturnsEmptyListOfCruft(self): + self.assertEqual(self.plugin.get_cruft(), []) + + def testPostCleanupCallsCommit(self): + self.plugin.post_cleanup() + self.assert_(self.app.commit_called) + + def testPostCleanupCallsRefresh(self): + self.plugin.post_cleanup() + self.assert_(self.app.refresh_called) diff -Nru update-manager-17.10.11/Janitor/plugins/dpkg_status_plugin.py update-manager-0.156.14.15/Janitor/plugins/dpkg_status_plugin.py --- update-manager-17.10.11/Janitor/plugins/dpkg_status_plugin.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/Janitor/plugins/dpkg_status_plugin.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,66 @@ +# dpkg_status.py - compact the dpkg status file +# Copyright (C) 2009 Canonical, Ltd. +# +# Author: Michael Vogt +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +from apt_pkg import TagFile +import subprocess +import logging + +import computerjanitor +_ = computerjanitor.setup_gettext() + + +class DpkgStatusCruft(computerjanitor.Cruft): + + def __init__(self, n_items): + self.n_items = n_items + + def get_prefix(self): + return "dpkg-status" + + def get_prefix_description(self): # pragma: no cover + return _("%i obsolete entries in the status file") % self.n_items + + def get_shortname(self): + return _("Obsolete entries in dpkg status") + + def get_description(self): # pragma: no cover + return _("Obsolete dpkg status entries") + + def cleanup(self): # pragma: no cover + logging.debug("calling dpkg --forget-old-unavail") + res = subprocess.call(["dpkg","--forget-old-unavail"]) + logging.debug("dpkg --forget-old-unavail returned %s" % res) + +class DpkgStatusPlugin(computerjanitor.Plugin): + + def __init__(self, fname="/var/lib/dpkg/status"): + self.status = fname + self.condition = ["PostCleanup"] + + def get_cruft(self): + n_cruft = 0 + tagf = TagFile(open(self.status)) + while tagf.step(): + statusline = tagf.section.get("Status") + (want, flag, status) = statusline.split() + if want == "purge" and flag == "ok" and status == "not-installed": + n_cruft += 1 + logging.debug("DpkgStatusPlugin found %s cruft items" % n_cruft) + if n_cruft: + return [DpkgStatusCruft(n_cruft)] + return [] # pragma: no cover diff -Nru update-manager-17.10.11/Janitor/plugins/dpkg_status_plugin_tests.py update-manager-0.156.14.15/Janitor/plugins/dpkg_status_plugin_tests.py --- update-manager-17.10.11/Janitor/plugins/dpkg_status_plugin_tests.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/Janitor/plugins/dpkg_status_plugin_tests.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,39 @@ +# dpkg_status.py - compact the dpkg status file +# Copyright (C) 2009 Canonical, Ltd. +# +# Author: Michael Vogt +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import os +import tempfile +import unittest + +import dpkg_status_plugin + + +class AutoRemovalPluginTests(unittest.TestCase): + + def setUp(self): + fd, self.fname = tempfile.mkstemp() + os.write(fd, "Status: purge ok not-installed\n") + os.close(fd) + self.plugin = dpkg_status_plugin.DpkgStatusPlugin(self.fname) + + def tearDown(self): + os.remove(self.fname) + + def testDpkgStatus(self): + names = [cruft.get_name() for cruft in self.plugin.get_cruft()] + self.assertEqual(sorted(names), sorted([u"dpkg-status:Obsolete entries in dpkg status"])) diff -Nru update-manager-17.10.11/Janitor/plugins/kdelibs4to5_plugin.py update-manager-0.156.14.15/Janitor/plugins/kdelibs4to5_plugin.py --- update-manager-17.10.11/Janitor/plugins/kdelibs4to5_plugin.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/Janitor/plugins/kdelibs4to5_plugin.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,41 @@ +# kdelibs4to5_plugin.py - install kdelibs5-dev if kdeblibs4-dev is installed +# Copyright (C) 2009 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import computerjanitor +_ = computerjanitor.setup_gettext() + + +class Kdelibs4devToKdelibs5devPlugin(computerjanitor.Plugin): + + """Plugin to install kdelibs5-dev if kdelibs4-dev is installed. + + See also LP: #279621. + + """ + + def __init__(self): + self.condition = ["from_hardyPostDistUpgradeCache"] + + def get_cruft(self): + fromp = "kdelibs4-dev" + top = "kdelibs5-dev" + cache = self.app.apt_cache + if (fromp in cache and cache[fromp].is_installed and + top in cache and not cache[top].is_installed): + yield computerjanitor.MissingPackageCruft(cache[top], + _("When upgrading, if kdelibs4-dev is installed, " + "kdelibs5-dev needs to be installed. See " + "bugs.launchpad.net, bug #279621 for details.")) diff -Nru update-manager-17.10.11/Janitor/plugins/langpack_manual_plugin.py update-manager-0.156.14.15/Janitor/plugins/langpack_manual_plugin.py --- update-manager-17.10.11/Janitor/plugins/langpack_manual_plugin.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/Janitor/plugins/langpack_manual_plugin.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,65 @@ +# langpack_manual_plugin.py - mark langpacks to be manually installed +# Copyright (C) 2009 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import computerjanitor +_ = computerjanitor.setup_gettext() + +import logging + +class ManualInstallCruft(computerjanitor.Cruft): + + def __init__(self, pkg): + self.pkg = pkg + + def get_prefix(self): + return "mark-manually-installed" + + def get_shortname(self): + return self.pkg.name + + def get_description(self): + return (_("%s needs to be marked as manually installed.") % + self.pkg.name) + + def cleanup(self): + self.pkg.markKeep() + self.pkg.markInstall() + + +class MarkLangpacksManuallyInstalledPlugin(computerjanitor.Plugin): + + """Plugin to mark language packs as manually installed. + + This works around quirks in the hardy->intrepid upgrade. + + """ + + def __init__(self): + self.condition = ["from_hardyPostDistUpgradeCache"] + + def get_cruft(self): + # language-support-* changed its dependencies from "recommends" + # to "suggests" for language-pack-* - this means that apt will + # think they are now auto-removalable if they got installed + # as a dep of language-support-* - we fix this here + cache = self.app.apt_cache + for pkg in cache: + if (pkg.name.startswith("language-pack-") and + not pkg.name.endswith("-base") and + cache._depcache.IsAutoInstalled(pkg._pkg) and + pkg.is_installed): + logging.debug("setting '%s' to manual installed" % pkg.name) + yield ManualInstallCruft(pkg) diff -Nru update-manager-17.10.11/Janitor/plugins/remove_lilo_plugin.py update-manager-0.156.14.15/Janitor/plugins/remove_lilo_plugin.py --- update-manager-17.10.11/Janitor/plugins/remove_lilo_plugin.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/Janitor/plugins/remove_lilo_plugin.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,43 @@ +# remove_lilo_plugin.py - remove lilo if grub is also installed +# Copyright (C) 2009 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import os + +import logging +import computerjanitor +_ = computerjanitor.setup_gettext() + + +class RemoveLiloPlugin(computerjanitor.Plugin): + + """Plugin to remove lilo if grub is also installed.""" + + description = _("Remove lilo since grub is also installed." + "(See bug #314004 for details.)") + + def __init__(self): + self.condition = ["jauntyPostDistUpgradeCache"] + + def get_cruft(self): + if "lilo" in self.app.apt_cache and "grub" in self.app.apt_cache: + lilo = self.app.apt_cache["lilo"] + grub = self.app.apt_cache["grub"] + if lilo.is_installed and grub.is_installed: + if not os.path.exists("/etc/lilo.conf"): + yield computerjanitor.PackageCruft(lilo, self.description) + else: + logging.warning("lilo and grub installed, but " + "lilo.conf exists") diff -Nru update-manager-17.10.11/Janitor/README update-manager-0.156.14.15/Janitor/README --- update-manager-17.10.11/Janitor/README 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/Janitor/README 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,37 @@ +README for Computer Janitor Core +================================ + + +Computer Janitor is a tool to clean up a system so that it is more like +a freshly installed one. It was written for Ubuntu, but should be +possible to port to other Unix-like operating systems. + +This is the core of the program: the plugin manager, and (some of) the +plugins. The user interface and some other things are in a separate +source tree. This is because Ubuntu's and Debian's Update Manager +program will be using Computer Janitor. Since Update Manager is used +also to upgrade from operating system release to release, it needs to +keep its external dependencies to a minimum. Thus, the core of Computer +Janitor is incorporated into Update Manager, and the upper layers will +remain as a separate package. + + +Copyright license +----------------- + +Computer Janitor - clean up a computer system +Copyright (C) 2008, 2009 Canonical, Ltd. + +The following license applies to all files (including the icons): + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, version 3 of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . diff -Nru update-manager-17.10.11/Janitor/testplugins/hello_plugin.py update-manager-0.156.14.15/Janitor/testplugins/hello_plugin.py --- update-manager-17.10.11/Janitor/testplugins/hello_plugin.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/Janitor/testplugins/hello_plugin.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,33 @@ +# hello_plugin.py - a test plugin for Computer Janitor +# Copyright (C) 2008 Canonical, Ltd. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +import logging + +import computerjanitor + + +class HelloPlugin(computerjanitor.Plugin): + + def get_cruft(self): + cache = self.app.apt_cache + if cache.has_key("hello"): + pkg = cache["hello"] + if pkg.is_installed: + yield computerjanitor.PackageCruft(cache["hello"], + "We don't like hello.") + + def post_cleanup(self): + logging.info("Post-cleanup for HelloPlugin called") diff -Nru update-manager-17.10.11/kubuntu-devel-release-upgrade update-manager-0.156.14.15/kubuntu-devel-release-upgrade --- update-manager-17.10.11/kubuntu-devel-release-upgrade 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/kubuntu-devel-release-upgrade 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,2 @@ +#!/bin/sh +kdesudo "do-release-upgrade -m desktop -f kde -d" Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/.noseids and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/.noseids differ diff -Nru update-manager-17.10.11/po/af.po update-manager-0.156.14.15/po/af.po --- update-manager-17.10.11/po/af.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/af.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2007. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-02-23 19:53+0000\n" "Last-Translator: hawk \n" "Language-Team: Afrikaans \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Bediener vir %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Hoofbediener" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Gebruikersspesifieke bedieners" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Kon nie sources.list inskrywing bereken nie" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Kon nie enige pakkette opspoor nie. Hierdie is dalk nie 'n Ubuntu Skyf nie " "of van die verkeerde argitektuur?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Misluk om die CD toe te voeg" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,13 +83,13 @@ "Die foutboodskap was:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Verwyder pakket in swak toestand" msgstr[1] "Verwyder pakette in swak toestand" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -109,15 +110,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Die bediener is dalk oorlaai" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Gebroke pakette" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -127,7 +128,7 @@ "maak voordat u voort gaan." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -149,28 +150,28 @@ "*Nie-amptelike sagtewarepakkette, nie deur Ubuntu gelewer nie\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Hierdie is heel waarskynlik 'n tydelike probleem, probeer asseblief later " "weer." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Kon nie die opgradering bereken nie" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Fout by bepaling van die egtheid van sommige pakkette" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -180,7 +181,7 @@ "tydelike netwerkprobleem. Probeer later weer. Sien hieronder vir 'n lys van " "ongestaafde pakkette." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -188,33 +189,33 @@ "Die pakket '%s' is gemerk vir verwydering, maar dit is op die verwyderings-" "swartlys." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Die noodsaaklike pakket '%s' is gemerk vir verwydering." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Probeer tans om die swartlys weergawe '%s' te installeer." -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Kan nie '%s' installeer nie." -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Kan nie 'n meta-paket raai nie" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -226,15 +227,15 @@ "edubuntu-desktop paket nie en dit was nie moontlik om jou weergawe van " "Ubuntu te bepaal nie." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Lees geheuekas" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Kan nie 'n eksklusiewe slot bekom nie" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -242,11 +243,11 @@ "Hierdie beteken gewoonlik dat 'n ander pakketbestuurder (soos apt-get of " "aptitude) alreeds loop. Maak asseblief eers daardie program toe." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Opgradering oor 'n afstandsverbinding word nie ondersteun nie" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -260,11 +261,11 @@ "\n" "Die opgradering gaan nou staak. Probeer asseblief weer sonder ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Voortgaan met die uitvoer van SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -282,11 +283,11 @@ "'%s' begin word.\n" "Wil u voortgaan?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Begin bykomende sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -297,7 +298,7 @@ "sshd op poort '%s' begin word. Indien iets sou verkeerd loop, kan u steeds " "deur middel van hierdie bykomende sshd konnekteer.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -306,30 +307,30 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Kan nie opgradeer nie" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" "Opgradering van '%s' na '%s' is nie met hierdie nutsprogram moontlik nie." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Sandpit opstelling het misluk" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Dit was nie moontlik om 'n sandpit omgewing te skep nie." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Sandpit-modus" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -339,18 +340,18 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "U python installasie is korrup. Maak asseblief die '/usr/bin/python' " "simboliese skakel reg." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Pakket 'debsig-verify' is geÏnstalleer" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -360,12 +361,12 @@ "Verwyder asseblief eers die pakket met synaptic of `apt-get remove debsig-" "verify' en begin dan weer die opgradering." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -373,11 +374,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Moet die nuutste opdaterings vanaf die Internet ingesluit word?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -398,16 +399,16 @@ "installeer.\n" "Indien u hier 'nee' kies' sal die netwerk glad nie gebruik word nie." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "versper op opgradering na %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Geldige spieëlbediener nie gevind nie" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -420,11 +421,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -433,21 +434,21 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Stoorplek inligting ongeldig" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Derde-party bronne versper" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -457,13 +458,13 @@ "die opgradering herstel deur gebruik te maak van die 'software-properties' " "nutsprogram of u pakket bestuurder." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Pakket in inkonsekwente toestand" msgstr[1] "Pakkette in inkonsekwente toestand" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -476,11 +477,11 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Fout gedurende opdatering" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -489,13 +490,13 @@ "van 'n probleem met die netwerkverbing. Kontrolleer asseblief u " "netwerkverbinding en probeer weer." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Onvoldoende skyfspasie beskikaar" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -506,32 +507,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Bereken die veranderinge" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Begin met opgradering?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Opgradering gekanselleer" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Kon nie die opgraderings aflaai nie" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -539,33 +540,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Oorspronklike stelseltoestand word herstel" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Kon nie die opgraderings installeer nie" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -576,26 +577,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Verouderde pakkette verwyder?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Behou" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "Sk_rap" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -605,37 +606,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Kontrolleer pakketbestuurder" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Misluk om die opgradering voor te berei" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -643,79 +644,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Stoorplek inligting word opgedateer" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Ongeldige pakketinligting" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Haal tans" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Besig om op te gradeer" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Opgradering voltooi" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Soek na verouderde sagteware" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Sisteem-opgradering voltooi." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Die gedeeltelike opgradering is voltooi." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms in gebruik" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -723,16 +724,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -741,7 +742,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -750,11 +751,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -762,11 +763,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Geen ARMv6 verwerker" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -774,11 +775,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -788,72 +789,72 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Sandpit-opgradering deur gebruik van aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Gebruik die gegewe aanwysing om 'n CD-ROM te soek met opdaterende pakette" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "Gebruik koppelvlak. Tans beskikbaar." -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "Voer slegs 'n gedeeltelike opgradering uit (sources.list nie herskryf)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Stel datadir" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Plaas asseblief '%s' in dryf '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Haal lêer %li van %li teen %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Haal lêer %li van %li" @@ -863,27 +864,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Pas veranderings toe" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Kon nie '%s' installeer nie" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -895,7 +896,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -904,7 +905,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -912,20 +913,20 @@ "U sal enige veranderinge wat u aan hierdie instellingslêer gemaak het " "verloor indien u kies om dit met 'n nuwer weergawe te vervang." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Die 'diff' bevel is nie gevind nie" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "'n Fatale fout het voorgekom" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -933,148 +934,148 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c gedruk" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Om dataverlies te voorkom, sluit asseblief alle toepassings en dokumente." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Media verwisseling" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Toon verskil >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Versteek verskil" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Fout" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Kanselleer" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Sluit" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Inligting" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Besonderhede" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Verwyder %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Verwyder (is outomaties geïinstalleer) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Installeer %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Opgradeer %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Herlaai benodig" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Herlaai die sisteem om die opgradering te voltooi" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "He_rlaai nou" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1082,32 +1083,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Opgradering kanselleer?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li dag" msgstr[1] "%li dae" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li uur" msgstr[1] "%li ure" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minuut" msgstr[1] "%li minute" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1123,7 +1124,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1137,14 +1138,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1152,34 +1153,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Maak gereed vir opgradering" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Verkry nuwe pakkette" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Installeer die opgraderings" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Besig om skoon te maak" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1192,28 +1191,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d pakket gaan verwyder word." msgstr[1] "%d pakkette gaan verwyder word." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d nuwe pakket gaan geïinstalleer word." msgstr[1] "%d nuwe pakkette gaan geïinstalleer word." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d pakket gaan opgegradeer word." msgstr[1] "%d pakkette gaan opgegradeer word." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1224,28 +1223,28 @@ "\n" "U moet in totaal %s aflaai. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1253,68 +1252,68 @@ "Daar is geen opdaterings vir u sisteem beskikbaar nie. Die opgradering word " "nou gekanselleer." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Herlaai benodig" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Kon nie die opgradering-nutsprogram loop nie." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Opgradering-nutsprogram" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Stawing het misluk" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1322,25 +1321,25 @@ "Stawing van die opgradering het misluk. Daar is moontlik 'n probleem met die " "netwerkverbinding of die bediener. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Verifikasie het misluk" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1348,27 +1347,27 @@ "Verifikasie van die opgradering het misluk. Daar is moontlik 'n probleem met " "die netwerkverbinding of die bediener. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Kan nie die opgradering loop nie" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Die foutboodskap is '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1376,73 +1375,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Besig om te kanselleer" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Voortgaan [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Besonderhede [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "j" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Verwyder: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Installeer: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Opgradeer: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Voortgaan [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1503,7 +1502,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1522,166 +1521,180 @@ msgid "Terminal" msgstr "Terminaal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Wag asseblief, hierdie kan 'n ruk duur." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Opdatering is voltooi" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Die bediener is dalk oorlaai. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Kontrolleer asseblief u Internet-verbinding." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Gradeer op" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Laai bykomende pakketlêers af..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Lêer %s van %s teen %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Lêer %s van %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Open skakel in Webblaaier" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Kopieer skakel na knipbord" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Laai lêer %(current)li van %(total)li af teen %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Laai lêer %(current)li van %(total)li af" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Installeer" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Weergawe %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Laai lys van veranderinge af..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "Die bediener is dalk oorlaai. " -msgstr[1] "Die bediener is dalk oorlaai. " +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1690,34 +1703,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Welkom by Ubuntu" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1725,29 +1746,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Lees pakketinligting" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1756,7 +1777,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1764,58 +1785,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Nuwe installasie)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Grootte: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Van weergawe %(old_version)s na weergawe %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Weergawe %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Sagteware-indeks is stukkend" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Kanselleer" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1825,22 +1856,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Kanselleer" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1854,20 +1881,20 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Ander opdaterings (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -1875,7 +1902,7 @@ "Misluk om die lys veranderinge af te laai. \n" "Kontrolleer asseblief u Internet-verbinding." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1884,7 +1911,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1893,7 +1920,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1907,48 +1934,41 @@ "+changelog\n" "totdat die veranderinge beskikbaar word of probeer later weer." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Aanbevole opdaterings" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Voorgestelde updaterings" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Ander opdaterings" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Begin met opgradering?" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -2009,59 +2029,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Sagteware-indeks is stukkend" +msgid "Update Manager" +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Herlaai die rekenaar" +msgid "Starting Update Manager" +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "opdaterings" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Installeer" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Veranderinge" +msgid "updates" +msgstr "opdaterings" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Omskrywing" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Besonderhede [d]" +msgid "You are connected via a wireless modem." +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." -msgstr "" +msgid "Changes" +msgstr "Veranderinge" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "" +msgid "Description" +msgstr "Omskrywing" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Installeer" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2086,7 +2106,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -2098,222 +2118,285 @@ msgid "Show and install available updates" msgstr "Wys en installeer beskikbare opdaterings" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Toon weergawe en sluit af" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Gids wat die datalêers bevat" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Probeer 'n dist-upgrade te loop" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Ubuntu %(version)s opgradering beskikbaar" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb-pakket" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Pakket %s behoort geïnstalleer te word" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb-pakket" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Welkom by Ubuntu" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" #~ "This upgrade is running in sandbox (test) mode. All changes are written " diff -Nru update-manager-17.10.11/po/am.po update-manager-0.156.14.15/po/am.po --- update-manager-17.10.11/po/am.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/am.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-12-06 06:39+0000\n" "Last-Translator: samson \n" "Language-Team: Amharic \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f ሜ/ባ" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "ሰርቨር ለ %s" @@ -42,31 +43,31 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "ዋናው ሰርቨር" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "ልማዳዊ ሰርቨሮች" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "የምንጩን ዝርዝር አገባብ ማስላት አልተቻለም" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" "የጥቅል ፋይሎችን ማግኘት አልተቻለም ፡ ምናልባት ይህ የኡቡንቱ ዲስክ ላይሆን ይችላል ወይም የተሳሳተ አሰራር ይሆን?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "ሲዲ መጨመር አልተቻለም" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -80,13 +81,13 @@ "የስህተቱ መልእክት \n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "በመጥፎ ሁኔታ ላይ ያለን ጥቅል ማስወገጃ" msgstr[1] "በመጥፎ ሁኔታ ላይ ያሉትን ጥቅሎች ማስወገጃ" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -101,15 +102,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "ሰርቨሩ ከአቅሙ በላይ ተጭኗል" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "የተሰበሩ ጥቅሎች" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -118,7 +119,7 @@ "ጌትን በመጠቀም ስብራቱን ያስተካክሉ" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -131,65 +132,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "ይህ ትንሽ ጊዜ የሚቆይ ችግር ነው ፤ እባክዎ እንደገና ይሞክሩ ትንሽ ቆይተው" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "ማሻሻያውን ማስላት አልተቻለም" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "ስህተት በማረጋገጥ ላይ አንዳንድ ጥቅሎችን" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "ጥቅሉ '%s' ምልክት ተድርጎበታል ለማስወገድ ነገር ግን ከሚወገዱት ዝርዝሮች ውስጥ አለ" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "በጣም አስፈላጊ ጥቅል '%s' ለማስወገድ ምልክት ተደርጎበታል" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "ለመግጠም በመሞከር ላይ በመጥፎ ዝርዝር እትም ውስጥ ካሉ '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "መግጠም አልተቻለም '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "ስለ-ጥቅል መገመት አልተቻለም" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -201,25 +202,25 @@ "የትኛውን የኡቡንቱ እትም እንደሚያስኬዱም አልታወቀም ። \n" "እባክዎን በመጀመሪያ አንዱን ጥቅል እላይ ከተጠቀሱት መካከል ይግጠሙ ሲናፕቴክን ወይም አፕት-ጌትን በመጠቀም ከመቀጠሎ በፊት" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "ካሽን በማንበብ ላይ" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "ማሻሻል በርቀት ግንኙነት የተደገፈ አይደለም" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -228,11 +229,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -243,11 +244,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "በመጀመር ላይ ተጨማሪ sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -255,7 +256,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -264,29 +265,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "ማሻሻል አልተቻለም" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "ማሻሻያ ከ '%s' ወደ '%s' በዚህ እቃ የተደገፈ አይደለም" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "መሞከሪያ የአሸዋ ሳጥን ማሰናዳት ወድቋል" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "መሞከሪያ የአሸዋ ሳጥን አካባቢ ማሰናዳት አልተቻለም" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "መሞከሪያ የአሸዋ ሳጥን ዘዴ" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -296,28 +297,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -325,11 +326,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "ከኢንተርኔት ዘመናዊ ማሻሻያዎችን ልጨምር?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -341,16 +342,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "ያልተቻለ ለማሻሻል ወደ %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "ዋጋ ያለው mirror አልተገኘም" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -363,11 +364,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "ነባር ምንጮችን ላመንጭ?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -376,34 +377,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "የማስቀመጫው መረጃ ዋጋ የለውም" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "የ3ኛ ፓርቲ ምንጮችን አለማስቻል" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -416,11 +417,11 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "ስህተት በማሻሻል ላይ" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -428,13 +429,13 @@ "ስህተት ተፈጥሯል በማሻሻል ላይ ፡ ይህ ምናልባት የኔትዎርክ ችግር ይሆናል ፡ እባክዎ የኔትዎርክ ግንኙነትዎን ይመርምሩና " "እንደገና ይሞክሩ" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "በቂ ባዶ ቦታ ዲስኩ ላይ የለም" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -445,32 +446,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "ለውጦቹን በማስላት ላይ" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "ማሻሻሉን አሁን መጀመር ይፈልጋሉ?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "ማሻሻሉ ተሰርዟል" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "የማሻሻያውን ጭነት ማውረድ አልተቻለም" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -478,33 +479,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "በመፈጸም ላይ ስህተት" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "መጀመሪያ ወደነበረበት ስርአት መመለሰ" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "ማሻሻያውን መግጠም አልተቻለም" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -515,26 +516,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "ላስወግዳቸው አሮጌ ጥቅሎችን?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_ማስቀመጥ" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_ማስወገጃ" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -542,37 +543,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "የሚያስፈልጉት ጥገኞች አልተገጠሙም" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "የሚያስፈልጉት ጥገኞች '%s' አልተገጠሙም " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "የጥቅል አስተዳዳሪን በመመርመር ላይ" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "ማሻሻያውን ማሰናዳት አልተቻለም" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -580,79 +581,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "የማስቀመጫውን መረጃ በማሻሻል ላይ" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "ሲዲ ራም መጨመር አልተቻለም" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "አዝናለሁ ሲዲ ራም መጨመሩ አልተሳካም" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "ዋጋ የሌለው የጥቅል መረጃ" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "ሄዶ ማምጣት" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "በማሻሻል ላይ" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "ማሻሻሉ ተጠናቋል" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "ጊዜው ያለፈበትን ሶፍትዌር በመፈለግ ላይ" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "ስርአቱን ማሻሻል ተጠናቋል" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "በከፊል ማሻሻሉ ተጠናቋል" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -660,16 +661,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -678,7 +679,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -687,11 +688,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "i686 ሲፒዩ አይደለም" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -699,11 +700,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -711,11 +712,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -725,71 +726,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "እባክዎ ያስገቡ '%s' በመንጂያው ውስጥ '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "ሄዶ ማምጣት ተጠናቋል" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "ፋይል ሄዳ በማምጣት ላይ %li ከ %li ወደ %sቢ/ሰ" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "ስለ %s ቀሪው" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "ፋይል ሄዶ ማምጣት %li ከ %li" @@ -799,27 +800,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "ለውጦችን በመፈጸም ላይ" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "መግጠም አልተቻለም '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -829,7 +830,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -838,26 +839,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "አደገኛ ስህተት ተፈጥሯል" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -865,147 +866,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "ኮንትሮል-ሲ መጫን" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "ይህ ተግባሩን ያቋርጣል እና ስርአቱን በተሰበረ ሁኔታ ላይ ይተወዋል ፤ በእርግጥ ይህን ማድረግ ይፈልጋሉ?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "የተከፈቱ መተግበሪያዎች እና ሰነዶችን ይዝጉ ዳታዎች እንዳይጠፉ ለመከላከል" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "ማስወገጃ (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "መግጠሚያ (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "ማሻሻያ (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "የሜዲያ ለውጥ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "ልዩነቱን ማሳያ >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< ልዩነቱን መደበቂያ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "ስህተት" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&መሰረዣ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&መዝጊያ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "ተርሚናልን ማሳያ >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< ተርሚናልን መደበቂያ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "መረጃ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "ዝርዝሮች" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "ማስወገጃ %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "ማስወገድ (በራሱ ተገጥሟል) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "መግጠሚያ %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "ማሻሻያ %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "እንደገና ማስጀመር ያስፈልጋል" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "እንደገና ማስጀመር ያስፈልጋል ማሻሻያውን ለማጠናቀቅ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_አሁን እንደገና ላስጀምር" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1016,32 +1017,32 @@ "\n" "ማሻሻሉን ከሰረዙት ስርአቱ ባልተረጋጋ ሁኔታ ላይ ይሆናል ፤ ማሻሻሉን አንዲቀጥሉ አጥብቀን እናሳስባለን" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "ማሻሻሉን ልሰረዝ?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li ቀን" msgstr[1] "%li ቀኖች" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li ሰአት" msgstr[1] "%li ሰአቶች" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li ደቂቃ" msgstr[1] "%li ደቂቆች" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1057,7 +1058,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1071,14 +1072,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1086,34 +1087,32 @@ msgstr "ይህ ማውረድ የሚወስደው ጊዜ በግምት %s በ 1ሜጋ ቢት በዲኤስኤል ግንኙነት እና በግምት %s በ 56ኬ ሞደም" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "ማውረዱ የሚወስደው ጊዜ በግምት %s በእርስዎ ግንኙነት " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "ለማሻሻል በዝግጅት ላይ" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "አዲስ የሶፍትዌር መገናኛዎች ስለ ማግኘት" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "አዲስ ጥቅሎችን ስለ ማግኘት" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "ማሻሻያውን በመግጠም ላይ" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "በማጽዳት ላይ" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1126,28 +1125,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d ጥቅሉ ይወገዳል" msgstr[1] "%d ጥቅሎቹ ይወገዳሉ" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d አዲሱ ጥቅል ይገጠማል" msgstr[1] "%d አዲሶቹ ጥቅሎች ይገጠማሉ" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d ጥቅሉ ይሻሻላል" msgstr[1] "%d ጥቅሎቹ ይሻሻላሉ" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1158,145 +1157,145 @@ "\n" "በድምሩ ማውረድ ያለብዎት ከ %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "ለእርስዎ ስርአት ማሻሻያ የለም ፡ ማሻሻያው አሁን ይሰረዛል" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "እንደገና ማስጀመር ያስፈልጋል" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "ይህ ማሻሻያ ተፈጽሟል እና እንደገና ማስነሳት ያስፈልጋል ፡ ይህን አሁን ማድረግ ይፈልጋሉ?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "የማሻሻያውን መሳሪያዎች ማስኬድ አልተቻለም" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "የማሻሻያዎች መሳሪያዎች ፊርማ" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "ማሻሻያ መሳሪያዎች" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "ሄዶ ማምጣት ወድቋል" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "ማሻሻያውን ሄዶ ማምጣት ወድቋል ፤ ምናልባት የኔትዎርክ ችግር ሊሆን ይችላል " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "ማጽደቂያው ወድቋል" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "ለይቶ ማውጣት ወድቋል" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "ማሻሻያውን ለይቶ ማውጣት ወድቋል ፤ ምናልባት የኔትዎርክ ወይም የሰርቨር ችግር ሊሆን ይችላል " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "ማረጋገጫው ወድቋል" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "ማሻሻያውን ማስኬድ አልተቻለም" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "የስህተቱ መልእክት ነው '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1304,73 +1303,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "በማቋረጥ ላይ" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "ዝቅ ማድረጊያ :\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "እባክዎን ለመቀጠል ማስገቢያውን ይጫኑ" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "መቀጠል [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "ዝርዝሮች [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "አዎ" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "አይ" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "ዝርዝር" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "የተደገፈ አይደለም : %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "ማስወገጃ : %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "መግጠሚያ : %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "ማሻሻያ : %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "መቀጠል [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1433,7 +1432,7 @@ msgstr "የማሻሻያ ስርጭት" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1452,166 +1451,180 @@ msgid "Terminal" msgstr "ተርሚናል" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "እባክዎ ይቆዩ ይህ ትንሽ ጊዜ ሊፈጅ ይችላል" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "ማሻሻሉ ተጠናቋል" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "የመልቀቂያ ማስታወሻዎችን ማግኘት አልተቻለም" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "ሰርቨሩ ምናልባት ካቅሙ በላይ ተጭኗል " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "የመልቀቂያ ማስታወሻዎችን ማውረድ አልተቻለም" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "እባክዎ የኢንተርኔት ግንኙነትዎን ይመርምሩ" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "ማሻሻል" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "የተለቀቀ ማስታወሻ" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "ጭነት ማውረድ ተጨማሪ የጥቅል ፋይሎች" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "ፋይል %s ከ %s በ %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "ፋይል %s ከ %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "የእርስዎ ኡቡንቱ የተደገፈ አይደለም" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "የማሻሻያ መረጃ" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "መግጠም" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "እትም %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "በመጫን ላይ ዝርዝር ለውጦችን..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s ማሻሻያ ተመርጧል" +msgstr[1] "%(count)s ማሻሻያዎች ተመርጠዋል" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s ይወርዳሉ" #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "ማሻሻያው ቀደም ሲል ወርዷል ነገር ግን አልተገጠመም" -msgstr[1] "ማሻሻያዎቹ ቀደም ሲል ወርደዋል ነገር ግን አልተገጠሙም" +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "የሚወርደው መጠን ያልታወቀ" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "የጥቅል መረጃ መጨረሻ የተሻሻለው %(days_ago)s ቀን በፊት ነው" msgstr[1] "የጥቅል መረጃ መጨረሻ የተሻሻለው %(days_ago)s ቀኖች በፊት ነው" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1620,34 +1633,42 @@ msgstr[1] "የጥቅል መረጃ መጨረሻ የተሻሻለው %(hours_ago)s ሰአቶች በፊት ነው" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "የሶፍትዌር ማሻሻያ ለኮምፒዩተሩ ዝግጁ ነው" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "እንኳን ደህና መጡ ወደ ኡቡንቱ" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1655,30 +1676,30 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" "ኮምፒዩተሩን አጥፍቶ ማብራት ያስፈልጋል ማሻሻያውን ገጥሞ ለመጨረስ። እባክዎን የሚሰሩትን ያስቀምጡ ከመቀጠሎት በፊት" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "የጥቅል መረጃን በማንበብ ላይ" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "በመገናኘት ላይ" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "የጥቅል መረጃውን ማስነሳት አልተቻለም" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1687,7 +1708,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1695,58 +1716,69 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (አዲስ መግጠም)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(መጠን: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "እትም %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "በማውረድ ላይ የተለቀቀውን የማሻሻያ መሳሪያ" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "አዲስ የኡቡንቱ እትም የተለቀቀ '%s' ዝግጁ ነው" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "የሶፍትዌር ማውጫ ተሰብሯል" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "አዲሱ እትም '%s' ዝግጁ ነው" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "መሰረዝ" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1756,22 +1788,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "መሰረዝ" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "ማሻሻያ ዝርዝር በመገንባት ላይ" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1785,20 +1813,20 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "ሌሎች ማሻሻያዎች (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -1806,7 +1834,7 @@ "የለውጦችን ዝርዝር ማውረድ አልተቻለም \n" "እባክዎን የኢንተርኔት ግንኙነትዎን ይመርምሩ" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1815,7 +1843,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1824,7 +1852,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1837,50 +1865,43 @@ "እባክዎን ይህን ይጠቀሙ http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "የለውጦቹ ዝርዝር ዝግጁ እስከሚሆኑ ድረስ። ወይም ትንሽ ቆይተው ይሞክሩ" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "ስህተት '%s' ተፈጥሯል ምን አይነት ስርአት እንደሚጠቀሙ በመመርመር ላይ እንዳለ" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "ጠቃሚ የደህንነት ማሻሻያዎች" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "የተጠቆሙት ማሻሻያዎች" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "የቀረቡ ሃሳቦች ለማሻሻያ" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "ሌሎች ማሻሻያዎች" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "የማሻሻያ አስተዳዳሪን መጀመር" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_በከፊል ማሻሻል" @@ -1939,59 +1960,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "የሶፍትዌር ማሻሻያ" +msgid "Update Manager" +msgstr "የማሻሻያ አስተዳዳሪ" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "የሶፍትዌር ማሻሻያ" +msgid "Starting Update Manager" +msgstr "የማሻሻያ አስተዳዳሪን በማስጀመር ላይ" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "ማ_ሻሻያ" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "ማሻሻያ" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "መግጠም" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "ለውጦች" +msgid "updates" +msgstr "ማሻሻያ" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "መግለጫ" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "የማሻሻያው መግለጫ" +msgid "You are connected via a wireless modem." +msgstr "የተገናኙት በሽቦ አልባ ሞደም ነው" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +msgid "_Install Updates" +msgstr "_መግጠም ማሻሻያውን" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." -msgstr "" +msgid "Changes" +msgstr "ለውጦች" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "" +msgid "Description" +msgstr "መግለጫ" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "መግጠም" +msgid "Description of update" +msgstr "የማሻሻያው መግለጫ" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2015,7 +2036,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -2027,77 +2048,77 @@ msgid "Show and install available updates" msgstr "ማሳያ እና መግጠሚያ ዝግጁ የሆኑ ማሻሻያዎችን" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "እትሙን አሳይቶ መውጣት" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "መመርመር አዲስ የተለቀቀ የኡቡንቱ እትም እንዳለ" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "በከፊል ማሻሻያውን ማስኬድ" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2105,163 +2126,209 @@ "ላማሻሻያ መረጃ እባክዎን ይህን ይጎብኙ :\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "አዲስ የተለቀቀ እትም የለም" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "አዲሱ እትም '%s' ዝግጁ ነው" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "የኡቡንቱ %(version)s ማሻሻያ ዝግጁ ነው" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "ፋይል በዲስክ ላይ" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".የዴቢያን ጥቅል" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "የጎደሉ ጥቅሎችን መግጠሚያ" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "ጥቅሉ %s መገጠም አለበት" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".የዴቢያን ጥቅል" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." +msgid "%i obsolete entries in the status file" +msgstr "" + +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s ማሻሻያ ተመርጧል" -#~ msgstr[1] "%(count)s ማሻሻያዎች ተመርጠዋል" - -#~ msgid "Welcome to Ubuntu" -#~ msgstr "እንኳን ደህና መጡ ወደ ኡቡንቱ" - -#~ msgid "Update Manager" -#~ msgstr "የማሻሻያ አስተዳዳሪ" - -#~ msgid "Starting Update Manager" -#~ msgstr "የማሻሻያ አስተዳዳሪን በማስጀመር ላይ" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "You are connected via a wireless modem." -#~ msgstr "የተገናኙት በሽቦ አልባ ሞደም ነው" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "_መግጠም ማሻሻያውን" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "Software updates are available for this computer" #~ msgstr "የሶፍትዌር ማሻሻያ ለዚህ ኮምፒዩተር ዝግጁ ነው" @@ -2278,6 +2345,11 @@ #~ msgid "There are no updates to install" #~ msgstr "ለመግጠም ማሻሻያ የለም" +#~ msgid "The update has already been downloaded, but not installed" +#~ msgid_plural "The updates have already been downloaded, but not installed" +#~ msgstr[0] "ማሻሻያው ቀደም ሲል ወርዷል ነገር ግን አልተገጠመም" +#~ msgstr[1] "ማሻሻያዎቹ ቀደም ሲል ወርደዋል ነገር ግን አልተገጠሙም" + #~ msgid "Checking for a new ubuntu release" #~ msgstr "አዲስ የተለቀቀ የኡቡንቱ እትም በመፈለግ ላይ" diff -Nru update-manager-17.10.11/po/an.po update-manager-0.156.14.15/po/an.po --- update-manager-17.10.11/po/an.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/an.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2010. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-04-14 14:50+0000\n" "Last-Translator: Daniel Martinez \n" "Language-Team: Aragonese \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Servidor ta %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Servidor prencipal" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Servidors presonalizaus" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "No se puet calcular a dentrada sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Imposible localizar garra paquete, a lo millor no ye un disco d'Ubuntu u no " "ye l'arquitectura correcta" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Error al adibir o CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -81,13 +82,13 @@ "O mensache d'error estió:\n" "«%s»" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Eliminar paquete en mal estau" msgstr[1] "Eliminar paquetes en mal estau" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -108,15 +109,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "O servidor puet estar sobrecargau" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Paquetz crebaus" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -126,7 +127,7 @@ "de continar." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -146,26 +147,26 @@ "* Paquetz de software no oficials, no suministraus por Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Probablemén siga un problema pasachero, prebe de nuevo mas tardi." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "No s'ha puesto calcular l'esvielle" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Error autenticando bels paquetz" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -175,7 +176,7 @@ "problema pasachero en o rete. prebe de nuevo mas tardi. veiga abaixo un " "listau d'os paquetz no autenticaus." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -183,33 +184,33 @@ "O paquet «%s» ye marcau ta desinstalar-se pero ye en a lista negra de " "desinstalación" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "O paquet esencial «%s» ha estau marcau ta la suya desinstalación" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Prebando d'instalar a versión vedada «%s»" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "No se ha puesto instalar «%s»" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "No s'ha puesto determinar o meta-paquet" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -223,15 +224,15 @@ "Por favor, instale uno d'os paquetz anteriors emplegando Synaptic o apt-get " "antis de prencipiar." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Leyindo caché" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "No s'ha puesto obtener un bloqueo exclusivo" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -240,11 +241,11 @@ "chestión de paquetz (como apt-get u aptitude). Por favor, zarre ixa " "aplicación en primeras." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Actualizando sobre conixión lexana no soportada" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -257,11 +258,11 @@ "release-upgrade».\n" "L'esvielle s'aturará agora. Prebe sin de ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "¿Continar a echecución baixo SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -277,11 +278,11 @@ "Si contina, escomencipiará un diaple ssh adicinal en o puerto «%s».\n" "¿Deseya continar?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Prencipiando sshd adicional" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -292,7 +293,7 @@ "o puerto «%s». Si bella cosa va mal con o ssh en echecución, encara podrá " "conectar-se a o puerto adicional.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -301,29 +302,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "No se puet esviellar" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Ista aina no soporta esvielles de «%s» a «%s»." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Falló a configuración d'a caixa d'arena" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "No s'ha puesto creyar un entorno de caixa d'arena" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Modo caixa d'arena" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -333,30 +334,30 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "A suya instalación de python ye danyada. Faiga a favor, atecle l'enrrastre " "simbolico «/usr/bin/python»." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "O paquet «debsig-verify» ye instalau" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "L'esvielle no puet continar con ixe paquet instalau." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -364,11 +365,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "¿Anyadir as zagueras actualizacións dende internet?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -388,16 +389,16 @@ "esvielles a l'inte de pasar a la nueva versión.\n" "Si responde «no» agora, o rete no se emplegará ta brenca." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "(desactivau en l'esvielle a %s)" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -410,11 +411,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -423,34 +424,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -463,23 +464,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -490,32 +491,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -523,33 +524,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -560,26 +561,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -587,37 +588,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -625,79 +626,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -705,16 +706,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -723,7 +724,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -732,11 +733,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -744,11 +745,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -756,11 +757,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -770,71 +771,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -844,27 +845,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -874,7 +875,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -883,26 +884,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -910,147 +911,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1058,32 +1059,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1099,7 +1100,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1113,14 +1114,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1128,34 +1129,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1168,28 +1167,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1197,145 +1196,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1343,73 +1342,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1467,7 +1466,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1486,133 +1485,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1620,31 +1627,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1653,34 +1667,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1688,29 +1710,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1719,7 +1741,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1727,58 +1749,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1788,22 +1820,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1817,26 +1845,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1845,7 +1873,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1854,7 +1882,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1863,47 +1891,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1964,54 +1986,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -2036,7 +2061,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -2048,218 +2073,284 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" #~ msgid "" diff -Nru update-manager-17.10.11/po/ar.po update-manager-0.156.14.15/po/ar.po --- update-manager-17.10.11/po/ar.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/ar.po 2017-12-23 05:00:38.000000000 +0000 @@ -5,11 +5,12 @@ # # FIRST AUTHOR , 2006. # OsamaKhalid , 2009. +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: po_update-manager-ar\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-04-17 08:34+0000\n" "Last-Translator: Ibrahim Saed \n" "Language-Team: Arabic\n" @@ -23,7 +24,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -35,13 +36,13 @@ msgstr[5] "%(size).0f ك.بايت" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f م.بايت" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "خادوم %s" @@ -49,30 +50,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "الخادوم الرئيسي" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "خواديم مخصصة" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "تعذر حساب مدخلة source.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "تعذّر إيجاد أي ملفات حزم، لعل هذا ليس قرص أوبونتو أو البنية الخطأ؟" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "فشلت إضافة الاسطوانة" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -87,7 +88,7 @@ "رسالة الخطأ كانت:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "أزل الحزمة التي في حالة سيئة" @@ -97,7 +98,7 @@ msgstr[4] "أزل الحزم التي في حالة سيئة" msgstr[5] "أزل الحزم التي في حالة سيئة" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -128,15 +129,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "قد يكون الخادوم مثقلاً." -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "حزم معطوبة" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -145,7 +146,7 @@ "أو apt-get قبل المواصلة." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -166,11 +167,11 @@ " * حزم برمجيات غير رسمية ليست مقدمة من أبونتو\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "هذا على الأغلب عطل عابر، من فضلك حاول لاحقا." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -178,16 +179,16 @@ "إذا لم ينطبق أيًا من هذا، رجاءً أبلغ عن هذه العلة باستخدام الأمر 'ubuntu-bug " "update-manager' في الطرفية." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "تعذّر حساب الترقية" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "عطل في استيثاق بعض الحزم" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -196,28 +197,28 @@ "تعذّر استيثاق بعض الحزم. قد تكون هذه مشكلة عابرة في الشبكة، وقد تفلح المحاولة " "مجددا لاحقا. طالع قائمة الحزم غير المستوثقة أدناه." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "الحزمة '%s' معلّمة للإزالة لكنها في قائمة الحذف السوداء." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "الحزمة الأساسية '%s' معلّمة للإزالة." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "يحاول تثبيت نسخة في القائمة السوداء '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "تعذّر تثبيت '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -226,11 +227,11 @@ "الأمر 'ubuntu-bug update-manager' في الطرفية." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "تعذّرت معرفة الحزمة الفوقية" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -243,15 +244,15 @@ " رجاءً ثبت إحدى الحزم المذكورة أعلاه باستخدام synaptic أو apt-get قبل " "المواصلة." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "يقرأ المخبئية" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "تعذر الحصول على قفل حصري" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -259,11 +260,11 @@ "يعني هذا عادة أن تطبيق إدارة حزم آخر (مثل apt-get أو aptitude) يعمل حالياً. " "رجاء أغلق ذاك التطبيق أولاً." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "الترقية عبر اتصال بعيد غير مدعومة" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -276,11 +277,11 @@ "\n" "سيتم الخروج من عملية الترقية الآن. الرجاء المحاولة بدون الغطاء الأمني." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "أتريد مواصلة العمل تحت SSH؟" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -295,11 +296,11 @@ "إذا استمررت، سيتم بدأ عفريت غطاء أمني إضافي على منفذ '%s'.\n" "هل تريد الاستمرار؟" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "يشغّل sshd إضافي" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -309,7 +310,7 @@ "لتسهيل الإصلاح في حالة الفشل فإن sshd إضافيا سيُشغّل على المنفذ '%s'. إذا حدث " "عطل في ssh المشتغل حاليا يمكنك الاتصال بالإضافي.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -321,29 +322,29 @@ "المحتمل أن يكون هذا خطراً لا يتم فتحه تقائياً. بإمكانك فتح المنفذ عن طريق:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "تعذّرت الترقية" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "ترقية من '%s' إلى '%s' غير مدعومة بهذه الأداة." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "فشل إعداد صندوق الرمل" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "تعذّر إنشاء بيئة محاطة (صندوق رمل)" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "طور صندوق الرمل" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -357,17 +358,17 @@ "\n" "*لن* تُكتب أي تغييرات إلى مجلد النظام من الآن حتى إعادة التشغيل التالي." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "تثبيتة python الحالية معطوبة. رجاءً أصلح الرابط الرمزي '/usr/bin/python'." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "حزمة 'debsig-verify' مثبتة" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -376,12 +377,12 @@ "لا يمكن مواصة الترقية و تلك الحزمة مثبّتة.\n" "أزلها باستخدام synaptic أو 'apt-get' ثم أجر الترقية مجددا." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "لا يمكن الكتابة إلى '%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -391,11 +392,11 @@ "لا يمكن الكتابة إلى مُجلد النظام '%s' على نظامك. لا يُمكن مُتابعة الترقية.\n" "رجاءً تأكد أن مُجلد النظام قابل للكتابة." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "أأضمن آخر التحديثات من الإنترنت؟" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -414,16 +415,16 @@ "مباشرة.\n" "إذا كانت إجابتك 'لا' هنا، لن تستخدم الشبكة مطلقا." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "عُطّل عند الترقية إلى %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "لم يُعثر على مرآة صحيحة" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -441,11 +442,11 @@ "فستُحدّث كل '%s' إلى '%s'. وإن أجبت ﺑ'ﻻ' فستُلغى عملية الترقية." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "أأولد المصادر المبدئية؟" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -457,11 +458,11 @@ "\n" "هل تود إضافة المدخلات الافتراضية لـ'%s'؟ إن أجبت ﺑ'ﻻ' فستُلغى عملية الترقية." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "معلومات المستودع غير صحيحة" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -469,11 +470,11 @@ "ترقية معلومات المستودعات أسفرت عن ملف غير صالح، لذلك يجري بدء عملية للإبلاغ " "عن العلّة." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "مصادر الأطراف الخارجية عُطّلت" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -482,7 +483,7 @@ "بعض مدخلات الأطراف الخارجية في sources.list قد عطلت. يمكنك إعادة تفعيلها بعد " "الترقية، باستخدام أداة 'software-properties' في مدير الحزم." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "لا حزم في حالة غير متسقة" @@ -492,7 +493,7 @@ msgstr[4] "حزم في حالة غير متسقة" msgstr[5] "حزم في حالة غير متسقة" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -521,11 +522,11 @@ "حالة الحزم '%s' متضاربة وتحتاج أن يعاد تثبيتها، لكن لا أرشيف وجد لها. من " "فضلك أعد تثبيت الحزم يدويا أو أزلها من النظام." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "عطل أثناء التحديث" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -533,13 +534,13 @@ "طرأت مشكلة أثناء التحديث. عادة ما يكون هذا نتيجة مشكلة ما في الشبكة، تحقق من " "اتصالك الشبكي وحاول مجددا." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "لا توجد مساحة كافية على القرص" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -553,21 +554,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "يحسب التغيرات" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "أتريد بدء التحديث الآن؟" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "أُلغيت الترقية" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -575,12 +576,12 @@ "الترقية ستلغى وسيتم استعادة الحالة الأصلية للنظام. بإمكانك استئناف الترقية " "في وقت لاحق." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "تعذّر تنزيل الترقيات" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -590,27 +591,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "عطل أثناء الإيداع" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "يسترجع الحالة الأصلية للنظام" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "تعذّر تثبيت الترقيات" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -618,7 +619,7 @@ "لقد أُجهضت الترقية. قد يصبح نظامك في خالة غير مستقرة. سيُشغل الاستعفاء الآن " "(dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -635,27 +636,27 @@ "upgrade/ مع البلاغ.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" "لقد أُجهضت الترقية. راجع الاتصال بالإنترت أو وسيط التثبيت ثم أعد المحاولة. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "أأزيل الحزم المبطلة؟" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "ا_ستبق" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "أ_زل" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -663,37 +664,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "اعتمادات مطلوبة غير مثبتة" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "الاعتمادية المطلوبة '%s' ليست مثبتة. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "يفحص مدير الحزم" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "فشل تجهيز الترقية" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "فشل تحضير النظام للترقية، لذلك يجري بدء عملية للإبلاغ عن العلّة." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "فشل جلب متطلبات الترقية" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -705,68 +706,68 @@ "\n" "بالإضافة إلى ذلك، يجري بدء عملية للإبلاغ عن العلّة." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "يحدّث معلومات المستودعات" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "فشل في إضافة القرص المدمج" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "عفواً، لم يتم إضافة القرص المدمج بنجاح." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "معلومات حزم غير صحيحة" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "يجلب" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "تجري الترقية" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "انتهت الترقية" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "الترقية اكتملت، ولكن كان هناك أخطاء أثناء عملية الترقية." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "يبحث عن برمجيات قديمة" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "تمت ترقية النظام." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "انتهت الترقية الجزئية." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms قيد الاستخدام" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -775,11 +776,11 @@ "يستخدم نظامك مدير الصوت 'evms' في /proc/mounts. برمجيات 'evms' لم تعد " "مدعومة، من فضلك أغلقه ونفذ الترقية مجددا عندما ينتهي." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "قد يكون عتاد الرسوميات في جهازك غير مدعوم بالكامل في أوبنتو 12.04." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -790,9 +791,9 @@ "لمزيد من المعلومات انظر: https://wiki.ubuntu.com/X/Bugs/" "UpdateManagerWarningForI8xx هل تود الاستمرار في الترقية؟" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -800,8 +801,8 @@ "قد تقلل الترقية من تأثيرات سطح المكتب، وأداء الألعاب وبرامج الرسوميات " "المكثفة الأخرى." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -814,7 +815,7 @@ "\n" "أتريد المواصلة؟" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -827,11 +828,11 @@ "\n" "أتريد المواصلة؟" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "لا يوجد معالج i686" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -842,11 +843,11 @@ "الحزم متطلبةً لبنية i686 كحد أدنى. ليس من الممكن ترقية نظامك إلى إصدارة " "أوبونتو الجديدة مع هذا العتاد." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "لا معالج ARMv6" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -857,11 +858,11 @@ "مبنية لتعمل على الطراز ARMv6 كحد أدنى. من غير الممكن ترقية نظامك إلى إصدارة " "أوبونتو حديثة مع هذا العتاد." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "لا يوجد عفريت مدير للعمليات" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -876,15 +877,15 @@ "\n" "هل حقاً تريد الاستمرار؟" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "ترقية في بيئة محكومة (صندوق رمل)" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "ابحث في المسار المعطى عن قرص مدمج يحوي حزم ترقية" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -892,57 +893,57 @@ "استخدم واجهة. المتاح حاليا:\n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKD" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*مهجور* سيتم تجاهل هذا الخيار" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "قم بترقية جزئية فقط (لا كتابة فوق sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "عطل دعم شاشة جنو" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "حدد مجلد البيانات" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "رجاء أدرج '%s' في محرك الأقراص '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "تم الجلب" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "يجلب الملف %li من %li بـ %sبايت/ثانية" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "بقي %s تقريبا" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "يجلب الملف %li من %li" @@ -952,27 +953,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "يطبّق التغييرات" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "مشكلة اعتمادية - سأغادر بدون إعداد" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "تعذّر تثبيت '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -982,7 +983,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -993,7 +994,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1001,20 +1002,20 @@ "ستفقد أي تغيرات كنت قد أحدثتها في ملف التضبيطات هذا إن اخترت استبداله " "بإصدارة أحدث." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "تعذّر العثور على أمر 'diff'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "حدث خطأ فادح" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1026,13 +1027,13 @@ "الترقية.\n" "ملف sources.list الأصلي حُفِظَ في /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "ضُغط Ctrl-c" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1040,134 +1041,134 @@ "هذا سيجهض العملية وقد يترك النظام في حالة معطوبة. أمتأكد أنك تريد فعل ذلك؟" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "لتلافي فقد البيانات أغلق جميع التطبيقات والمستندات." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "لم تعد كانونيكال تدعمها (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "إلى إصدارة أقدم (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "أزل (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "لم تعد مطلوبة (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "ثبّت (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "رقّ (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "تغيير الوسائط" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "أظهر الفرق >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< أخف الفرق" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "خطأ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "أ&لغِ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "أ&غلق" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "أظهر الطرفية >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< أخف الطرفية" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "معلومات" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "التّفاصيل" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "لم تعد مدعومة %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "أزل %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "أزل %s (ثبّت تلقائيا)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "ثبّت %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "رقِّ %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "إعادة التشغيل مطلوبة" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "أعد تشغيل النظام لإتمام الترقية" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "أ_عد التشغيل الآن" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1179,11 +1180,11 @@ "قد يصبح النظام في حالة غير صالحة للاستعمال إذا ألغيت الترقية. ننصح بشدة " "استئناف الترقية." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "أألغي الترقية؟" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" @@ -1194,7 +1195,7 @@ msgstr[4] "%li يوما" msgstr[5] "%li يوم" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" @@ -1205,7 +1206,7 @@ msgstr[4] "%li ساعة" msgstr[5] "%li ساعة" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" @@ -1216,7 +1217,7 @@ msgstr[4] "%li دقيقة" msgstr[5] "%li دقيقة" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1236,7 +1237,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1250,14 +1251,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1266,34 +1267,32 @@ "سيأخذ التنزيل حوالي %s على اتصال بسرعة 1م.بايت، وحوالي %s على مودم 56ك." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "سيستغرق التنزيل حوالي %s بسرعة اتصالك. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "يحضّر للترقية" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "يجلب قنوات البرمجيات الجديدة" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "يجلب الحزم الجديدة" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "يثبّت الترقيات" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "ينظّف" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1322,7 +1321,7 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." @@ -1333,7 +1332,7 @@ msgstr[4] "ستزال %d حزمة." msgstr[5] "ستزال %d حزمة." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." @@ -1344,7 +1343,7 @@ msgstr[4] "ستثبت %d حزمة جديدة." msgstr[5] "ستثبت %d حزمة جديدة." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." @@ -1355,7 +1354,7 @@ msgstr[4] "سترقى %d حزمة جديدة." msgstr[5] "سترقى %d حزمة جديدة." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1366,14 +1365,14 @@ "\n" "تحتاج لتنزيل ما مجمله %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" "تثبيت الترقية قد يأخذ بضع ساعات. حالما ينتهي التنزيل، فلا يمكن إلغاء العملية." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1381,51 +1380,51 @@ "جلب وتثبيت الترقية قد يأخذ بضع ساعات. حالما ينتهي التنزيل، لا يمكن إلغاء " "العملية." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "إزالة الحزم قد يأخذ بضع ساعات. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "البرمجيات على هذا الحاسوب مُحدّثة." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "لا توجد أي ترقيات متوفرة لنظامك. ستلغى الترقية الآن." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "إعادة التشغيل مطلوبة" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "لقد انتهت الترقية وإعادة التشغيل مطلوبة. هل تود القيام بذلك الآن؟" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "توثيق '%(file)s' باستخدام البصمة '%(signature)s' " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "يستخرج '%s'" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "تعذّر تشغيل أداة الترقية" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1433,71 +1432,71 @@ "على الأرجح هذه مشكلة في أداة الترقية. رجاءً أبلغ عنها كعلّة باستخدام الأمر " "'ubuntu-bug update-manager' في الطرفية." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "توقيع أداة الترقية" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "أداة الترقية" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "فشل الجلب" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "فشل جلب الترقية، قد تكون هناك مشكلة في الشبكة. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "فشل الاستيثاق" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "فشل استيثاق الترقية. قد توجد مشكلة في الشبكة أو في الخادوم. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "فشل الاستخراج" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "فشل استخلاص الترقية، قد تكون هناك مشكلة في الشبكة أو الخادوم. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "فشل التحقق" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "فشل التحقق من الترقية. قد توجد مشكلة في الشبكة أو في الخادوم. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "لا يمكن اجراء الترقية" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1505,13 +1504,13 @@ "غالباً ما يحدث هذا إذا ما تم تحميل /tmp بإشارة nonexec. رجاءاً أعد التحميل " "بدون nonexec ثم أعد تشغيل الترقية." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "رسالة الخطأ هي '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1522,73 +1521,73 @@ "log/dist-upgrade/apt.log في البلاغ. تم الخروج من الترقية.\n" "ملف sources.list الأصلي حُفِظَ في /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "يُجهض" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "حطّت رتبته:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "للإستمرار اضغط على [Enter]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "استمر [ن(ل)] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "التّفاصيل [ف]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "ن" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "ل" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "ف" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "لم تعد مدعومة: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "إزالة: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "تثبيت: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "ترقية: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "تابع [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1655,8 +1654,7 @@ msgstr "ترقية التوزيعة" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "ترقية أبونتو إلى الإصدارة 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1675,84 +1673,85 @@ msgid "Terminal" msgstr "طرفية" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "رجاء انتظر، قد يستغرق هذا وقتا" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "لقد انتهت عملية التحديث" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "تعذّر العثور على ملاحظات الإصدارة" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "قد يكون الخادوم محملا فوق طاقته. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "تعذّر تنزيل ملاحظات الإصدارة" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "رجاء تأكد من اتصالك بالإنترنت" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "رقّ" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "ملاحظات الإصدار" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "تنزيل ملفات الحزم الإضافية..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "الملف %s من %s بسرعة %s ب/ث" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "ملف %s من %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "افتح الرابط في المتصفح" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "انسخ الرابط إلى الحافظة" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "ينزّل الملف %(current)li من %(total)li بسرعة %(speed)s/ثانية" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "ينزّل الملف %(current)li من %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "نسختك من أبونتو لم تعد مدعومة بعد الآن." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1760,51 +1759,61 @@ "لن تحصل على المزيد من الإصلاحات الأمنية أو التحديثات الحرجة. يرجى الترقية " "إلى آخر نسخة من أبونتو." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "معلومات الترقية" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "ثبّت" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "الاسم" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "الإصدار %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "لا يوجد اتصال بالشبكة، لن تستطيع الحصول على معلومات التغيير." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "ينزّل قائمة التغييرات..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "أ_زِل التحديد عن الكل" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "حدّد ال_كل" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "لم تحدد أي تحديثات" +msgstr[1] "حُدد تحديث واحد" +msgstr[2] "حُدد تحديثين" +msgstr[3] "حُددت %(count)s تحديثات" +msgstr[4] "حُدد %(count)s تحديثا" +msgstr[5] "حُدد %(count)s تحديث" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "سينزل %s" #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "تم تنزي التحديثات ولكن لم تُثبّت." msgstr[1] "تم تنزيل تحديث واحد، ولكن لم يُثبّت." msgstr[2] "تم تنزيل تحديثين، ولكن لم يُثبّتا." @@ -1816,11 +1825,18 @@ msgid "There are no updates to install." msgstr "لا توجد تحديثات للتثبيت." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "حجم التنزيل مجهول" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1828,7 +1844,7 @@ "غير معروف متى حُدِّثت معلومات الحزم آخر مرة. رجاءً انقر زر 'التمس' لتحديث " "المعلومات." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1837,7 +1853,7 @@ "حُدّثت معلومات الحزم آخر مرة قبل %(days_ago)s أيام/يوم.\n" "اضغط زر 'التمس' لفحص التحديثات الجديدة للبرمجيات." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1848,7 +1864,7 @@ msgstr[4] "حُدّثت معلومات الحزم آخر مرة منذ %(days_ago)s يوما." msgstr[5] "حُدّثت معلومات الحزم آخر مرة منذ %(days_ago)s يوم." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1861,34 +1877,42 @@ msgstr[5] "حُدّثت معلومات الحزم آخر مرة منذ %(hours_ago)s ساعة." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "حُدّثت معلومات الحزم آخر مرة منذ حوالي %s دقيقة." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "حُدثت معلومات الحزم توًا." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "تحديثات البرمجيات تصحّح الأخطاء وتسد الثغرات الأمنية وتوّفر ميزات جديدة." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "قد تتوفر تحديثات برمجيات لحاسوبك." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "مرحبًا بك في أوبونتو" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" -msgstr "" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "صدرت هذه التحديثات البرمجية منذ إطلاق هذه الإصدارة من أبونتو." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "تتوفر تحديثات برمجيات لهذا الحاسوب." + +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1899,7 +1923,7 @@ "إضافي من مساحة القرص على '%s'. أفرغ مهملاك وأزل الحزم المؤقتة للتثبيتات " "السابقة باستخدام 'sudo apt-get clean'." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1907,23 +1931,23 @@ "يحتاج الحاسوب لإعادة التشغيل لتطبيق التحديثات. من فضلك احفظ عملك قبل " "المواصلة." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "يقرأ معلومات الحزم" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "يتصل..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "قد لا تستطيع التماس التحديثات أو تنزيل تحديثات جديدة." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "تعذّر تمهيد معلومات الحزم" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1935,7 +1959,7 @@ "\n" "من فضلك أبلغ هذه العلة لحزمة 'update-manager' وضمّن رسالة الخطأ التالية:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1946,52 +1970,52 @@ "\n" "من فضلك أبلغ هذه العلة للحزمة 'update-manager' وضمّن رسالة الخطأ التالية:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (تثبيت جديد)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(الحجم: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "من الإصدارة %(old_version)s إلى %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "الإصدارة %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "يتعذّر ترقية الإصدارة حاليا" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "تعذّر ترفية الإصدارة حاليا، أعد المحاولة لاحقا. رد الخادوم: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "ينزّل أداة الترقية" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "تتوفر إصدارة جديدة '%s' من أوبونتو" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "فهرس البرمجيات تالف" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -2000,6 +2024,17 @@ "لا يمكن تثبيت أو إزالة أي برمجيات. استخدم مدير الحزم \"Synaptic\" أو شغل " "\"sudo apt-get install -f\" في مرقاب لمحاولة إصلاح هذه المشكلة أولا." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "لا تتوفر إصدارات '%s'" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "ألغِ" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "التمس تحديثات" @@ -2009,22 +2044,18 @@ msgstr "ثبّت جميع التحديثات المتوفرة" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "ألغِ" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "سجل التغييرات" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "تحديثات" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "يبني قائمة التحديثات" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2048,20 +2079,20 @@ " * حزم برمجيات غير رسمية ليست مقدمة من أبونتو\n" " * تغييرات عادية لنسخة ما قبل الإصدار من أبونتو." -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "تنزيل سجل التغييرات" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "تحديثات أخرى (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "هذا التحديث لا يأتي من مصدر يدعم سجل التغييرات." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2069,7 +2100,7 @@ "فشل تنزيل قائمة التغييرات.\n" "افحص اتصالك بإنترنت." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2082,7 +2113,7 @@ "الإصدارة المُتوفرة: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2095,7 +2126,7 @@ "من فضلك استخدم http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "حتى تتوفر التغييرات أو حاول مجددا لاحقا." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2108,50 +2139,43 @@ "من فضلك استخدام http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "حتى تتوفر التغييرات أو حاول مجددا لاحقا." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "فشل الكشف على التوزيع" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "صودف خطأ '%s' أثناء التماس ما يستخدمه النظام." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "تحديثات أمنية مهمّة" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "تحديثات منصوح بها" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "تحديثات مقترحة" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "تحديثات رجوعية" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "تحديثات التوزيعة" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "تحديثات أخرى" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "يبدأ مدير التحديثات" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "تحديثات البرمجيات تصحّح الأخطاء وتسد الثغرات الأمنية وتوّفر ميزات جديدة." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "ترقية _جزئية" @@ -2221,37 +2245,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "تحديثات البرمجيات" +msgid "Update Manager" +msgstr "مدير التحديثات" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "تحديثات البرمجيات" +msgid "Starting Update Manager" +msgstr "يبدأ مدير التحديثات" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "ت_رقية" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "تحديثات" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "ثبّت" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "التغييرات" +msgid "updates" +msgstr "تحديثات" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "الوصف" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "وصف التحديث" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2259,23 +2273,33 @@ "أنت متصل عبر التجوال ومن الممكن أن تحاسب على البيانات المستهلكة خلال هذا " "التحديث." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "أنت متصل عبر مودم لاسلكي." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "إنه أكثر أماناً إذا وصلت حاسوبك بمنفذ الطاقة قبل البدء في التحديث." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_ثبت التحديثات" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "التغييرات" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "الإ_عدادات..." +msgid "Description" +msgstr "الوصف" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "ثبّت" +msgid "Description of update" +msgstr "وصف التحديث" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "الإ_عدادات..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2298,9 +2322,8 @@ msgstr "لقد رفضت الترقية إلى أوبونتو الجديدة" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "يمكنك الترقية لاحقا بفتح مدير التحديثات والنقر على \"رقِّ\"" @@ -2312,56 +2335,56 @@ msgid "Show and install available updates" msgstr "أظهر وثبت التحديثات المتوفرة" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "اعرض الإصدارة واخرج" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "المجلد الذي يحتوي ملفات البيانات" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "التمس وجود إصدارة جديدة من أوبونتو" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "يفحص إن كانت الترقية ممكنة إلى أحدث إصدارة تطوير" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "رقّ باستخدام آخر نسخة موصى بها لمرقي الإصدار" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "لا تركز على الخريطة عند البدء" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "حاول تشغيل dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "لا تلتمس التحديثات عند البدء" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "اختبر الترقية في بيئة محكومة (صندوق رمل)" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "يُجري ترقية جزئية" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "اعرض وصف الحزمة بدلًا من سجل التغييرات" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "حاول الترقية إلى أحدث إصدارة باستخدام المحدِّث من $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2371,11 +2394,11 @@ "حاليا الطوران المدعومان هما 'desktop' للترقية الاعتيادية لنظام سطح مكتب، و " "'server' لنظم الخواديم." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "يشغل الواجهة المحددة" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2383,11 +2406,11 @@ "تحقق فقط إذا كان هناك إصدار جديد من التوزيعة متوفرا و أرسل تقريرا خلال كود " "الخروج" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "يتحقق من وجود إصدارة جديدة من أبونتو" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2395,68 +2418,68 @@ "لمعلومات عن الترقية، رجاءً قم بزيارة:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "لا توجد إصدارات أحدث" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "لا تتوفر إصدارات '%s'" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "شغّل 'do-release-upgrade' للترقية إليه." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "يتوفر ترقية إلى أوبونتو %(version)s" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "لقد رفضت الترقية إلى أوبونتو %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "أضف مُخرَجات التنقيح" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "اعرض الحزم الغير مدعومة على هذا الجهاز" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "اعرض الحزم المدعومة على هذا الجهاز" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "اعرض كُل الحزم مع حالاتها" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "اعرض كُل الحزم في قائمة" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "مُلخص حالة الدعم لـ '%s':" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "لديك %(num)s حزمة (%(percent).1f%%) مدعومة حتى %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "لديك %(num)s حزمة (%(percent).1f%%) لم تعد قابلة للتنزيل" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "لديك %(num)s حزمة (%(percent).1f%%) غير مدعومة" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2464,79 +2487,145 @@ "شغّل باستخدام --show-unsupported أو --show-supported أو --show-all لرؤية مزيد " "من التفاصيل" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "لم تعد قابلة للتنزيل:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "غير مدعومة: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "مدعومة حتى %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "غير مدعومة" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "طريقة غير مطبقة: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "ملف على القرص" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "حزمة .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "ثبّت الحزم الناقصة" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "يجب تثبيت الحزمة %s" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "حزمة .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s تحتاج لتأشيرها على أنها مُثبَّتة يدويا." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"أثناء الترقية، إذا كانت kdelibs4-dev مثبّتة فستحتج تثبيت kdelibs5-dev. راجع " -"bugs.launchpad.net، علة رقم #279621 لمزيد من التفاصيل." - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i مدخلات قديمة في ملف الحالة" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "مدخلات قديمة في حالة dpkg" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "مدخلات قديمة في حالة dpkg" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"أثناء الترقية، إذا كانت kdelibs4-dev مثبّتة فستحتج تثبيت kdelibs5-dev. راجع " +"bugs.launchpad.net، علة رقم #279621 لمزيد من التفاصيل." + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s تحتاج لتأشيرها على أنها مُثبَّتة يدويا." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "أزٍل lilo حيث أن grub مثبّت. (راجع العلة #314004 لمزيد من التفاصيل)" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" + +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + #~ msgid "" #~ "After your package information was updated the essential package '%s' can " #~ "not be found anymore so a bug reporting process is being started." @@ -2544,41 +2633,6 @@ #~ "بعد أن تم تحديث معلومات الحزم، فإن الحزمة الأساسية '%s' لا يمكن العثور " #~ "عليها بعد الآن، لذلك يجري بدء عملية للإبلاغ عن العلّة." -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "لم تحدد أي تحديثات" -#~ msgstr[1] "حُدد تحديث واحد" -#~ msgstr[2] "حُدد تحديثين" -#~ msgstr[3] "حُددت %(count)s تحديثات" -#~ msgstr[4] "حُدد %(count)s تحديثا" -#~ msgstr[5] "حُدد %(count)s تحديث" - -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" - -#~ msgid "Welcome to Ubuntu" -#~ msgstr "مرحبًا بك في أوبونتو" - -#~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." -#~ msgstr "صدرت هذه التحديثات البرمجية منذ إطلاق هذه الإصدارة من أبونتو." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "تتوفر تحديثات برمجيات لهذا الحاسوب." - -#~ msgid "Update Manager" -#~ msgstr "مدير التحديثات" - -#~ msgid "Starting Update Manager" -#~ msgstr "يبدأ مدير التحديثات" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "أنت متصل عبر مودم لاسلكي." - -#~ msgid "_Install Updates" -#~ msgstr "_ثبت التحديثات" - #~ msgid "Checking for a new ubuntu release" #~ msgstr "يجري التماس إصدارة أحدث من أوبونتو" diff -Nru update-manager-17.10.11/po/ast.po update-manager-0.156.14.15/po/ast.po --- update-manager-17.10.11/po/ast.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/ast.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2008. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-24 16:02+0000\n" "Last-Translator: Xandru \n" "Language-Team: Asturian \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Sirvidores pa %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Sirvidor principal" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Sirvidores personalizaos" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Nun pudo calculase la entrada sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Nun puede llocalizase dengún paquete, seique nun ye un discu d'Ubuntu o nun " "ye l'arquiteutura correuta." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Falló amestar el CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,13 +83,13 @@ "El mensax d'error foi:\n" "«%s»" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Desaniciar paquete en mal estáu" msgstr[1] "Desaniciar paquetes en mal estáu" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -109,15 +110,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "El sirvidor puede tar sobrocargáu" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Paquetes frayaos" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -126,7 +127,7 @@ "software. Por favor ígualo enantes d'usar synaptic o apt-get" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -147,11 +148,11 @@ " * Paquetes de software non oficiales que Ubuntu nun ufre\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Dablemente seya un problema transitoriu, téntelo otra vegada más sero." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -159,16 +160,16 @@ "Si denguna d'éstes aplica, entós informa d'esti fallu usando la orde «ubuntu-" "bug update-manager» nuna terminal." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Nun pue calculase l'anovamientu de versión" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Error autentificando dalgunos paquetes" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -178,7 +179,7 @@ "problema transitoriu na rede. Pruebe otra vegada más sero. Vea abaxo una " "llista de los paquetes non autenticaos." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -186,22 +187,22 @@ "El paquete '%s' ta conseñáu pa desaniciar, pero ta na llista de non " "desaniciables." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "El paquete esencial '%s' ta conseñáu pa desaniciar." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Intentando instalar la versión prohibida «%s»" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Nun puede instalase '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -210,11 +211,11 @@ "«ubuntu-bug update-manager» nuna terminal." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Nun pudo determinase'l meta-paquete" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -228,15 +229,15 @@ " Por favor, instala un de los paquetes d'abaxo enantes d'usar Synaptic o apt-" "get." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Lleendo cache" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Nun pudo obtenese un bloquéu esclusivu" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -245,11 +246,11 @@ "xestión de paquetes (como apt-get o aptitude). Por favor, pieslla esa " "aplicación primero." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Nun hai sofitu p'anovar per conexón remota" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -263,11 +264,11 @@ "\n" "L'anovamientu va parase agora. Inténtalo ensin ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "¿Continuar executando baxo SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -284,11 +285,11 @@ "Si sigues, aniciaráse un degorriu ssh adicional nel puertu «%s».\n" "¿Quies siguir?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Aniciando sshd adicional" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -299,7 +300,7 @@ "estra nel puertu «%s». Si daqué va mal col ssh n'execución, entá podrás " "coneutate al estra.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -312,29 +313,29 @@ "abrir el puertu con:\n" "«%s»" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Nun se pue anovar" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Esta ferramienta nun soporta anovamientos de «%s» a «%s»." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Falló la configuración de Sandbox" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Nun foi dable crear un entornu sandbox." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Mou Sandbox" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -349,18 +350,18 @@ "*Dengún* de los cambeos escritos nel direutoriu de sistema va ser " "permanente, dende agora hasta'l siguiente arranque." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "La so instalación de python ta toyida. Por favor, igüe l'enllaz simbólicu «/" "usr/bin/python»." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "El paquete 'debsig-verify' ta instaláu" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -370,12 +371,12 @@ "Desinstálalu con synaptic o «apt-get remove debsig-verify» primero y executa " "l'anovamientu otra vegada." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Nun pue escribise en «%s»" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -386,11 +387,11 @@ "L'anovamientu nun pue continuar.\n" "Asegúrate de que'l direutoriu de sistema permite escribir." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "¿Incluyir los caberos anovamientos dende Internet?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -410,16 +411,16 @@ "nuevos anovamientos darréu de pasar a la nueva versión.\n" "Si respuendes «non» agora, la rede nun s'usará pa nada." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "deshabilitáu nel anovamientu a %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Nun s'atopó un espeyu válidu" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -439,11 +440,11 @@ "Si escueye «Non» encaboxaráse l'anovamientu." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "¿Xenerar fontes predeterminaes?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -457,11 +458,11 @@ "Tendríen d'amestase les entraes predeterminaes pa '%s'? Si respuendes 'Non', " "encaboxaráse l'anovamientu." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Información del repositoriu non válida" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -469,11 +470,11 @@ "L'anovamientu de la información del repositoriu dio como resultáu un ficheru " "inválidu polo que ta aniciándose un procesu de notificación d'errores." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Desactivar fontes de terceres partes" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -483,13 +484,13 @@ "a activales tres l'anovamientu cola ferramienta «Oríxenes del software», o " "col xestor de paquetes." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Paquete nun estáu inconsistente" msgstr[1] "Paquetes nun estáu inconsistente" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -508,11 +509,11 @@ "nun s'alcuentren en dengún repositoriu. Por favor, reinstale los paquetes " "manualmente o desinstálelos del sistema" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Fallu durante l'anovamientu" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -521,13 +522,13 @@ "rede, polo qu'encamentámoste que compruebes la conexón de rede y tornes a " "intentalo." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Nun hai suficiente espaciu llibre en discu" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -542,21 +543,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Calculando los cambeos" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "¿Quies aniciar l'anovamientu?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Anovamientu encaboxáu" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -564,12 +565,12 @@ "L'anovamientu va encaboxase agora y el sistema va volver al so estáu " "orixinal. Pues reanudar l'anovamientu más sero." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Nun se puede descargar les actualizaciones" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -580,27 +581,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Error durante la confirmación" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Restaurando al estau del sistema orixinal" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Nun pudieron instalase los anovamientos" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -608,7 +609,7 @@ "Encaboxóse l'anovamientu. Pue que'l sistema quedare nun estáu non usable. " "Agora, va facese una recuperación (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -625,7 +626,7 @@ "upgrade al informe d'error.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -633,20 +634,20 @@ "Encaboxóse l'anovamientu. Por favor, comprueba la conexón a Internet o el " "sofitu d'instalación y vuelvi a intentalo. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "¿Desaniciar paquetes obsoletos?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Caltener" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Esborrar" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -656,27 +657,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Dependencia requería nun ta instalada" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "La dependencia requería «%s» nun ta instalada. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Comprobando'l xestor de paquetes" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Falló la tresna del anovamientu" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -684,11 +685,11 @@ "Hebo un fallu al preparar el sistema pal anovamientu poro, ta arrancando un " "procesu de notificación de fallos." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Falló la tresna del anovamientu" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -701,68 +702,68 @@ "\n" "Adicionalmente, ta aniciándose un procesu de notificación d'errores." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Anovando información del repositoriu" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Fallu al amestar el CDROM" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Sentímoslo, nun pudo amestase'l CDROM" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Información del paquete nun válida" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Descargando" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Anovando" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Completóse l'anovamientu" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "L'anovamientu completóse pero hebo fallos durante'l procesu." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Buscando software obsoletu" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "anovamientu del sistema completáu" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "L'anovamientu parcial completóse." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "Ta usándose «evms»" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -772,12 +773,12 @@ "software «evms» yá nun ta sofitáu; por favor, desactívalu y torna a executar " "de nuevo l'anovamientu." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "El hardware de gráficos nun ye compatible dafechu con Ubuntu 12.04 LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -789,9 +790,9 @@ "información llei https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx " "¿Quies siguir col anovamientu?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -800,8 +801,8 @@ "rendimientu de los xuegos y otros programes qu'usen gráficos de mou " "intensivu." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -815,7 +816,7 @@ "\n" "¿Quier continuar?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -829,11 +830,11 @@ "\n" "¿Quier continuar?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "La CPU nun ye i686" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -845,11 +846,11 @@ "arquiteutura mínima. Nun ye posible anovar el sistema a una versión nueva " "d'Ubuntu con esti hardware." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "No ARMv6 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -861,11 +862,11 @@ "ARMv6 como arquiteutura mínima. Nun ye dable anovar el so sistema a la nueva " "versión d'Ubuntu con esti hardware." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "El degorriu init nun ta disponible" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -881,15 +882,15 @@ "\n" "¿Daveres que quies siguir?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Anovamientu de prueba usando aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Usar la ruta pa guetar un cdrom con paquetes d'anovación" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -897,58 +898,58 @@ "Usar interfaz d'usuariu. Anguaño disponibles: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*OBSOLETU* esta opción va inorase" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Facer namái un anovamientu parcial (nun se reescribirá el «sources.list»)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Desactiva'l sofitu de pantalla GNU" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Afitar datadir" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Por favor, inserta '%s' nel dispositivu '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "La descarga completóse" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Descargando ficheru %li de %li a %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Falten al rodiu de %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Descargando ficheru %li de %li" @@ -958,27 +959,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Aplicando cambeos" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "problemes de dependencies - déxase ensin configurar" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Nun puede istalase '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -990,7 +991,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -999,7 +1000,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1007,20 +1008,20 @@ "Perderá tolos cambeos que tenga fecho nesi ficheru de configuración si " "decide sustituyilu por una nueva versión." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "El comandu 'diff' nun fue atopau" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Ocurrió un error fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1033,13 +1034,13 @@ "El ficheru sources.list orixinal guardóse en /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Calcóse Ctrl-C" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1048,136 +1049,136 @@ "¿Daveres que quier facer eso?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Pa prevenir la perda de datos, zarra toles aplicaciones y documentos " "abiertos." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Yá nun ta sofitáu téunicamente por Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Desanovar (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Desaniciar (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Yá nun fai falta (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Instalar (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Anovar (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Cambéu de preséu" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Amosar diferencies >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Soverar diferencies" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Fallu" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Encaboxar" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Zarrar" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Amosar terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Soverar terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Información" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Detalles" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Yá nun ta sofitáu %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Esaniciar %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Desaniciar (autoinstalóse) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Instalar %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Anovar %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Necesítase reaniciar" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Reanicia'l sistema pa completar l'anovamientu" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Reaniciar agora" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1189,32 +1190,32 @@ "El sistema podría quedar nun estáu non usable si encaboxa l'anovamientu. " "Encamentámos-y que siga col anovamientu." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "¿Encaboxar l'anovamientu?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li día" msgstr[1] "%li díes" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li hora" msgstr[1] "%li hores" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minutu" msgstr[1] "%li minutos" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1230,7 +1231,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1244,14 +1245,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1261,34 +1262,32 @@ "aproximadamente con un módem de 56k." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Esta descarga va tardar aproximadamente %s cola conexón actual. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Tresnando l'anovamientu" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Obteniendo nuevos canales de software" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Obteniendo paquetes nuevos" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Instalando los anovamientos" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Llimpiando" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1305,28 +1304,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "Va desinstalase %d paquete." msgstr[1] "Van desinstalase %d paquetes." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "Va instalase %d paquete nuevu." msgstr[1] "Van instalase %d paquetes nuevos." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "Va a anovase %d paquete." msgstr[1] "Van a anovase %d paquetes." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1337,7 +1336,7 @@ "\n" "Tienes de descargar un total de %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1345,7 +1344,7 @@ "Esti anovamientu pue llevar delles hores. Una vegada fine la descarga, el " "procesu nun pue encaboxase." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1353,53 +1352,53 @@ "Obtener ya instalar l'anovamientu pue llevar delles hores. Una vegada que " "fine la descarga, el procesu nun pue encaboxase." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "La desinstalación de los paquetes pue llevar delles hores. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "El software d'esti equipu ta anováu" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" "Nun hai anovamientos disponibles pal sistema. Encaboxóse l'anovamientu." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Necesítase reaniciar" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "L'anovamientu finó y necesítase reaniciar l'equipu. ¿Quies facelo agora?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "autentificar «%(file)s» escontra «%(signature)s» " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "estrayendo «%s»" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Nun pudo executase la ferramienta d'anovamientu" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1407,33 +1406,33 @@ "Esto paez ser un fallu na ferramienta d'anovamientu. Informa d'esti fallu " "usando la orde «ubuntu-bug update-manager»." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Robla de la ferramienta d'anovamientu" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Ferramienta d'anovamientu" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Fallu al descargar" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Falló la baxada del anovamientu. Pue haber un problema cola rede. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Falló l'autentificación" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1441,13 +1440,13 @@ "Falló l'autentificación de l'anovamientu. Ye dable qu'heba un problema cola " "rede o col sirvidor. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Fallu al sacar" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1455,13 +1454,13 @@ "Falló la estraición del anovamientu. Pue haber un problema cola rede o col " "sirvidor. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Falló la verificación" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1469,15 +1468,15 @@ "Falló la verificación del anovamientu. Pue haber un problema cola rede o col " "sirvidor. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Nun puede executase l'anovamientu" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1485,13 +1484,13 @@ "Esto davezu cáusalo un sistema nel que /tmp se montó como non executable. " "Vuelvi a montalu ensin «noexec» y executa otra vuelta l'anovamientu." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "El mensax de fallu ye «%s»" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1503,73 +1502,73 @@ "El ficheru sources.list original atroxóse en /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Albortando" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Pa quitar:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Pa continuar, calca Intro" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Siguir [sN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Detalles [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "s" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Yá nun ta sofitáu: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Quitar: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Instalar: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Anovar: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Continuar [Sn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1636,9 +1635,8 @@ msgstr "Anovamientu de la distribución" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Anovar Ubuntu a la versión 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Anovando Ubuntu a la versión 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1656,84 +1654,85 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Por favor, aguarde; esto pue llevar un tiempu." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Anovamientu completáu" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Nun s'alcontraron les notes de publicación" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Puede que'l sirvidor tea sobrocargáu. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Nun pudieron descargase les notes d'espublización" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Por favor, comprueba la conexón a Internet." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Anovar" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Notes de la versión" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Descargando ficheros de paquetes adicionales..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Ficheru %s de %s a %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Ficheru %s de %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Abrir vínculu nel restolador" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Copiar vínculu nel Cartafueyu" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Descargando ficheru %(current)li de %(total)li a %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Descargando ficheru %(current)li de %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "La to versión d'Ubuntu yá nun tien sofitu téunicu." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1741,53 +1740,59 @@ "Nun recibirás más igües de seguridá o anovamientos críticos. Anueva a una " "versión posterior d'Ubuntu." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Información d'anovamientu" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Instalar" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Nome" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Versión %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Nun se deteutaren conexones de rede, nun pue descargase la información del " "rexistru de cambeos." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Descargando la llista de cambeos..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Deseleicionar too" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Seleicion_ar too" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "Hai %(count)s anovamientu esbilláu." +msgstr[1] "Hai %(count)s anovamientos esbillaos." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "Va descargase %s." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "L'anovamientu yá se descargó, pero nun s'instaló." msgstr[1] "Los anovamientos yá se descargaron, pero nun s'instalaron." @@ -1795,11 +1800,18 @@ msgid "There are no updates to install." msgstr "Nun hai anovamientos pa instalar." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Desconozse'l tamañu de descarga." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1807,7 +1819,7 @@ "Nun se sabe cuándo foi la cabera vegada que s'anovó la información del " "paquete. Calca'l botón «Comprobar» p'anovar la información." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1818,14 +1830,14 @@ "calca'l botón «Comprobar» d'abaxo pa comprobar nuevos anovamientos de " "software." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "La información del paquete anovóse fai %(days_ago)s día." msgstr[1] "La información del paquete anovóse fai %(days_ago)s díes." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1838,34 +1850,46 @@ "%(hours_ago)s hores." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "La información de los paquetes anovóse fai %s minutos." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "La información de los paquetes acaba d'anovase." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Los anovamientos de software igüen fallos, desanicien vulnerabilidaes de " +"seguridá y apurren nueves funcionalidaes." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Puen esistir anovamientos disponibles pal equipu." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Bienveníu a Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Estos anovamientos de software s'asoleyaron dende que se llanzó esta versión " +"d'Ubuntu." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Hai anovamientos de software disponibles para esti ordenador." + +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1877,7 +1901,7 @@ "la to papelera y esborra paquetes temporales d'instalaciones usando 'sudo " "apt-get clean'." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1885,23 +1909,23 @@ "L'equipu necesita reaniciase pa finar l'anovamientu. Guarda tolos trabayos " "enantes de continuar." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Lleendo información de paquete" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Coneutando…" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "Nun puedes verificar anovamientos o baxar nuevos anovamientos." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Nun pudo anicializase la información de los paquetes" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1915,7 +1939,7 @@ "Por favor, informe d'ésto como un fallu nel paquete «update-manager» ya " "incluya'l siguiente mensax de fallu:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1927,31 +1951,31 @@ "Por favor, informe d'ésto como un fallu nel paquete «update-manager» ya " "incluya'l siguiente mensax de fallu:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Instalación nueva)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Tamañu: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "De la versión %(old_version)s a la %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Versión %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "L'anovamientu de versión nun ye posible nesti intre" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1960,21 +1984,21 @@ "L'anovamientu de versión nun ye posible nesti intre, inténtalo más sero. El " "sirvidor informó: «%s»" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Descargar la ferramienta d'anovamientu del llanzamientu" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Nueva versión d'Ubuntu '%s' disponible" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "L'índiz de software ta frañáu" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1984,6 +2008,17 @@ "de paquetes «Synaptic», o execute «sudo apt-get install -f» nuna terminal, " "pa correxir esti problema primero." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Ta disponible la nueva versión «%s»." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Encaboxar" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Guetar anovamientos" @@ -1993,22 +2028,18 @@ msgstr "Instalar tolos anovamientos disponibles" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Encaboxar" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Rexistru de cambeos" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Anovamientos" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Construyendo llista d'anovamientos" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2032,20 +2063,20 @@ " * Paquetes non oficiales de software, non provistos por Ubuntu\n" " * Cambeos normales nuna versión de pre-llanzamientu d'Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Descargando l'informe de cambeos" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Otros anovamientos (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "Esti anovamientu nun vien d'una fonte que soporte rexistru de cambeos." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2053,7 +2084,7 @@ "Hebo un fallu al descargar la llista de cambeos. \n" "Comprueba la conexón a Internet." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2066,7 +2097,7 @@ "Versión disponible: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2079,7 +2110,7 @@ "Por favor, use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "hasta que los cambeos tén disponibles, o prebe de nuevu más sero." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2092,52 +2123,43 @@ "Por favor, use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "hasta que los cambeos tean disponibles, o téntelo más sero." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Fallu al deteutar la distribución" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Hebo un fallu «%s» mientres se comprobaba qué sistema ta usando." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Anovamientos importantes de seguridá" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Anovamientos encamentaos" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Anovamientos propuestos (proposed)" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backports" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Anovamientos de la distribución" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Otros anovamientos" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Aniciando Update Manager" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Los anovamientos de software igüen fallos, desanicien vulnerabilidaes de " -"seguridá y apurren nueves funcionalidaes." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Anovamientu parcial" @@ -2209,37 +2231,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Anovamientos de software" +msgid "Update Manager" +msgstr "Xestor d'anovamientos" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Anovamientos de software" +msgid "Starting Update Manager" +msgstr "Aniciando'l Xestor d'anovamientos" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Anovar" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "anovamientos" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Instalar" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Cambeos" +msgid "updates" +msgstr "anovamientos" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Descripción" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Descripción del anovamientu" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2247,24 +2259,34 @@ "Agora tas coneutáu n'itinerancia y pues tener cargos polos datos consumíos " "nesti anovamientu." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Tas coneutáu vía módem inalámbricu." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Ye conveniente coneutar l'equipu a la toma de corriente enantes d'anovar." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Instalar anovamientos" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Cambeos" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Configuración..." +msgid "Description" +msgstr "Descripción" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Instalar" +msgid "Description of update" +msgstr "Descripción del anovamientu" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Configuración..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2287,9 +2309,8 @@ msgstr "Decidisti non anovar a la nueva versión d'Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Puedes anovar más alantre abriendo'l Xestor d'anovamientos y calcando en " @@ -2303,57 +2324,57 @@ msgid "Show and install available updates" msgstr "Amosar ya instalar los anovamientos disponibles" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Amosar la versión y salir" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Direutoriu que contién los ficheros de datos" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Comprobar si esiste una versión nueva d'Ubuntu" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Comprobar si ye dable anovar a la cabera versión de desendolcu" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "Anovar usando la versión más recién propuesta pol anovador" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Nun poner el focu sobro'l mapa cuando s'anicie" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Tente d'executar dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Nun comprobar anovamientos al aniciar" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Comprobar l'anovamientu nuna capa aufs de caxa de sable (sandbox)" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Executando un anovamientu parcial" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Amosar la descripción del paquete en cuenta de la llista de cambeos" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Intenta anovar a la cabera versión usando l'anovador de $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2363,11 +2384,11 @@ "Anguaño sofiténse los moos «desktop» (p'anovamientos normales d'un sistema " "d'escritoriu) y «server» (pa sirvidores)." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Executar la interface especificada" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2375,11 +2396,11 @@ "Namái comprueba si ta disponible una nueva versión de la distribución ya " "informa del resultáu per aciu d'un códigu de salida" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Comprobar si hai una versión nueva d'Ubuntu" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2387,68 +2408,68 @@ "Pa saber más tocante a esti anovamientu, visita:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Nun s'alcontró denguna edición nueva" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Ta disponible la nueva versión «%s»." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Executar 'do-release-upgrade' p'anovase a élli." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Ta disponible l'anovamientu de versión a Ubuntu %(version)s" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Decidisti nun anovar a Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Amestar resultáu de la depuración" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Amosar paquetes ensin sofitu nesta máquina" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Amosar paquetes con sofitu nesta máquina" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Amosar tolos paquetes colos sos estaos" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Amosar tolos paquetes nuna llista" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Resume d'estáu de sofitu de «%s»:" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "Tienes %(num)s paquetes (%(percent).1f%%) con sofitu hasta %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "Tienes %(num)s paquetes (%(percent).1f%%) que nun puen descargase más" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "Tienes %(num)s paquetes (%(percent).1f%%) ensin sofitu" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2456,124 +2477,154 @@ "Executa con --show-unsupported, --show-supported o --show-all pa ver más " "detalles" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Nun puen descargase más:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Ensin sofitu téunicu: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Con sofitu téunicu hasta %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Ensin sofitu téunicu" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Métodu non implementáu: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Un ficheru en discu" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "paquete .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Instalar paquete que falta." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Ha instalase'l paquete %s" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "paquete .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "Tien de conseñase %s como instaláu manualmente." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"Al anovar, si kdelibs4-dev ta instaláu, hai qu'instalar tamién kdelibs5-" -"dev. Llea bugs.launchpad.net , bug #279621 pa más detalles" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i entraes obsoletes nel ficheru d'estáu" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Entraes obsoletes n'estáu de dpkg" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Entraes d'estáu dpkg obsoletes" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"Al anovar, si kdelibs4-dev ta instaláu, hai qu'instalar tamién kdelibs5-" +"dev. Llea bugs.launchpad.net , bug #279621 pa más detalles" + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "Tien de conseñase %s como instaláu manualmente." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Desaníciase LILO yá que GRUB tamién ta instaláu (Consulte'l bug #314004 pa " "más información.)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Dempués de que la información del paquete s'anovare, nun s'alcuentra'l " -#~ "paquete esencial «%s», polo que ta aniciándose un procesu de notificación " -#~ "d'errores." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Anovando Ubuntu a la versión 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "Hai %(count)s anovamientu esbilláu." -#~ msgstr[1] "Hai %(count)s anovamientos esbillaos." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Bienveníu a Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Estos anovamientos de software s'asoleyaron dende que se llanzó esta " -#~ "versión d'Ubuntu." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Hai anovamientos de software disponibles para esti ordenador." - -#~ msgid "Update Manager" -#~ msgstr "Xestor d'anovamientos" - -#~ msgid "Starting Update Manager" -#~ msgstr "Aniciando'l Xestor d'anovamientos" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Tas coneutáu vía módem inalámbricu." - -#~ msgid "_Install Updates" -#~ msgstr "_Instalar anovamientos" +#~ "Dempués de que la información del paquete s'anovare, nun s'alcuentra'l " +#~ "paquete esencial «%s», polo que ta aniciándose un procesu de notificación " +#~ "d'errores." #~ msgid "Checking for a new ubuntu release" #~ msgstr "Comprobar si hai una nueva versión d'Ubuntu" @@ -2672,6 +2723,9 @@ #~ "update-manager» nuna terminal ya inclúi los ficheros de /var/log/dist-" #~ "upgrade/ nel informe de fallu." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Anovar Ubuntu a la versión 11.10" + #~ msgid "Your graphics hardware may not be fully supported in Ubuntu 11.04." #~ msgstr "" #~ "Paez que'l to hardware gráficu nun tien sofitu ensembre n'Ubuntu 11.04." diff -Nru update-manager-17.10.11/po/az.po update-manager-0.156.14.15/po/az.po --- update-manager-17.10.11/po/az.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/az.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-04-06 21:02+0000\n" "Last-Translator: Emin Mastizadeh \n" "Language-Team: Azerbaijani \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s üçün Server" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Əsas server" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Şəxsi Server" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Heçbir paket faylı tapılmadı, bu ya Ubuntu Diski deyil ya da quruluşu " "səhvdir." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "CD-ni əlavə etmək mümkün olmadı" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,13 +83,13 @@ "Xəta məlumatı bu idi:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Pis (xarab) vəziyyətdə olan paketi sil." msgstr[1] "Pis (xarab) vəziyyətdə olan paketləri sil." -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -109,15 +110,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Server həddən artıq yüklənmiş ola bilər" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Xarab paketlər" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -126,7 +127,7 @@ "əvvəlcə onları synaptic və ya apt-get ilə düzəldin." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -147,66 +148,66 @@ "* Ubuntu tərəfəindən təmin olunmayan qeyrirəsmi proqram paketləri\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Böyük ehtimalla, bu keçici problemdir. Xahiş edirik 1 az sonra cəhd edin" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Təzələmə hesablana bilmədi" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "'%s' qurula bilmir" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Meta-paketlər müəyyən olunabilmədi" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -215,15 +216,15 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Arxiv oxunur" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Eksklüziv Qıfılı almaq olmur" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -232,11 +233,11 @@ "kimi) artıq işlədiyi mənasına gəlir. Xahiş olunur əvvəlcə o programı " "bağlayın." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Uzaqdan idarəetmə ilə yenilənmə mümkün deyildir" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -245,11 +246,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "SSH altında işləməyə davam edilsin?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -260,11 +261,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Əlavə sshd başladılır" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -272,7 +273,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -281,29 +282,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Yenilənmək mümkün deyil" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -313,28 +314,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -342,11 +343,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -358,16 +359,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -380,11 +381,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -393,34 +394,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Saxlanc məlumatı xətalıdır" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -433,23 +434,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Yeniləmə vaxtı xəta" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Kifayət qədər boş disk sahəsi yoxdur" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -460,32 +461,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Sistemin yenilənməsini başlamaq istəyirsinizmi?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Yeniləmələr endirilə bilmədi" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -493,33 +494,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Yeniləmələr qurula bilmədi" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -530,26 +531,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Saxla" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Sil" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -557,37 +558,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Paket idarəçisi yoxlanır" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Yeniləmənin hazırlanması alınmadı" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -595,79 +596,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Saxlanc məlumatı yenilənir" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Xətalı paket məlumatı" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Yenilənir" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Sistemin yenilənməsi başa çatdı." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -675,16 +676,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -693,7 +694,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -702,11 +703,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -714,11 +715,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -726,11 +727,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -740,71 +741,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Xaiş olunur '%s' mənbəyini '%s' sürücüsünə yerləşdirin" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Paketlərin alınması başa çatdı" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Təxminən %s qalıb" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -814,27 +815,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Dəyişikliklər tətbiq olunur" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "'%s' qurula bilmədi" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -844,7 +845,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -855,26 +856,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "'dif' əmri tapılmadı" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -882,148 +883,148 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Terminalı Göstər >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Təfsilatlar" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "%s paketini təzələ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" "Təzələməni başa çatdırmaq üçün sistemi yenidən başladın" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "İndi _yenidən başlad" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1031,32 +1032,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Təzələmə Dayandırılsın?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1072,7 +1073,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1086,14 +1087,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1101,34 +1102,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Təmizlənir" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1141,28 +1140,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d paket silinəcək" msgstr[1] "%d paket silinəcək" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d yeni paket qurulacaq" msgstr[1] "%d yeni paket qurulacaq" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d paket təzələnəcək" msgstr[1] "%d paket təzələnəcək" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1170,147 +1169,147 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "Sisteminiz üçün heç bir təzələmə yoxdur. Təzələmə indi dayandırılacaq." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Sistemin yenidən başladılması vacibdir" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Təzələmə başa çatdı sistemi təzədən başlatmaq lazımdır. Siz bunu indi etmək " "istəyirsinizmi?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Təzələmə alətini işlətmək olmadı" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Təzələmə aləti" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Alına bilmədi" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "İxrac edilə bilmədi" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1318,73 +1317,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1442,7 +1441,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1461,166 +1460,180 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Xaiş olunur gözləyin, bu bir qədər vaxt alacaq." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Yeniləmə başa çatdı" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Buraxılış qeydləri tapılmadı" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Server yüklənmiş ola bilər. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Buraxılış qeydləri endirilə bilmədi" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "İnternet əlaqənizi yoxlayın." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "%(total)li fayldan %(current)li endirilir" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "%s versiyası: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Dəyişikliklərin siyahısı endirilir..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "Server yüklənmiş ola bilər. " -msgstr[1] "Server yüklənmiş ola bilər. " +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1629,34 +1642,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1664,29 +1685,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1695,7 +1716,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1703,52 +1724,52 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Həcm: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "%s versiyası" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1758,6 +1779,16 @@ "qaldımaq üçün öncə \"Synaptic\" paket idarəçisindən istifadə edin və ya " "terminalda \"sudo apt-get install -f\" əmrini icra edin." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1767,22 +1798,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1796,26 +1823,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1824,7 +1851,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1833,7 +1860,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1842,48 +1869,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Vacib təhlükəsizlik yeniləmələri" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Məsləhət görülən yeniləmələri" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Təklif olunan yeniləmələr" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Distributiv yeniləmələri" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Digər yeniləmələri" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Təzələmə başladılsın?" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1944,57 +1964,58 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" -msgstr "" +msgid "Update Manager" +msgstr "Yeniləmə İdarəçisi" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Təzələ" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "yeniləmələr" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Dəyişikliklər" +msgid "updates" +msgstr "yeniləmələr" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "İzah" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Distributiv yeniləmələri" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "Yeniləmələri _Qur" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Dəyişikliklər" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "" +msgid "Description" +msgstr "İzah" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "İndi _yenidən başlad" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2018,7 +2039,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -2030,222 +2051,282 @@ msgid "Show and install available updates" msgstr "Mövcud yeniləmələri göstər və qur" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Yeniləmə İdarəçisi" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "Yeniləmələri _Qur" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" diff -Nru update-manager-17.10.11/po/be.po update-manager-0.156.14.15/po/be.po --- update-manager-17.10.11/po/be.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/be.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-04-13 00:57+0000\n" "Last-Translator: Soltan Dzmitry \n" "Language-Team: Belarusian \n" @@ -21,7 +22,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -30,13 +31,13 @@ msgstr[2] "%(size).0f КБ" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f МБ" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Сервер для %s" @@ -44,20 +45,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Галоўны сервер" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Адмысловыя серверы" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Немагчыма разлічыць запіс sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -65,11 +66,11 @@ "Немагчыма адшукаць ніводнага файла з пакетам, верагодна, гэты дыск не " "з'яўляецца Ubuntu ці мае іншую архітэктуру." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Немагчыма дадаць дыск" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -84,14 +85,14 @@ "Тэкст памылкі:\n" "\"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Выдаліць пакет, пазначаны як памылковы" msgstr[1] "Выдаліць пакеты, пазначаныя як памылковыя" msgstr[2] "Выдаліць пакеты ў кепскім стане" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -113,15 +114,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Магчыма сервер перагружаны" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Пакеты з памылкамі" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -131,7 +132,7 @@ "перш чым працягваць." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -152,11 +153,11 @@ " * неафіцыйных праграм, якія не пастаўляюцца з Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Магчыма, гэта часовая праблема. Паспрабуйце паўтарыць пазней." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -164,16 +165,16 @@ "Калі з прапанаванага нічога не пасуе, калі ласка, адпраўце гэту справаздачу, " "выкарыстоўваючы ў тэрмінале каманду 'ubuntu-bug update-manager'" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Немагчыма падлічыць абнаўленне" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Памылка аўтэнтыфікацыі некаторых пакетаў" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -183,28 +184,28 @@ "праблемы з сеткай. Вы можаце паспрабаваць паўтарыць дзеяньне пазней. " "Глядзіце ніжэй спіс неаўтэнтыфікаваных пакетаў." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "Пакет “%s“ пазначаны для выдалення, але ён у чорным спісе выдалення." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Важны пакет “%s“ пазначаны для выдалення." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Спроба ўсталёўкі ўнесенай у чорны спіс версіі '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Немагчыма ўсталяваць \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -213,11 +214,11 @@ "выкарыстоўваючы ў тэрмінале каманду 'ubuntu-bug update-manager'" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Немагчыма вызначыць мета-пакет" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -231,15 +232,15 @@ "Калі ласка, найперш усталюйце адзін з вышэй узгаданых пакетаў з дапамогай " "synaptic ці apt-get." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Чытанне кэша" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Памылка пры праверцы аўтэнтычнасці некаторых пакетаў" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -247,11 +248,11 @@ "Звычайна, гэта азначае, што іншы кіраўнік пакетаў (напрыклад apt-get ці " "aptitude) ужо працуе. Калі ласка, закройце іншае дастасаванне." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Апгрэйд праз аддаленае падлучэнне не падтрымліваецца" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -264,11 +265,11 @@ "\n" "Абнаўленне прыпынена. Паспрабуйце без ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Працягваць выкананне праз SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -284,11 +285,11 @@ "Калі Вы працягнеце, дадатковая служба ssh будзе запушчана на порце «%s».\n" "Жадаеце працягнуць?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Запуск дадатковай sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -299,7 +300,7 @@ "запушчаная дадатковая служба sshd. Калі нешта здарыцца, з дапамогай ssh Вы " "зможаце далучыцца да дадзенай службы.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -312,29 +313,29 @@ "можаце адкрыць наступны спосабам:\n" "«%s» порт." -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Немагчыма абнавіць" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Абнаўленне ад '%s' да '%s' не падтрымліваецца дадзенай прыладай." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Усталёўка бяспечнага асяроддзя не атрымалася" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Не атрымалася стварыць бяспечнае асяроддзе." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Рэжым бяспечнага асяроддзя («пясочніцы»)" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -349,18 +350,18 @@ "Да наступнай перазагрузкі ніякіх зменаў у сістэмным каталогу праводзіцца не " "будзе." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Python усталяваны некарэктна. Калі ласка, выпраўце сімвалічную спасылку \"/" "usr/bin/python\"." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Пакет 'debsig-verify' усталяваны" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -370,12 +371,12 @@ "Спачатку выдаліце яго ў Synaptic або з дапамогай 'apt-get remove debsig-" "verify' і запуьціце абнаўленне ізноў." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Немагчыма запісаць у '%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -386,11 +387,11 @@ "можа працягвацца.\n" " Калі ласка, пераканайцеся ў наяўнасці доступу да сістэмнага каталога." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Загрузіць апошнія абнаўленні з інтэрнэту?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -410,16 +411,16 @@ "усталяваць апошнія абнаўленні як мага хутчэй.\n" "Калі вы адкажаце «Не», то абнаўленні праз Інтэрнет загружаны ня будуць." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "заблакавана пры абнаўленні да %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Не знойдзена ніводнага дзейснага люстэрка" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -440,11 +441,11 @@ "Калі ж Вы абярэце «Не», то абнаўленне будзе адменена." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Згенераваць крыніцы па змаўчанні?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -456,21 +457,21 @@ "\n" "Дадаць стандартны запіс для '%s'? Выбар «Не» азначае адмову ад абнаўлення." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Інфармацыя аб сховішчы няслушная" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Зыходнікі ад трэціх бакоў - адключаныя" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -480,14 +481,14 @@ "зможаце іх зноў уключыць пасля абнаўлення з дапамогай утыліты «Крыніцы " "ўсталёўкі» альбо вашага мэнэджара пакункаў." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Пакунак у нестабільным стане" msgstr[1] "Пакункі ў няўстойлівым стане" msgstr[2] "Пакункаў у наўстойлівым стане" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -510,11 +511,11 @@ "знойдзены адпаведныя архівы. Калі ласка, пераўсталюйце гэтыя пакункі уручную " "альбо выдаліце іх з сістэмы." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Памылка падчас абнаўлення" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -522,13 +523,13 @@ "Пры абнаўленні паўстала праблема. Звычайна гэта бывае выклікана праблемамі ў " "сетцы. Праверце сеткавыя злучэнні і паспрабуйце яшчэ." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Бракуе дыскавае прасторы" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -543,21 +544,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Падлічыць змены" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Ці жадаеце пачаць абнаўленне?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Абнаўленне скасавана" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -565,12 +566,12 @@ "Гэта абнаўленне будзе зараз скасавана і адбудзецца аднаўленне зыходнага " "стану сістэмы. Вы можаце працягнуць гэта абнаўленне пазней." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Не атрымалася загрузіць абнаўленні" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -581,27 +582,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Памылка пры фіксаванні" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Аднаўленне першапачатковага стану сістэмы" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Немагчыма ўсталяваць абнаўленні" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -610,7 +611,7 @@ "для нармальнага выкарыстання. Зараз будзе запушчаны працэс аднаўлення (dpkg " "--configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -621,7 +622,7 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -629,20 +630,20 @@ "Абнаўленне спыненае. Калі ласка праверце злучэнне з Інтэрнэтам, альбо іншую " "крыніцу ўсталёўкі і паспрабуйце зноў. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Выдаліць састарэлыя пакеты?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "За_хаваць" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Выдаліць" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -650,37 +651,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Неабходныя залежнасці не ўсталяваныя" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Неабходныя залежнасці \"%s\" не ўсталяваныя. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Праверка мэнэджара пакетаў" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Збой падрыхтоўкі да абнаўлення" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Падрыхтоўка да абнаўлення завяршылася няўдала" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -688,69 +689,69 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Абнаўленне інфармацыі аб сховішчы" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Дадаванне кампакт-дыска завяршылася няўдала" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Выбачайце, даданне кампакт-дыска завяршылася няўдала." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Некарэктная інфармацыя аб пакеце" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Атрыманне" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Абнаўленне" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Абнаўленне скончана" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "Абнаўленне скончана, аднак падчас працэсу абнаўлення здарыліся памылкі." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Пошук састарэлых праграм" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Абнаўленне сістэмы завершана" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Частковае абнаўленне завершана." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms ужываецца" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -760,11 +761,11 @@ "'evms' болей не падтрымліваецца. Калі ласка, зачыніце яе і запусціце " "абнаўленне зноў." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -772,9 +773,9 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -782,8 +783,8 @@ "Абнаўленне можа выклікаць зніжэнне якасці эфектаў працоўнага стала і " "прадукцыйнасці ў гульнях і праграмах, што актыўна выкарыстоўваюць графіку." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -796,7 +797,7 @@ "\n" "Працягнуць?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -810,11 +811,11 @@ "\n" "Працягнуць?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Няма i686-сумяшчальнага працэсара" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -826,11 +827,11 @@ "архітэктуру i686 і вышэй. Абнавіць вашу сістэму да новай версіі Ubuntu на " "гэтым кампутары не атрымаецца." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Няма працэсара ARMv6" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -842,11 +843,11 @@ "ARMv6 і вышэй. Вашу сістэму немагчыма абнавіць да новага рэлізу Ubuntu з " "бягучым апаратным забеспячэннем." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Служба init недаступна" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -860,16 +861,16 @@ "\n" "Вы ўпэўнены, што хочаце працягнуць?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Абнаўленне ў бяспечным асяроддзі з дапамогай aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Выкарыстоўваць дадзены шлях для пошука кампакт-дыска з пакункамі абнаўленняў." -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -877,58 +878,58 @@ "Выкарстоўваць інтэрфэйс. Зараз даступны: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "Гэты параметр САСТАРЭЎ і не будзе ўлічвацца" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Падрыхтаваць толькі частковае абнаўленне (sources.list ня будзе перазапісаны)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Адключыць падтрымку экрана GNU" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Наладзіць каталог з дадзенымі" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Калі ласка, устаўце \"%s\" у прыладу \"%s\"" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Загрузка скончана" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Загрузка файла %li з %li на хуткасці %sБайт/с" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Засталося прыблізна %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Загрузка файла %li з %li" @@ -938,27 +939,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Ужыванне зменаў" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "праблемы залежнасьцяў — пакідаем неналаджанымі" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Немагчыма ўсталяваць \"%s\"" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -971,7 +972,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -982,7 +983,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -990,20 +991,20 @@ "Вы страціце ўсе змены, якія зрабілі ў гэтым файле канфігурацыі, калі " "заменіце яго новай версіяй." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Ня знойдзена праграма \"diff\"" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Адбылася крытычная памылка" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1016,13 +1017,13 @@ "Ваш арыгінальны файл sources.list быў захаваны ў /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "націснута Ctrl-c" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1031,135 +1032,135 @@ "Вы сапраўды хочаце зрабіць гэта ?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Каб пазбегнуць страты дадзеных, зачыніце ўсе адчыненыя праграмы і дакументы." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Больш не падтрымліваецца Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Усталяванне старой версіі (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Выдаліць (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Больш не патрэбны (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Усталяваць (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Абнавіць (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Змена носьбіта" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Паказаць адрозненні >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Схаваць адрозненні" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Памылка" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Скасаваць" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Зачыніць" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Паказаць тэрмінал >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Схаваць тэрмінал" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Інфармацыя" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Дэталі" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Больш не падтрымліваецца (%s)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Выдаліць %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Выдаліць %s (было ўсталявана аўтаматычна)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Усталёўка %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Абнаўленне %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Патрабуецца перазагрузка" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Перагрузіце сістэму для завяршэння абнаўлення" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "Пера_запусціць" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1170,11 +1171,11 @@ "Калі вы перапыніце абнаўленне, сістэма можа працаваць нестабільна. " "Настойліва рэкамендуем працягваць абнаўленне." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Скасаваць абнаўленне?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" @@ -1182,7 +1183,7 @@ msgstr[1] "%li дні" msgstr[2] "%li дзён" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" @@ -1190,7 +1191,7 @@ msgstr[1] "%li гадзіны" msgstr[2] "%li гадзін" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" @@ -1198,7 +1199,7 @@ msgstr[1] "%li хвіліны" msgstr[2] "%li хвілін" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1215,7 +1216,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1229,14 +1230,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1246,34 +1247,32 @@ "злучэнні на хуткасці 56Кбіт." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Загрузка працягнецца прыкладна %s на Вашам далучэнні. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Падрыхтоўка да абнаўлення" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Змена крыніц усталёўкі" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Атрымаць новыя пакеты" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Усталяваць абнаўленні" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Ачыстка" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1293,7 +1292,7 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." @@ -1301,7 +1300,7 @@ msgstr[1] "%d пакеты будзе выдалена." msgstr[2] "%d пакетаў будзе выдалена." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." @@ -1309,7 +1308,7 @@ msgstr[1] "%d новых пакеты будзе ўсталявана." msgstr[2] "%d новых пакетаў будзе ўсталявана." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." @@ -1317,7 +1316,7 @@ msgstr[1] "%d пакеты будзе абноўлена." msgstr[2] "%d пакетаў будзе абноўлена." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1328,63 +1327,63 @@ "\n" "Усяго неабходна загрузіць %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "Для вашае сістэмы няма абнаўленняў. Абнаўленне будзе скасавана." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Патрабуецца перазагрузка" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "Абнаўленне скончанае і патрабуецца перазагрузка. Перазагрузіцца зараз?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "аўтэнтыфікаваць '%(file)s' замест '%(signature)s' " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Не атрымалася запусціць сродак абнаўлення" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1392,33 +1391,33 @@ "У праграме абнаўлення, верагодна, памылка. Калі ласка, адпраўце справаздачу, " "выкарыстоўваючы ў тэрмінале каманду 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Подпіс прылады абнаўлення" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Прылада абнаўлення" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Не магу атрымаць" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Не магу атрымаць абнаўленне. Магчыма, паўстала праблема з сецівам. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Няўдалая ідэнтыфікацыя" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1426,13 +1425,13 @@ "Праверка ідэнтыфікацыі абнаўлення не атрымалася. Магчыма, паўстала праблема " "з сецівам або на серверы. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Не магу выняць" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1440,13 +1439,13 @@ "Не атрымалася выняць абнаўленне. Магчыма, паўстала праблема з сецівам або на " "серверы. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Праверка не атрымалася" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1454,15 +1453,15 @@ "Праверка абнаўлення завяршылася няўдала. Магчыма, паўстала праблема з " "сецівам або на серверы. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Не атрымалася запусціць працэс абнаўлення" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1470,13 +1469,13 @@ "Звычайна паўстае ў сістэме, дзе / tmp змантаваны пад noexec. Калі ласка, " "перамантуйце без noexec і запусціце абнаўленне зноў." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Паведамленне аб памылцы «%s»." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1489,73 +1488,73 @@ "Імя арыгінальнае sources.list быў захаваны ў /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Абарваць" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Паніжана:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Каб працягнуць, націсніце [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Працягнуць [тН] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Дэталі [д]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "н" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "д" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Больш не падтрымліваецца: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Выдаліць: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Усталяваць: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Абнавіць: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Працягнуць [Тн] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1622,9 +1621,8 @@ msgstr "Абнавіць дыстрыбутыў" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Абнаўленне Ubuntu да версіі 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Абнаўленне Ubuntu да версіі 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1642,147 +1640,161 @@ msgid "Terminal" msgstr "Тэрмінал" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Калі ласка, пачакайце. Гэта можа заняць пэўны час." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Абнаўленне завершана" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Не атрымалася знайсці заўвагі да выпуску" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Магчыма, сервер перагружаны. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Не атрымалася загрузіць заўвагі да выпуску" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Калі ласка, праверце вашае злучэнне з інтэрнэтам." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Абнаўленне" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Нататкі да выпуску" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Загрузка дадатковых файлаў пакетаў ..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Файл %s з %s на хуткасці %sБ/с" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Файл %s з %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Адкрыць спасылку ў браўзары" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Капіяваць спасылку ў буфер" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Загрузка файла %(current)li з %(total)li з хуткасцю %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Загрузка файла %(current)li з %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Ваш выпуск Ubuntu больш не падтрымліваецца." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Інфармацыя аб абнаўленні" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Усталяваць" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Назва" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Версія %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "Не выяўлена сеткавае злучэнне, немагчыма загрузіць спіс змяненняў." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Загрузка спісу змяненняў ..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "С_кінуць усё" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Вылучыць _усе" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s абнаўленне абрана." +msgstr[1] "%(count)s абнаўленняў абрана." +msgstr[2] "%(count)s абнаўленняў абрана." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s будзе загружана." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "Абнаўленне ўжо загружана, але яшчэ не ўсталявана" -msgstr[1] "Абнаўленні ўжо загружаны, але яшчэ не ўсталяваныя" -msgstr[2] "Абнаўленьні ўжо запампаваныя, але яшчэ не ўсталяваныя" +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Загружаны памер невядомы." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1790,7 +1802,7 @@ "Невядома, калі інфармацыя аб пакеце была абноўлена апошнім разам. Калі " "ласка, націсніце кнопку \"Праверыць\" для абнаўлення гэтай інфармацыі." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1799,7 +1811,7 @@ "Інфармацыя аб пакетах была абноўлена %(days_ago)s дзён таму.\n" "Націсніце кнопку «Праверыць» для праверкі новых абнаўленняў праграм." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1807,7 +1819,7 @@ msgstr[1] "Інфармацыя аб пакетах была абноўлена %(days_ago)s дні таму." msgstr[2] "Інфармацыя аб пакетах была абноўлена %(days_ago)s дзён таму." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1817,34 +1829,44 @@ msgstr[2] "Інфармацыя аб пакетах была абноўлена %(hours_ago)s гадзінаў таму." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Інфармацыя аб пакеце была абноўлена прыкладна %s хвілін таму." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Інфармацыя аб пакеце была толькі што абноўлена." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Абнаўленні праграм выпраўляюць памылкі, уразлівасці і дадаюць новыя " +"магчымасці." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Магчыма прысутнічаюць абнаўленні праграм для вашага кампутара." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Вітаем у Ubuntu" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1856,7 +1878,7 @@ "выдаліце часовыя пакеты ўсталёвак, выканаўшы ў тэрмінале каманду 'sudo apt-" "get clean'." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1864,23 +1886,23 @@ "Для завяршэння ўсталёўкі абнаўленняў неабходна перазапусціць кампутар. Калі " "ласка, захавайце вынікі вашай працы перад тым, як працягнуць." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Чытанне інфармацыі аб пакетах" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Злучэнне..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "У вас недастаткова прывілеяў для праверкі ці зарузкі абнаўленняў." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Не атрымалася атрымаць інфармацыю аб пакунках" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1893,7 +1915,7 @@ "Калі ласка, паведаміце аб гэтай памылцы пакета «update-manager» і ўключыце " "гэтае паведамленне:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1905,31 +1927,31 @@ "Калі ласка, паведаміце аб гэтай памылцы пакета 'Мэнэджар абнаўленняў' і " "ўключыце гэтае паведамленне:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Новая ўсталёўка)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Памер: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "З версіі %(old_version)s на %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Версія %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Абнаўленьне выпуску зараз немагчымае" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1938,21 +1960,21 @@ "Абнаўленне рэлізу цяпер не можа быць выканана, паспрабуйце пазней. Сервер " "паведаміў: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Спампоўваецца праграма для абнаўлення дыстрыбутыва" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Даступны новы выпуск Ubuntu '%s'" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Пашкоджаны індэкс праграм" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1962,6 +1984,17 @@ "праблему з дапамогай \"Synaptic\" альбо выканаўшы ў тэрмінале \"sudo apt-get " "install -f\"." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Даступны новы выпуск '%s'." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Скасаваць" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Праверыць наяўнасць абнаўленняў" @@ -1971,22 +2004,18 @@ msgstr "Усталяваць ўсе даступныя абнаўленні" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Скасаваць" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Гісторыя зменаў" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Абнаўленні" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Фармуецца спіс абнаўленняў" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2010,21 +2039,21 @@ " * Неафіцыйнымі пакункамі, якія не падтрымліваюцца Ubuntu\n" " * Натуральнымі зменамі ў папярэдняй версіі Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Загрузка спісу змяненняў" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Іншыя абнаўленні (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" "Гэтае абнаўленне пастаўляецца крыніцай, што не падтрымлівае спісы зменаў." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2032,7 +2061,7 @@ "Памылка пры загрузцы спісу змен. \n" "Калі ласка, спраўдзьце вашае злучэнне з Інтэрнэтам." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2045,7 +2074,7 @@ "Даступная версія: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2059,7 +2088,7 @@ "+changelog\n" "пакуль змены ня будуць даступны альбо паспрабуйце яшчэ раз пазней." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2073,52 +2102,43 @@ "+changelog\n" "пакуль змены ня будуць даступны альбо паспрабуйце яшчэ раз пазней." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Не атрымалася вызначыць дыстрыбутыў" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Падчас праверкі вашае сістэмы адбылася памылка '%s'" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Важныя абнаўленні звязаныя з бяспекай" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Пажаданыя абнаўленні" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Прапанаваныя абнаўленні" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Адаптацыі з больш пазнейшых версій (backports)" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Абнаўленні дыстрыбутыва" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Іншыя абнаўленні" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Стартуе Мэнэджар абнаўленняў" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Абнаўленні праграм выпраўляюць памылкі, уразлівасці і дадаюць новыя " -"магчымасці." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Частковае абнаўленне" @@ -2189,37 +2209,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Абнаўленні праграмнага забеспячэння" +msgid "Update Manager" +msgstr "Мэнэджар абнаўленняў" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Абнаўленні праграмнага забеспячэння" +msgid "Starting Update Manager" +msgstr "Запуск Мэнэджара абнаўленняў" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "Аб_навіць" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "абнаўленні" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Усталяваць" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Змены" +msgid "updates" +msgstr "абнаўленні" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Апісанне" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Апісанне абнаўлення" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2227,25 +2237,35 @@ "Вы знаходзіцеся ў роўмінгу і з вас можа спаганяцца плата за дадзеныя, якія " "перадаюцца пры абнаўленні." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Вы падлучаны праз бесправадны мадэм." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Бяспечней будзе падлучыць кампутар да крыніцы сілкавання перад пачаткам " "абнаўлення." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Усталяваць абнаўленні" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Змены" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Налады..." +msgid "Description" +msgstr "Апісанне" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Усталяваць" +msgid "Description of update" +msgstr "Апісанне абнаўлення" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Налады..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2268,9 +2288,8 @@ msgstr "Вы адмовіліся ад абнаўлення да новай версіі Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Вы можаце абнавіць пазней, адчыніўшы Кіраўнік Абнаўленьняў і націснуўшы на " @@ -2284,58 +2303,58 @@ msgid "Show and install available updates" msgstr "Паказаць і ўсталяваць даступныя абнаўленні" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Паказаць версію і выйсці" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Тэчка, якая ўтрымлівае файлы дадзеных" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Праверыць, ці даступны новы рэліз Ubuntu" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "Праверка магчымасці абнаўлення да апошняй нестабільнай версіі дыстрыбутыва" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "Абнаўленне з выкарыстаннем апошняй версіі Мэнэджара абнаўленняў" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Не выбіраць картку пры запуску" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Паспрабаваць запусціць dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Не правяраць абнаўленні пад час запуску" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Пратэставаць абнаўленне ў бяспечным рэжыме" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Ідзе частковае абнаўленне" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Паспрабуйце абнавіцца да самага апошняга выпуска з дапамогай $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2345,11 +2364,11 @@ "Зараз падтрымліваецца рэгулярнае абнаўленьне для «настольных» і «серверных» " "сістэм." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Запусціць пазначаны інтэрфейс" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2357,11 +2376,11 @@ "Правяраць наяўнасць новай версіі дыстрыбутыва і вярнуць вынік з дапамогай " "кода выхаду" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2369,121 +2388,138 @@ "Каб атрымаць інфармацыю аб абнаўленні, наведайце:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Новы выпуск ня знойдзены" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Даступны новы выпуск '%s'." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Выканайце «do-release-upgrade», каб абнавіцца да яго." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Даступнае абнаўленне Ubuntu %(version)s" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Вы адмовіліся ад абнаўлення да Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Падтрымліваюцца да %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Нявыкананы метад: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Файл на дыску" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb пакет" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Усталяваць адсутнічаючыя пакункі." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Неабходна усталяваць пакунак %s." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb пакет" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s павінен быць пазначаны як усталяваны ўручную." +msgid "%i obsolete entries in the status file" +msgstr "Састарэлы змест %i у файле статусу" + +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "Састарэлы змест у статусе dpkg" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "Састарэлы змест станаў dpkg" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2492,51 +2528,73 @@ "kdelibs5-dev. Гэта баґ, аб якім можна пачытаць тут — bugs.launchpad.net, bug " "#279621" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "Састарэлы змест %i у файле статусу" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "Састарэлы змест у статусе dpkg" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "Састарэлы змест станаў dpkg" +msgid "%s needs to be marked as manually installed." +msgstr "%s павінен быць пазначаны як усталяваны ўручную." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Выдаліце lilo, калі grub ужо ўсталяваны. (Глядзіце bug #314004 для дэталяў)" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Абнаўленне Ubuntu да версіі 12.04" - -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s абнаўленне абрана." -#~ msgstr[1] "%(count)s абнаўленняў абрана." -#~ msgstr[2] "%(count)s абнаўленняў абрана." - -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" - -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Вітаем у Ubuntu" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Мэнэджар абнаўленняў" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "Starting Update Manager" -#~ msgstr "Запуск Мэнэджара абнаўленняў" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Вы падлучаны праз бесправадны мадэм." +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "_Усталяваць абнаўленні" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "Checking for a new ubuntu release" #~ msgstr "Праверыць наяўнасьць новага выпуску ubuntu" @@ -2631,6 +2689,9 @@ #~ msgid "Your system is up-to-date" #~ msgstr "Ваша сістэма не патрабуе абнаўлення" +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Абнаўленне Ubuntu да версіі 11.10" + #~ msgid "" #~ "You will not get any further security fixes or critical updates. Please " #~ "upgrade to a later version of Ubuntu Linux." @@ -2693,5 +2754,11 @@ #~ "быць абмежаванай, а таксама можа прывесці да паўстання памылак. Вы " #~ "сапраўды хочаце працягнуць абнаўленне?" +#~ msgid "The update has already been downloaded, but not installed" +#~ msgid_plural "The updates have already been downloaded, but not installed" +#~ msgstr[0] "Абнаўленне ўжо загружана, але яшчэ не ўсталявана" +#~ msgstr[1] "Абнаўленні ўжо загружаны, але яшчэ не ўсталяваныя" +#~ msgstr[2] "Абнаўленьні ўжо запампаваныя, але яшчэ не ўсталяваныя" + #~ msgid "%.0f kB" #~ msgstr "%.0f kB" diff -Nru update-manager-17.10.11/po/bg.po update-manager-0.156.14.15/po/bg.po --- update-manager-17.10.11/po/bg.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/bg.po 2017-12-23 05:00:38.000000000 +0000 @@ -4,11 +4,12 @@ # Rostislav "zbrox" Raykov , 2005. # # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-02-23 19:58+0000\n" "Last-Translator: Svetoslav Stefanov \n" "Language-Team: Bulgarian \n" @@ -21,7 +22,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -29,13 +30,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f МБ" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Сървър за %s" @@ -43,20 +44,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Основен сървър" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Сървъри по избор" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Не може да пресметне запис в sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -64,11 +65,11 @@ "Намирането на програмни пакети не бе успешно. Вероятно това не е диск с " "Убунту или е с неподходяща архитектура за вашата система?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Грешка при добавяне на CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -84,13 +85,13 @@ "Съобщението за грешка беше:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Премахване на пакет в лошо състояние" msgstr[1] "Премахване на пакети в лошо състояние" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -111,15 +112,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Сървърът може би е претоварен" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Повредени пакети" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -129,7 +130,7 @@ "продължите." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -150,11 +151,11 @@ " * Неофициални пакети, които не са предоставени от Убунту\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Това най-вероятно е временен проблем. Моля, опитайте отново по-късно." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -162,16 +163,16 @@ "Ако нищо от това не се приложи, тогава моля докладвайте тази грешка " "използвайки командата 'ubuntu-bug update-manager' във терминал." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Не може да бъде изчислено надграждането" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Грешка при удостоверяването автентичността на някои пакети" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -181,29 +182,29 @@ "да е временен проблем с мрежата. Може би бихте искали да опитате отново по-" "късно. Вижте по-долу списъка на неудоствоерените пакети." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" "Пакетът '%s' е маркиран за премахване, но е в черния списък за премахване." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Важният пакет '%s' е маркиран за премахване." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Опит за инсталиране на забранена версия на '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Не може да се инсталира '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -212,11 +213,11 @@ "използвайки 'ubuntu-bug update-manager' във терминал." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Не могат да бъдат предположени мета-пакети" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -230,15 +231,15 @@ " Моля, преди да продължите, първо инсталирайте един от тези пакети, като " "използвате synaptic или apt-get!" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Четене от кеша" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Неуспех при получаване на изключителни права" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -246,11 +247,11 @@ "Това обикновено означава, че е стартирана друга система за управление на " "пакети (като apt-get или aptitude). Първо спрете тази програма." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Надграждането през отдалечена връзка не се поддържа" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -264,11 +265,11 @@ "\n" "Надграждането ще бъде спряно сега. Моля опитайте отново без ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Продължаване на работата със SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -285,11 +286,11 @@ "Ако продължите, допълнителен ssh демон ще бъде стартиран на порт '%s'.\n" "Искате ли да продължите?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Стартиране на допълнителен SSHD" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -300,7 +301,7 @@ "бъде стартиран допълнителен sshd на порт '%s'. Ако нещо се обърка с " "изпълняващия се ssh, ще можете да се свържете към допълнителния ssh.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -313,29 +314,29 @@ "да отворите порта с например:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Надграждането невъзможно" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Надграждане от '%s' на '%s' не се поддържа с този инструмент." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Настройката на ограничителен режим е неуспешна" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Не беше възможно да се създаде среда за ограничителен режим." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Ограничителен режим" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -345,18 +346,18 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Инсталацията на Python е повредена. Моля, поправете симболната връзка „/usr/" "bin/python”!" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Пакетът 'debsig-verify' е инсталиран" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -366,12 +367,12 @@ "Моля, премахнете го със synaptic или 'apt-get remove debsig-verify' и после " "отново изпълнете надграждането." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -379,11 +380,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Включване на най-новите актуализации от Интернет?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -405,16 +406,16 @@ "\n" "Ако отговора ви е 'Не', мрежата няма да се използва изобщо." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "забранен при надграждане до %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Не е открит валиден огледален сървър" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -434,11 +435,11 @@ "Ако натиснете 'Не', няма да се извърши надграждане." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Генериране на източници по подразбиране?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -451,21 +452,21 @@ "Да се добавят ли записите по подразбиране за '%s'? Ако натиснете 'Не', няма " "да се извърши надграждане." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Информацията от хранилището е невалидна" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Забранени са източници от трети страни" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -475,13 +476,13 @@ "да ги разрешите отново след надграждането чрез инструмента „software-" "properties” или чрез диспечера Ви на пакети." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Пакет в несъвместимо състояние" msgstr[1] "Пакети в несъвместимо състояние" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -500,11 +501,11 @@ "не могат да се намерят архиви. Моля, преинсталирайте пакетите ръчно или ги " "премахнете от системата." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Грешка по време на надграждане" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -512,13 +513,13 @@ "Възникна проблем при актуализиране. Това обикновено се дължи на мрежов " "проблем. Моля, проверете вашата мрежова връзка и опитайте отново." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Недостатъчно свободно място на диска" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -533,21 +534,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Пресмятане на промените" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Желаете ли да започне надграждането?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Надграждането е отменено" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -555,12 +556,12 @@ "Сега надграждането ще бъде отказано и ще се възстанови оригиналното " "състояние на системата. Можете да продължите надграждането по-късно." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Не могат да бъдат свалени обновленията." -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -571,27 +572,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Грешка при прехвърляне" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Възстановяване на първоначалното състояние на системата" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Не можаха да бъдат инсталирани обновленията" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -599,7 +600,7 @@ "Надграждането бе прекъснато. Системата ви може да е в нестабилно състояние. " "Сега ще се извърши възстановяване (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -610,7 +611,7 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -618,20 +619,20 @@ "Надграждането бе прекъснато. Моля, проверете Интернет връзката или " "инсталационната среда и опитайте отново. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Премахване на остарелите пакети?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Задържане" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Премахване" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -641,37 +642,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Не е инсталирана изисквана зависимост" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Изискваната зависимост „%s” не е инсталирана. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Проверка на диспечера на пакети" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Подготовката за надграждането неуспешна" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Грешка при получаване на изискванията за надграждане" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -679,69 +680,69 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Актуализиране информацията от хранилището" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Неуспех при добавянето на cdrom" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Съжаляваме, добавянето на cdrom не беше успешно." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Невалидна информация за пакета" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Получаване" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Надграждане" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Надграждането е завършено" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "Надграждането беше завършено, но възникнаха грешки по време на този процес." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Търсене на остарял софтуер" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Надграждането на системата завърши." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Частичното надграждане завърши." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms се използва" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -751,11 +752,11 @@ "Софтуерът 'evms' вече не се поддържа. Моля изключете го и изпълнете " "надграждането отново." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -763,9 +764,9 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -773,8 +774,8 @@ "Надграждането може да намали ефектите на работния плот и производителността " "в игрите и други графични програми." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -788,7 +789,7 @@ "\n" "Искате ли да продължите?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -801,11 +802,11 @@ "\n" "Искате ли да продължите?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Не е i686 архитектура" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -817,11 +818,11 @@ "минимална архитектура. Не е възможно да ъпгрейднете своята система към ново " "издание на Убунту с този хардуер." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Няма ARMv6 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -833,11 +834,11 @@ "възможно да надграждате вашата система с новата версия на Убунту с този " "хардуер." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Няма достъпен init" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -851,16 +852,16 @@ "изисква се, първо, обновяване на настройката на Вашата виртуална машина.\n" "Сигурни ли сте, че искате да продължите?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Sandbox надграждане с помощта на aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Ползване на зададения път за търсене на CD дискове с надграждаеми пакети" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -868,58 +869,58 @@ "Ползване на фронтенд. Текущо налични:\n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*НЕПРЕПОРЪЧИТЕЛНО* тази опция ще бъде игнорирана" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Извършване само на частично надграждане (без презаписване на sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Изключване поддръжката на GNU screen" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Задаване на datadir" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Моля, поставете диск \"%s\" в устройство \"%s\"" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Изтеглянето е завършено" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Изтегляне на файл %li от %li с %sB/с" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Остават около %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Изтегляне на файл %li от %li" @@ -929,27 +930,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Прилагане на промените" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "проблеми със зависимости - остава не конфигуриран" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Не можеше да бъде инсталиран \"%s\"" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -961,7 +962,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -972,7 +973,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -980,20 +981,20 @@ "Ще изгубите всички промени, които сте направили в този конфигурационен файл " "ако изберете да го замените с по-нова версия." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Командата \"diff\" не бе намерена" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Възникна фатална грешка" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1006,13 +1007,13 @@ "Оригиналният файл sources.list бе запазен в /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c натиснат" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1021,137 +1022,137 @@ "състояние. Сигурни ли сте, че искате да направите това?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "За да предодвратите загуба на данни, затворете всички отворени приложения и " "документи." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Вече не се поддържа от Каноникал. (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Подграждане (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Премахнете (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Вече не е необходим (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Инсталирайте (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Надграждане (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Смяна на носител" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Показване на разлики >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Скриване на разлики" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Грешка" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Отказ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Затваряне" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Показване на терминал >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Скриване на терминал" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Информация" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Детайли" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Вече не се поддържа %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Премахване на %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Премахване (на автоматично инсталиран) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Инсталиране на %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Надграждане на %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Нужно е рестартиране" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" "Рестратирайте системата, за да завършите надграждането" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Рестартирай сега" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1163,32 +1164,32 @@ "Ако откажете надграждането системата може да остане в състояние, в което е " "неизползваема. Силно ви препоръчваме да подължите надграждането." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Отмяна на надграждането?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li ден" msgstr[1] "%li дни" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li час" msgstr[1] "%li часа" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li минута" msgstr[1] "%li минути" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1204,7 +1205,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1218,14 +1219,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1234,34 +1235,32 @@ "Това изтегляне ще отнеме около %s с 1Mbit DSL връзка и около %s с 56k модем." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Това изтегляне ще отнеме около %s с вашата връзка. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Подготовка за надграждане" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Получаване на нови софтуерни канали" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Получаване на нови пакети" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Инсталиране на надгражданията" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Почистване" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1278,28 +1277,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d пакет ще бъде премахнат." msgstr[1] "%d пакети ще бъдат премахнати." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d нов пакет ще бъде инсталиран." msgstr[1] "%d нови пакети ще бъдат инталирани." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d пакет ще бъде надграден." msgstr[1] "%d нови пакети ще бъдат надградени." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1310,28 +1309,28 @@ "\n" "Ще трябва да бъдат изтеглени общо %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1339,36 +1338,36 @@ "Няма налични надграждания за вашата система. Надграждането ще бъде " "прекратено." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Нужно е рестартиране" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "Надграждането е завършено и има нужда от рестарт. Рестартиране сега?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Не може да бъде стартирана помощната програма за надграждане." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1376,35 +1375,35 @@ "Това е най-вероятно грешка в инструмента за ъпгрейд. Моля докладвайте тази " "грешка използвайки командата 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Подпис на помощната програма за надграждане" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Помощна програма за надграждане" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Грешка при доставянето" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "Доставянето на надграждането бе неуспешно. Възможно е да има проблем с " "мрежата. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Идентификацията неуспешна" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1412,13 +1411,13 @@ "Идентификацията на надграждането е неуспешна. Възможно е да има проблем с " "мрежата или сървъра. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Грешка при извличането" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1426,13 +1425,13 @@ "Извличането на надграждането бе неуспешно. Възможно е да има проблем с " "мрежата или сървъра. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Проверката е неуспешна" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1440,15 +1439,15 @@ "Проверката на надграждането се провали. Възможно е да има проблем с мрежата " "или със сървъра. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Не може да се изпълни надграждане" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1456,13 +1455,13 @@ "Това обикновенно е причинено от система, където /tmp е монтиран noexec. Моля " "ремонтирайте без noexec и стартирайте ъпгрейда отново." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Съобщението с грешка е '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1475,73 +1474,73 @@ "Оригиналният файл sources.list бе запазен в /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Прекратяване" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Понижен:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "За да продължите моля натиснете [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Продъжаване [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Детайли [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "Y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Вече не се поддържа: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Премахване на %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Инсталиране: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Надграждане на %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Продължаване [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1608,9 +1607,8 @@ msgstr "Надграждане на дистрибуцията" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Актуализиране на Убунту до версия 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1628,147 +1626,161 @@ msgid "Terminal" msgstr "Терминал" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Моля, изчакайте! Това може да отнеме известно време." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Актуализацията е завършена" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Не бяха открити бележки към изданието" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Сървърът може да е претоварен. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Не можеше да бъдат свалени бележките към изданието" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Моля, проверете Интернет връзката си!" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Надграждане" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Бележки към изданието" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Изтегляне на допълнителни пакетни файлове..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Файл %s от %s с %sB/с" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Файл %s от %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Отваряне на връзката в браузър" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Копиране на връзката в клипборда" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Смъкване на файл %(current)li от %(total)li при %(speed)s/сек" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Изтегляне на файл %(current)li от %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Вашата версия на Убунту вече не се поддържа." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Информация за надграждане" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Инсталиране" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Версия %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Не е засечена мрежова връзка. Не можете да изтеглите файла с промените." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Изтегляне на списъка с промени..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Премахване на избора от всички" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Избери_Всичко" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s актуализация е избрано." +msgstr[1] "%(count)s актуализации са избрани." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s ще бъде изтеглено." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "Актуализацията вече е свалена, но не е инсталирана." -msgstr[1] "Актуализациите вече са свалени, но не са инсталирани." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Неизвестен размер за изтегляне" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1776,7 +1788,7 @@ "Не е известно кога последно е актуализирана пакетната информация. Моля, " "натиснете \"Провери\" бутона, за да актуализирате информацията." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1785,14 +1797,14 @@ "Информацията за пакетите беше обновена преди %(days_ago)s дни.\n" "Натиснете бутона 'Проверка', за да проверите за софтуерни обновления." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "Пакетът информация бе последно обновен преди %(days_ago)s ден." msgstr[1] "Пакетът информация бе последно обновен преди %(days_ago)s дена." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1802,34 +1814,44 @@ "Информацията за пакета последно е обновена преди %(hours_ago)s часа." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Пакетната информация беше актуализирана преди около %s минути." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Пакетната информация беше току що актуализирана." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Софтуерните актуализации поправят грешки, премахват уязвими места в " +"сигурността и предлагат нови възможности." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Може да има актуализации за вашия компютър." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Добре дошли в Убунту" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1840,7 +1862,7 @@ "освободете поне %s място на диск '%s'. Изпразнете вашето кошче и премахнете " "временните пакети от инсталации с командата 'sudo apt-get clean'." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1848,25 +1870,25 @@ "За да завърши инсталирането, компютъра трябва да се рестартира. Преди да " "продължите, моля, запазете вашата работа." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Прочитане на информация за пакет" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Свързване..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Възможно е да не можете да проверите за актуализации или изтегляне на нови " "такива." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Невъзможно инициирането на информацията за пакета" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1879,7 +1901,7 @@ "Моля, докладвайте това като бъг в пакета 'update-manager' и включете " "следното съобщение с грешка:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1891,31 +1913,31 @@ "Моля, докладвайте това като бъг в пакета 'update-manager' и включете " "следното съобщение с грешка:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Нова инсталация)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Размер: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "От версия %(old_version)s към %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Версия %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Надграждане към ново издание не е възможно в момента" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1924,21 +1946,21 @@ "Надграждането към ново издание понастоящем не може да се извърши, моля " "опитайте по-късно. Сървърът върна: \"%s\"" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Сваляне на инструмента за награждане на версията" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Налично е ново издание на Убунту - '%s'" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Индексът на софтуера е повреден" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1948,6 +1970,17 @@ "ползвайте диспечера на пакети \"Synaptic\" или първо задействайте \"sudo apt-" "get install -f\" в терминален прозорец, за да поправите този проблем!" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Достъпно е ново издание на '%s'." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Отказ" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Провери за актуализации" @@ -1957,22 +1990,18 @@ msgstr "Инсталирай всички възможни актуализации" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Отказ" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Изграждане на списък с актуализации" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1996,20 +2025,20 @@ " * Неофициални пакети, които не са предоставени от Убунту\n" " * Нормални промени в предварителна версия на Убунту" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Изтегляне на отчет с промените" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Други актуализации (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "Тази актуализация не идва от източник, който поддържа промени." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2017,7 +2046,7 @@ "Неуспех при изтегляне на списъка с промени. \n" "Моля, проверете Интернет връзката си." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2030,7 +2059,7 @@ "Възможна версия: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2043,7 +2072,7 @@ "Моля, използвайте http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "докато промените станат достъпни или опитайте отново по-късно." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2056,52 +2085,43 @@ "Моля, използвайте http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "докато промените станат достъпни или опитайте отново по-късно." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Неуспешен опит за откриване на дистрибуцията" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Възникна грешка '%s' докато се проверяваше каква система използвате." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Важни актуализации за сигурността" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Препоръчителни актуализации" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Предложени актуализации" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Състарени версии" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Актуализации на дистрибуцията" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Други актуализации" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Стартиране на Диспечера на актуализации" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Софтуерните актуализации поправят грешки, премахват уязвими места в " -"сигурността и предлагат нови възможности." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Частично надграждане" @@ -2175,37 +2195,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Обновления на програмите" +msgid "Update Manager" +msgstr "Диспечер на актуализациите" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Обновления на програмите" +msgid "Starting Update Manager" +msgstr "Стартиране на диспечера за актуализациите" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Надграждане" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "актуализации" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Инсталиране" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Промени" +msgid "updates" +msgstr "актуализации" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Описание" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Описание на актуализацията" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2213,24 +2223,34 @@ "Вие сте свързани през роуминг и може да бъдете таксувани за данните, " "изразходвани за това обновление." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Вие сте свързани чрез безжичен модем" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Преди да започне актуализирането по-добре да свържете захранващия адаптер." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Инсталиране на актуализациите" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Промени" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Настройки..." +msgid "Description" +msgstr "Описание" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Инсталиране" +msgid "Description of update" +msgstr "Описание на актуализацията" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Настройки..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2253,9 +2273,8 @@ msgstr "Вие сте отхвърлили надграждането до нова версия на Убунту" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Можете да надградите по-късно като отворите Диспечера за Надграждане и " @@ -2269,59 +2288,59 @@ msgid "Show and install available updates" msgstr "Показване и инсталация на наличните актуализации" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Показване на версията и изход" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Папка, която съдържа файловете с данни" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Проверка дали има по-ново издание на Убунту" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "Проверка дали е възможно надграждане до последното издание в разработка" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "Надграждане с предложената най-нова весрия" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Да не се фокусира на карта при стартиране" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Опит за пускане на dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Да не се проверява за обновления при пускане" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Тестване на надграждане в ограничителен режим aufs припокриване" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Протичане на частично надграждане" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Опит за надграждане до най-новата версия с помощта на програма за " "надграждане от $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2331,11 +2350,11 @@ "Текущо се поддържат 'работен плот' за редовно актуализиране на настолни " "системи и 'сървър' за сървърни системи." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Стартиране на определения фронтенд" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2343,11 +2362,11 @@ "Проверка само ако нова дистрибуция е налична и доклаване на резултата чрез " "exit код" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2355,121 +2374,138 @@ "За повече информация, моля посетете:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Не е намерена нова дистрибуция" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Достъпно е ново издание на '%s'." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Изпълнете 'do-release-upgrade', за да го надградите." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Убунту %(version)s налична за надграждане" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Вие сте отказали надграждането до Убунту %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Неимплементиран метод: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Файл на диск" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb пакет" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Инсталиране на липсващ пакет." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Пакетът %s не трябва да се инсталира." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb пакет" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s трябва да се маркира като ръчно инсталиран." +msgid "%i obsolete entries in the status file" +msgstr "%i остарели записа във файла за състояние" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "Остарели записи в състоянието на dpkg" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "Остарели записи в състоянието на dpkg" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2478,48 +2514,74 @@ "инсталира и kdelibs5-dev. Вижте bugs.launchpad.net, bug #279621 за повече " "информация." -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "%i остарели записа във файла за състояние" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "Остарели записи в състоянието на dpkg" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "Остарели записи в състоянието на dpkg" +msgid "%s needs to be marked as manually installed." +msgstr "%s трябва да се маркира като ръчно инсталиран." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Премахване на lilo докато и grub е инсталиран.(Вижте грешка #314004 за " "подробности.)" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s актуализация е избрано." -#~ msgstr[1] "%(count)s актуализации са избрани." - -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" - -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Добре дошли в Убунту" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Диспечер на актуализациите" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "Starting Update Manager" -#~ msgstr "Стартиране на диспечера за актуализациите" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Вие сте свързани чрез безжичен модем" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "_Инсталиране на актуализациите" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "Checking for a new ubuntu release" #~ msgstr "Проверка за нова версия на Убунту" @@ -2560,6 +2622,11 @@ #~ msgid "There are no updates to install" #~ msgstr "Няма актуализации за инсталиране." +#~ msgid "The update has already been downloaded, but not installed" +#~ msgid_plural "The updates have already been downloaded, but not installed" +#~ msgstr[0] "Актуализацията вече е свалена, но не е инсталирана." +#~ msgstr[1] "Актуализациите вече са свалени, но не са инсталирани." + #~ msgid "" #~ "You will not get any further security fixes or critical updates. Please " #~ "upgrade to a later version of Ubuntu Linux." @@ -2638,6 +2705,9 @@ #~ msgid "1 kB" #~ msgstr "1 кБ" +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Актуализиране на Убунту до версия 11.10" + #~ msgid "" #~ "These software updates have been issued since this version of Ubuntu was " #~ "released. If you don't want to install them now, choose \"Update Manager" diff -Nru update-manager-17.10.11/po/bn.po update-manager-0.156.14.15/po/bn.po --- update-manager-17.10.11/po/bn.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/bn.po 2017-12-23 05:00:38.000000000 +0000 @@ -7,11 +7,12 @@ # Ayesha Akhtar , 2012. # Mahay Alam Khan , 2012. # Robin Mehdee , 2012. +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: shotwell-0.7.2\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-04-01 06:13+0000\n" "Last-Translator: Robin Mehdee \n" "Language-Team: Bengali \n" @@ -26,7 +27,7 @@ "X-Poedit-Language: Bengali\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -34,13 +35,13 @@ msgstr[1] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f মেগাবাইট" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s-এর জন্য সার্ভার" @@ -48,20 +49,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "প্রধান সার্ভার" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "কাস্টম সার্ভারসমূহ" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "sources.list ভুক্তি গননা করা সম্ভব নয়" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -69,11 +70,11 @@ "কোন প্যাকেজ ফাইল পাওয়া যায়নি, সম্ভবত এটি উবুন্টু ডিস্ক নয়, নাকি এটি ভুল " "আর্কিটেকচারের?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "সিডি যোগ করা সম্ভব হয়নি" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -88,13 +89,13 @@ "ত্রুটির বার্তাটি হল:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "খারাপ অবস্থায় থাকা প্যাকেজ সরাও" msgstr[1] "খারাপ অবস্থায় থাকা প্যাকেজগুলো সরাও" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -113,15 +114,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "সার্ভারে সম্ভবত অত্যাধিক চাপ পড়েছে" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "ভাঙা প্যাকেজসমূহ" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -130,7 +131,7 @@ "ঠিক করা সম্ভব না। দয়া করে সিনাপটিক বা apt-get ব্যবহার করে ঠিক করে অগ্রসর হোন।" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -149,11 +150,11 @@ "*আনঅফিসিয়াল সফটওয়্যার প্যাকেজ চালানোর জন্য যা উবুন্টুর নয়।\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "এটি হয়তো একটি অস্থায়ী সমস্যা, অনুগ্রহ করে পরবর্তীতে আবার চেষ্টা করুন।" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -161,16 +162,16 @@ "যদি এটির কোনটি প্রয়োগ করা না হয়, তখন অনুগ্রহ করে টার্মিনালে কমান্ড 'ubuntu-bug " "update-manager' ব্যবহার করে এই বাগ প্রতিবেদন দিন।" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "আপগ্রেডের পরিমাণ নির্ণয় করা যাচ্ছে না।" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "কিছু প্যাকেজের পরিচয় প্রমাণে ত্রুটি হয়েছে" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -180,7 +181,7 @@ "আপনি পরবর্তীতে আবার চেষ্টা করতে পারেন। পরিচয় অপ্রমাণিত প্যাকেজের তালিকার জন্য " "নিচে দেখুন।" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -188,22 +189,22 @@ "'%s' প্যাকেজটিকে অপসারনের জন্য চিহ্নিত করা হয়েছে কিন্তু এটি অপসারনের জন্য কাল " "তালিকা ভুক্ত।" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "গুরুত্বপূর্ণ প্যাকেজ '%s' মুছে ফেলার জন্য চিহ্নিত করা হয়েছে।" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "কালো তালিকাভুক্ত সংস্করন '%s' ইনস্টলের চেষ্টা করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "'%s' ইন্সটল করা যাচ্ছে না" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -212,11 +213,11 @@ "manager' ব্যবহার করে এটিকে বাগ হিসেবে প্রতিবেদন দিন।" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "meta-package অনুমান করা যাচ্ছ না" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -230,15 +231,15 @@ " অনুগ্রহ করে প্রথমে উপরোল্লিখিত প্যাকেজগুলি synaptic কিংবা apt-get ব্যবহার করে " "ইন্সটল করুন।" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "cache পড়া হচ্ছে" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "exclusive লক পাওয়া যায়নি" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -246,11 +247,11 @@ "এইটি সাধারণত বুঝায় যে অন্য একটি package management application (apt-get অথবা " "aptitude . .) ইতিমধ্যে চলছে। অনুগ্রহ করে ঔ অ্যাপলিকেশন বন্ধ করুন প্রথম।" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "দূরবর্তী সংযোগের মধ্যদিয়ে আপগ্রেড করা সমর্থিত নয়" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -264,11 +265,11 @@ "\n" "আপগ্রেড এখন বাতিল করা হবে। অনুগ্রহ করে ssh ছাড়া চেষ্টা করুন।" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "SSH এর অধীনে এগিয়ে যেতে চান?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -284,11 +285,11 @@ "আপনি যদি চালিয়ে যান, '%s' পোর্টে একটি অতিরিক্ত ssh ডিমন আরম্ভ হবে।\n" "আপনি কি চালিয়ে যেতে চান?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "অতিরিক্ত sshd শুরু করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -298,7 +299,7 @@ "আপগ্রেড ব্যর্থ হলে পুনরুদ্ধার সহজ করার জন্য, '%s' পোর্টে অতিরিক্ত একটি sshd আরম্ভ হবে। " "ssh চালানোর সময় কোন সমস্যা দেখা দিলেও আপনি এটির সাথে সংযোগ করতে পারবেন।\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -311,29 +312,29 @@ "খুলতে পারেন:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "আপডেট করা সম্ভব নয়" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "'%s' হতে '%s' এ আপগ্রেড এই টুল দ্বারা সমর্থিত নয়।" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Sandbox সেটআপ ব্যর্থ" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "স্যান্ডবক্স এনভায়রনমেন্ট তৈরি করা সম্ভব হয়নি।" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Sandbox মোড" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -348,17 +349,17 @@ "*No* এখন থেকে সিস্টেম ডিরেক্টরির লিখিত পরিবর্তন হবে যতক্ষন না পরবর্তী পুনরায় বুট " "স্থায়ী করা হবে।" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "আপনার python ইনস্টল ত্রুটিপূর্ণ। অনুগ্রহ করে '/usr/bin/python' সিমলিংকটি ঠিক করুন।" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "'debsig-verify' প্যাকেজটি ইন্সটল করা হয়েছে" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -368,12 +369,12 @@ "অনুগ্রহ করে synaptic বা 'apt-get remove debsig-verify' ব্যবহার করে অপসারন করুন " "এরপর আপগ্রেড আবার চালান।" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "'%s' তে লেখা যাবেনা" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -383,11 +384,11 @@ "আপনার সিস্টেমে সিস্টেম ডিরেক্টরি '%s' লেখা সম্ভব নয়। উন্নীতকরণ চালানো যাবেনা।\n" "অনুগ্রহ করে নিশ্চিত করুন সিস্টেম ডিরেক্টরি লিখনযোগ্য।" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "ইন্টারনেট থেকে সর্বশেষ হালনাগাদ অন্তর্ভূক্ত করতে চান?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -407,16 +408,16 @@ "সর্বশেষ হালনাগাদসমূহ ইনস্টল করতে হবে।\n" "আপনি এখানে 'না' বললে, কোথাও নেটওয়ার্ক ব্যবহার করা হবে না।" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "%s তে আপগ্রেডে নিষ্ক্রিয়" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "কোন সঠিক মিরর পাওয়া যায় নি" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -436,12 +437,12 @@ "'না' নির্বাচন করা হলে আপগ্রেড বাতিল হয়ে যাবে।" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "ডিফল্ট sources তৈরি করে?" # snigdha -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -454,11 +455,11 @@ " '%s' এর জন্য পূর্বনির্ধারিত এন্ট্রিগুলো যোগ করে দেয়া উচিৎ? 'না' অপশন নির্বাচন করলে " "হালনাগাদকরণ প্রক্রিয়া বাতিল হয়ে যাবে।" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "রিপোজিটরির তথ্য সঠিক নয়" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -466,12 +467,12 @@ "উন্নীতকরণ রিপোজিটরী তথ্য অকার্যকর ফাইলে পরিণত করা হয়েছে তাই বাগ প্রতিবেদন করার " "প্রক্রিয়া শুরু করা হচ্ছে।" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "তৃতীয় পার্টির উত্স নিষ্ক্রিয়" # snigdha -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -481,13 +482,13 @@ "'সফট্ওয়্যার-প্রপার্টিজ' টুল এর সাহায্যে আপগ্রেড করে আপনি সেগুলোকে পুনরায় সক্রিয় করতে " "পারবেন।" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "অসঙ্গতিপূর্ন অবস্থায় প্যাকেজ" msgstr[1] "অসঙ্গতিপূর্ন অবস্থায় প্যাকেজ" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -506,11 +507,11 @@ "কোনো আর্কাইভ পাওয়া যায়নি। অনুগ্রহ করে প্যাকেজ পুনরায় ইনস্টল করুন বা সিস্টেম থেকে " "ম্যানুয়ালি অপসারন করুন।" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "আপগ্রেড করার সময় সমস্যা" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -518,13 +519,13 @@ "হালনাগাদ করার সময় একটি সমস্যা হয়েছে। সম্ভবত এটি কোনো নেটওয়ার্ক সমস্যা, অনুগ্রহ করে " "আপনার নেটওয়ার্ক সংযোগ পরীক্ষা করুন এবং পুনরায় চেষ্টা করুন।" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "ডিস্কে যথেস্ট ফাঁকা জায়গা নেই" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -538,21 +539,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "পরিবর্তন হিসাব করা হচ্ছে" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "আপনি কি আপগ্রেড শুরু করতে চান?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "আপগ্রেড বাতিল করা হয়েছে" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -560,12 +561,12 @@ "এখন আপগ্রেড বাতিল হয়ে যাবে এবং মূল সিস্টেম স্টের পুনরূদ্ধার হবে। আপনি পরে যে কোনো " "সময়ে আপগ্রেড বন্ধ করে দিতে পারেন।" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "আপগ্রেড ডাউনলোড করা যায় নি" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -575,28 +576,28 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "প্রেরণ করার সময় সমস্যা" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "সিস্টেমটি রিস্টার্ট করছি" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "আপগ্রেড ইন্সটল করা যায় নি" # snigdha #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -604,7 +605,7 @@ "আপগ্রেড বন্ধ করে দেয়া হয়েছে। সিস্টেমটি এখন ব্যবহার করা নাও যেতে পারে। এখন " "পুনরূদ্ধারকরণ প্রক্রিয়া চলতে থাকবে (dpkg --configure -a)" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -621,7 +622,7 @@ "upgrade/ to বাগ প্রতিবেদনে।\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -629,21 +630,21 @@ "আপগ্রেড প্রত্যাখ্যান করা হয়েছে। অনুগ্রহ করে ইন্টারনেট সংযোগ বা ইনস্টলেশন মিডিয়া " "পরীক্ষা করুন এবং পুনরায় চেষ্টা করুন। " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "অপ্রচলিত প্যাকেজগুলো মুছে ফেলা হবে?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "রাখো (_K)" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "সরাও (_স)" # snigdha -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -653,28 +654,28 @@ # snigdha #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "প্রয়োজনীয় ডিপেন্ডেন্সী ইন্সটল করা হয়নি" # snigdha -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "প্রয়োজনীয় ডিপেন্ডেন্সী '%s' ইন্সটল করা হয়নি। " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "প্যাকেজ ম্যানেজার পরীক্ষা করা হচ্ছ" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "আপগ্রেডের প্রস্তুতি ব্যর্থ" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -683,11 +684,11 @@ "প্রক্রিয়া শুরু হয়েছে" # prb-snigdha -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "আপগ্রেডের জন্য প্রয়োজনীয় তথ্য পেতে ব্যার্থ" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -699,70 +700,70 @@ "\n" "উপরন্তু, বাগ প্রতিবেদন করার প্রক্রিয়া শুরু করা হচ্ছে।" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "রিপজিটরির তথ্য আপডেট করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "সিডি রোম যোগ করতে ব্যর্থ" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "দুঃখিত, সিডি রোম সফল হয়নি।" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "ভুল প্যাকেজ তথ্য" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "টেনে আনা হচ্ছে" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "আপগ্রেড করা হচ্ছে" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "হালনাগাদ সম্পন্ন হয়েছে" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "আপগ্রেড সম্পন্ন কিন্তু আপগ্রেড প্রসেসের সময় ত্রুটি ঘটে।" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "অপ্রচলিত সফ্টওয়্যার অনুসন্ধান করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "সিস্টেম আপগ্রেড সম্পন্ন।" # snigdha -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "আংশিক আপগ্রেড সম্পন্ন হয়েছে।" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms ব্যবহার করা হচ্ছে" # snigdha -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -772,12 +773,12 @@ "সফট্ওয়্যার এখন আর সমর্থন করে না, তাই অনুগ্রহ করে এটি বন্ধ করুন এবং আপগ্রেড সম্পন্ন হয়ে " "গেলে তা চালু করুন।" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "আপনার গ্রাফিক্স হার্ডওয়্যার উবুন্টু ১২.০৪ (LTS) এ সম্ভবত পুরোপুরি ভাবে সমর্থন করবে না।" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -789,9 +790,9 @@ "Bugs/UpdateManagerWarningForI8xx আপনি কি উন্নীতকরণ করতে চান?" # snigdha -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -800,8 +801,8 @@ "ও কার্যকারীতা কিছুটা কমে যাবে।" # snigdha -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -815,7 +816,7 @@ "\n" " আপনি কি চালিয়ে যেতে চান?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -828,11 +829,11 @@ "\n" " আপনি কি চালিয়ে যেতে চান?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "কোনো i686 CPU নেই" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -843,11 +844,11 @@ "প্যাকেজ সর্বনিম্ন i686 আর্কিটেকচারে নির্মাণ করা হয়েছে। এই হার্ডওয়্যার সহকারে আপনার " "সিস্টেমকে নতুন উবুন্টু সংস্করণে আপগ্রেড করা সম্ভব নয়।" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "কোনো ARMv6 CPU নেই" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -858,11 +859,11 @@ "সব প্যাকেজ সর্বনিম্ন ARMv6 আর্কিটেকচারে নির্মাণ করা হয়েছে। এই হার্ডওয়্যার সহকারে " "আপনার সিস্টেমকে নতুন উবুন্টু সংস্করণে আপগ্রেড করা সম্ভব নয়।" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "কোনো init নেই" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -877,17 +878,17 @@ "\n" "আপনি কি নিশ্চিত আপনি এগিয়ে যেতে চান?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "aufs ব্যবহার করে স্যান্ডবক্স আপগ্রেড করা হবে" # snigdha -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "আপগ্রেডেকৃত প্যাকেজসহ cdrom খুঁজে বের করতে দিয়ে দেয়া পাথ ব্যবহার করুন" # snigdha -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -895,51 +896,51 @@ "ফ্রন্টেন্ড ব্যবহার করুন। বর্তমানে পাওয়া যাচ্ছে: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*অবলোপ* এই অপশনটি উপেক্ষা করা হবে" # snigdha -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "শুধুমাত্র আংশিক আপগ্রেড কাজ করে ( কোনো উৎস তালিকা পুনর্লিিখত হয় না)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "GNU স্ক্রিন সাপোর্ট নিষ্ক্রিয়" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "datadir নির্ধারণ" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "দয়া করে '%s' ড্রাইভে '%s' প্রবেশ করান" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "টেনে আনা সম্পূর্ণ" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "ফাইল আনা হচ্ছে %li এর %li %sB/s এ" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "%s বাকি আছে" @@ -947,7 +948,7 @@ # prb #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "%li এর %li ফাইল নিয়ে আসা হয়" @@ -957,7 +958,7 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "পরিবর্তনগুলো প্রয়োগ করছি" @@ -965,13 +966,13 @@ #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "ডিপেন্ডেন্সী সমস্যা - আনকনফিগার হিসাবে রয়েছে" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "'%s' ইন্সটল করা যায় নি" @@ -979,7 +980,7 @@ # snigdha #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -992,7 +993,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1004,7 +1005,7 @@ # snigdha #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1012,21 +1013,21 @@ "আপনি যদি নতুন সংস্করণ দ্বারা এটি প্রতিস্থাপন করেন তবে কনফিগারেশন ফাইলে কোনো " "পরিবর্তন করে থাকলে তা চলে যাবে।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "'diff' কমান্ডটি পাওয়া যায় নি" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "একটি মারাত্মক সমস্যা সংঘটিত হয়েছে" # snigdha -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1038,14 +1039,14 @@ "করুন। আপগ্রেড বন্ধ আছে।\n" "আপনার মূল উৎস তালিকা /etc/apt/sources.list.distUpgrade এ সংরক্ষিত আছে।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c চাপা হয়েছে" # snigdha -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1054,137 +1055,137 @@ "আপনি কি নিশ্চিত যে আপনি এমন করতে চান?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "তথ্য হারাতে না চাইলে সকল অ্যাপলিকেশন এবং ডকুমেন্ট বন্ধ রাখুন।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "ক্যানোনিক্যাল দ্বারা আর সমর্থিত নয় (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "ডাউনগ্রেড (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "(%s) অপসারণ" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "আর প্রয়োজন নেই (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "(%s) ইন্সটল" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "(%s) আপগ্রেড" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "মিডিয়া পরিবর্তন" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "পার্থক্য প্রদর্শন >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< পার্থক্য আড়াল করা" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "ত্রুটি" # confused..coz here & seems not a shortcut -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "ও বাতিল" # confused..coz here & seems not a shortcut -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "ও বন্ধ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "টার্মিনাল প্রদর্শন >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< টার্মিনাল আড়াল করা" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "তথ্য" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "বিস্তারিত" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "আর সমর্থিত নয় %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "%s অপসারণ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "%s অপসারণ (যা স্বয়ংক্রিয় ভাবে ইনস্টল করা হয়েছিল)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "%s ইন্সটল" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "%s আপগ্রেড" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "পুনরায় শুরু করা প্রয়োজন" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "আপগ্রেড সম্পন্ন করতে সিস্টেমটি রিস্টার্ট করুন" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "এক্ষুনি রিস্টার্ট (_R)" # snigdha #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1196,32 +1197,32 @@ "আপগ্রেড বন্ধ করলে সিস্টেম অকার্যকর হয়ে পড়বে। আপনাকে অবশ্যই আপগ্রেড চালিয়ে যেতে বলা " "হচ্ছে।" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "আপগ্রেড বাতিল করা হবে কি?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li দিন" msgstr[1] "%li দিন" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li ঘন্টা" msgstr[1] "%li ঘন্টা" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li মিনিট" msgstr[1] "%li মিনিট" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1237,7 +1238,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1251,7 +1252,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" @@ -1259,7 +1260,7 @@ # snigdha #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1270,34 +1271,32 @@ # snigdha #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "আপনার যে সংযোগটি আছে তাতে এই ডাউনলোডটি সম্পন্ন হতে %s সময় নিবে। " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "আপগ্রেড প্রস্তুত করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "নতুন সফটওয়্যার চ্যানেল গ্রহন করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "নতুন প্যাকেজ গ্রহন করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "আপগ্রেড ইনস্টল করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "পরিস্কার করছি" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1315,7 +1314,7 @@ # snigdha #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." @@ -1323,7 +1322,7 @@ msgstr[1] "%d প্যাকেজসমূহ অপসারিত হতে যাচ্ছে।" # snigdha -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." @@ -1331,7 +1330,7 @@ msgstr[1] "%d নতুন প্যাকেজসমূহ ইন্সটল করা হবে।" # snigdha -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." @@ -1339,7 +1338,7 @@ msgstr[1] "%d প্যাকেজসমূহ আপগ্রেড করা হবে।" # snigdha -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1350,7 +1349,7 @@ "\n" "আপনাকে সম্পূর্ণ %s ডাউনলোড করতে হবে। " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1358,7 +1357,7 @@ "আপগ্রেড ইন্সটল করতে বেশ কয়েক ঘন্টা লাগতে পারে। ডাউনলোড শেষ হওয়ার পর আপনি এটিকে " "থামাতে পারবেন না।" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1366,53 +1365,53 @@ "উন্নীতকরণ আনয়ন এবং ইনস্টল করতে কয়েক ঘন্টা সময় লাগতে পারে। একবার ডাউনলোড সমাপ্ত " "হলে, প্রক্রিয়া বাতিল করা যাবেনা।" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "প্যাকেজগুলো অপসরণ করতে বেশ কিছু ঘন্টা লাগতে পারে। " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "এই কম্পিউটারের সফটওয়্যার হালনাগাদকৃত।" # snigdha -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" "আপনার সিস্টেমের জন্য কোনো আপগ্রেড পাওয়া যাচ্ছে না। এখন আপগ্রেডটি বাতিল করা হবে।" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "রিবুট করা প্রয়োজন" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "আপগ্রেডটি সম্পন্ন এবং রিবুট করা প্রয়োজন। আপনি কি এক্ষুনি তা করতে চান?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "প্রমাণীকরণ '%(file)s' বিনিময়ে '%(signature)s' " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "'%s' নিষ্কর্ষ করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "আপগ্রেড টুলটি চালানো যায় নি" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1420,75 +1419,75 @@ "এটি সম্ভবত উন্নীত করণ টুলের একটি বাগ। অনুগ্রহ করে কমান্ড 'ubuntu-bug update-" "manager' ব্যবহার করে এটিকে বাগ হিসেবে প্রতিবেদন দিন।" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "আপগ্রেড টুল স্বাক্ষর" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "আপগ্রেড টুল" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "আনতে ব্যর্থ" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "আপগ্রেডটি আনতে ব্যর্থ। নেটওয়ার্কে কোন সমস্যা থাকতে পারে। " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "অনমোদন প্রক্রিয়া ব্যর্থ" # snigdha -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" "আপগ্রেড পরীক্ষা করা ব্যর্থ হয়েছে। নেটওয়ার্ক বা সার্ভারে কোনো সমস্যা হতে পারে। " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "এক্সট্রাক্ট করতে ব্যর্থ" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "আপগ্রেডটি এক্সট্রাক্ট করতে ব্যর্থ। নেটওয়ার্ক অথবা সার্ভারে সমস্যা থাকতে পারে। " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "যাচাই ব্যর্থ" # snigdha -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" "আপগ্রেড পরীক্ষা করা ব্যর্থ হয়েছে। নেটওয়ার্ক বা সার্ভারে কোনো সমস্যা থাকতে পারে। " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "আপগ্রেড চালানো যায় নি" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1496,14 +1495,14 @@ "এটি সাধারণত সিস্টেম দিয়ে সংঘটিত হয়েছে যেখানে /tmp mounted noexec। অনুগ্রহ করে " "noexec ছাড়া পুনরায় মাউন্ট করুন এবং উন্নীত করণ আবার চালান।" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "ত্রুটি বার্তাটি হল '%s'।" # snigdha -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1515,74 +1514,74 @@ "আপগ্রেডটি বন্ধ আছে।\n" "আপনার মূল উৎস তালিকা /etc/apt/sources.list.distUpgrade এ সংরক্ষিত আছে।" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "প্রত্যাখ্যান করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "নীচে নামানো:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "চালিয়ে যেতে অনুগ্রহ করে [ENTER] চাপুন" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "এগিয়ে যাওয়া [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "বিস্তারিত [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "হ্যাঁ" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "না" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "বিস্তা" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "আর সমর্থিত নয়: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "অপসারণ: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "ইনস্টল: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "আপগ্রেড: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "এগিয়ে যাওয়া [Yn] " # snigdha -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1651,9 +1650,8 @@ msgstr "ডিস্ট্রিবিউশন আপগ্রেড" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "উবুন্টু সংস্করণ ১১.১০ তে উন্নীত করা হচ্ছে" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "সংস্করণ ১২.০৪ এ উবুন্টু উন্নীত করা হচ্ছে" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1671,85 +1669,86 @@ msgid "Terminal" msgstr "টার্মিন্যাল" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "অনুগ্রহ করে অপেক্ষা করুন, এটি কিছুটা সময় নিতে পারে।" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "আপডেট সম্পন্ন" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "রিলিজ নোট পাওয়া যায় নি" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "সার্ভারটি মনে হয় ব্যস্ত। " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "রিলিজ নোট ডাউনলোড করা যায় নি" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "অনুগ্রহ করে আপনার ইন্টারনেট সংযোগ পরীক্ষা করুন।" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "আপগ্রেড" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "রিলিজ নোট" # snigdha -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "অতিরিক্ত প্যাকেজ ফাইলগুলো ডাউনলোড করা হচ্ছে..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "%sB/s এ ফাইল %s এর %s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "ফাইল %s এর %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "ব্রাউজারে লিংক খুলুন" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "ক্লিপবোর্ডে লিংক অনুলিপি" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "%(total)li এর %(current)li ডাউনলোড করা হচ্ছে %(speed)s/s এ" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "%(total)li এর %(current)li ডাউনলোড করা হচ্ছে" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "আপনার উবুন্টু রিলিজ এখন আর সমর্থিত নয়।" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1757,52 +1756,58 @@ "আপনি আগামীতে আর কখনও নিরাপত্তার সংশোধন অথবা সংকটপূর্ণ হালনাগাদ পাবেন না। অনুগ্রহ " "করে উবুন্টুর একটি পরবর্তী সংস্করণে হালনাগাদ করুন।" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "আপগ্রেড তথ্য" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "ইনস্টল" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "নাম" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "ভার্সন %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "নেটওয়ার্ক সংযোগ পাওয়া যায়নি, আপনি কোনো চেঞ্জলগ তথ্য ডাউনলোড করতে পারেন না।" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "পরিবর্তনের তালিকা ডাউনলোড করা হচ্ছে..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "সব নির্বাচিত গুলো এখন অনির্বাচন করুন (_D)" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "সব নির্বাচন করুন (_S)" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s আপডেট নির্বাচিত হয়েছে।" +msgstr[1] "%(count)s আপডেট নির্বাচিত হয়েছে।" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s ডাউনলোড করা হবে।" #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "হালনাগাদ ইতোমধ্যে ডাউনলোড করা হয়েছে, কিন্তু ইন্সটল করা হয়নি।" msgstr[1] "হালনাগাদ ইতোমধ্যে ডাউনলোড করা হয়েছে, কিন্তু ইন্সটল করা হয়নি।" @@ -1810,11 +1815,18 @@ msgid "There are no updates to install." msgstr "ইনস্টল করতে কোনো হালনাগাদ নেই।" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "অজানা পরিমান ডাউনলোড।" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1822,7 +1834,7 @@ "এটি অজ্ঞাত যখন প্যাকেজ তথ্য সর্বশেষ হালনাগাদ করা হয়েছে। অনুগ্রহ করে তথ্য হালনাগাদ " "করতে 'পরীক্ষা' বোতাম ক্লিক করুন।" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1832,7 +1844,7 @@ "নতুন সফ্টওয়্যার সম্পর্কিত হালনাগাদের জন্য নিচের 'পরীক্ষা করুন' বোতামে চাপুন।" # snigdha -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1840,7 +1852,7 @@ msgstr[1] "%(days_ago)s দিন আগে প্যাকেজ তথ্য শেষবার আপডেট করা হয়েছিল।" # snigdha -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1849,35 +1861,44 @@ msgstr[1] "%(hours_ago)s ঘন্টা আগে প্যাকেজ তথ্য শেষবার আপডেট করা হয়েছিল।" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "প্যাকেজ তথ্য সর্বশেষ হালনাগাদ করা হয়েছে %s মিনিট আগে।" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "প্যাকেজ তথ্য মাত্র হালনাগাদ করা হয়েছে।" -#: ../UpdateManager/UpdateManager.py:689 +# prb +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "সফ্টওয়্যার আপডেট করার ফলে ভুলগুলো সংশোধিত হয়," + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "আপনার কম্পিউটারে সফ্টওয়্যার আপডেট পাওয়া যেতে পারে।" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "উবুন্টুতে স্বাগতম" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" -msgstr "" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "এই সংস্করণ অবমুক্ত হওয়ার পর থেকে এই সকল সফটওয়্যার হালনাগাদ প্রদত্ত হয়ে আসছে।" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "এই কম্পিউটারের জন্য সফটওয়্যার হালনাগাদকরণ অব্যবহৃত।" # snigdha -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1890,7 +1911,7 @@ "অস্থায়ী প্যাকেজগুলো ফেলে দিন।" # snigdha -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1898,25 +1919,25 @@ "আপডেট ইনস্টল শেষ হলে কম্পিউটার রিস্টার্ট দেয়া দরকার। রিস্টার্ট করার আগে আপনার " "কাজগুলো সংরক্ষণ করে নিন।" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "প্যাকেজ বিষয়ক তথ্য পড়ছে" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "সংযুক্ত করা হচ্ছে ..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "আপনি কোনো হালনাগাদ পরীক্ষা বা নতুন কোনো হালনাগাদ ডাউনলোড কতে পারবেন না।" # snigdha -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "প্যাকেজ তথ্য চালু করা যাচ্ছে না" # snigdha -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1930,7 +1951,7 @@ "বার্তাটি যোগ করে দিন:\n" # snigdha -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1942,31 +1963,31 @@ "'আপডেট ম্যানেজার' প্যাকেজ সম্পর্কে বাগটি রিপোর্ট করুন এবং ভুল সম্পর্কিত নিম্নোক্ত " "বার্তাটি যোগ করে দিন:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (নতুন ইনস্টল)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(আকার: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "সংস্করণ %(old_version)s থেকে %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "সংস্করণ %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "এখন রিলিজ উন্নীত করা সম্ভব নয়" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1975,23 +1996,23 @@ "বর্তমানে রিলিজ আপগ্রেড সমভব নয়, অনুগ্রহ করে একটু পর আবার চেষ্টা করুন। সার্ভারের " "প্রতিবেদন: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "রিলিজ আপগ্রেড টুল ডাউনলোড করা হচ্ছে" # snighda -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "নতুন উবুন্টু রিলিজ '%s' পাওয়া যাচ্ছে" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "সফ্টওয়্যার ইন্ডেক্সটি নস্ট" # snigdha -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -2001,6 +2022,17 @@ "\"সিন্যাপটিক\" প্যাকেজ ম্যানেজার ব্যবহার করুন বা টার্মিনালে \"sudo apt-get install " "-f\" চালিয়ে দেখুন।" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "নতুন রিলিজ '%s' বিদ্যমান।" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "বাতিল" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "হালনাগাদের জন্য পরীক্ষা করুন" @@ -2010,23 +2042,19 @@ msgstr "সব বিদ্যমান হালনাগাদ ইনস্টল করুন" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "বাতিল" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "পরিবর্তন" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "হালনাগাদ" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "হালনাগাদ তালিকা প্রস্তুত করা হচ্ছে" # prb -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2050,21 +2078,21 @@ " * Unofficial software packages not provided by Ubuntu\n" " * Normal changes of a pre-release version of Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "changelog ডাউনলোড করা হচ্ছে" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "অন্যান্য হালনাগাদ (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "এই হালনাগাদ উৎস থেকে আসে না যা পরিবর্তনে লগ সমর্থন করে।" # snigdha -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2072,7 +2100,7 @@ "পরিবর্তনসমূহের তালিকা ডাউনলোড করা ব্যার্থ হয়েছে। \n" "অনুগ্রহ করে আপনার ইন্টারনেট সংযোগ পরীক্ষা করুন।" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2086,7 +2114,7 @@ "\n" # prb -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2101,7 +2129,7 @@ " ব্যবহার করুন এবং পরে আবার চেষ্টা করুন।" # snigdha -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2115,54 +2143,46 @@ "ubuntu/+source/%s/%s/+changelog\n" " ব্যবহার করুন এবং পরে আবার চেষ্টা করুন।" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "ডিস্ট্রিবিউশন সনাক্ত করতে ব্যর্থ" # snigdha -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" "আপনি কোন সিস্টেম ব্যবহার করছেন তা পরীক্ষা করার সময় একটি ত্রুটি '%s' সংগঠিত হয়।" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "প্রয়োজনীয় নিরাপত্তা হালনাগাদ" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "সুপারিশকৃত হালনাগাদ" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "পরামর্শিত হালনাগাদ" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "ব্যাকপোর্ট" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "ডিস্ট্রিবিউশন হালনাগাদ" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "অন্যান্য হালনাগাদ" # snigdha #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "আপডেট ম্যানেজার চালু করা হচ্ছে" -# prb -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "সফ্টওয়্যার আপডেট করার ফলে ভুলগুলো সংশোধিত হয়," - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "আংশিক আপগ্রেড (_P)" @@ -2238,37 +2258,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "সফ্টওয়্যার আপডেট" +msgid "Update Manager" +msgstr "আপডেট ম্যানেজার" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "সফ্টওয়্যার আপডেট" +msgid "Starting Update Manager" +msgstr "আপডেট ম্যানেজার শুরু করা হচ্ছে" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "আপগ্রেড (_p)" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "আপডেটসমূহ" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "ইনস্টল" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "পরিবর্তন" +msgid "updates" +msgstr "আপডেটসমূহ" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "বর্ননা" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "হালনাগাদের বর্ণনা" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2276,23 +2286,33 @@ "আপনি রোমিং ব্যবহার করে সংযুক্ত এবং হালনাগাদের জন্য যে ডাটা ব্যবহৃত হয় তার জন্য টাকা " "খরচ হতে পারে।" -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "আপনি ওয়ারলেস মোডেম দিয়ে সংযুক্ত।" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "হালনাগাদ করার আগে কম্পিউটার AC পাওয়ারে সংযুক্ত করে নেয়া নিরাপদ।" +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "আপডেট ইন্সটল করো (_I)" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "পরিবর্তন" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "সেটিং (_S)..." +msgid "Description" +msgstr "বর্ননা" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "ইনস্টল" +msgid "Description of update" +msgstr "হালনাগাদের বর্ণনা" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "সেটিং (_S)..." # snigdha #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -2318,9 +2338,8 @@ # snigdha #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "আপগ্রেড ম্যানেজারে \"আপগ্রেড\" ক্লিক করে আপনি পরেও আপগ্রেড করে নিতে পারবেন।" @@ -2333,62 +2352,62 @@ msgid "Show and install available updates" msgstr "উপস্হিত আপডেট গুলো প্রদর্শন এবং ইন্সটল করো" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "সংস্করণ প্রদর্শন এবং প্রস্থান" # snigdha -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "যে ডিরেক্টরীতে ডাটা ফাইল থাকে" # snigdha -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "নতুন উবুন্টু রিলিজ পাওয়া যাচ্ছে কিনা তা পরীক্ষা করুন" # snigdha -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "সর্বশেষ ডেভেল রিলিজ আপগ্রেড করা সম্ভব কিনা তা পরীক্ষা করে দেখুন" # snigdha -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "রিলিজ আপগ্রেডারের প্রস্তাবিত সর্বশেষ সংস্করণের সাহায্যে আপগ্রেড করুন" # snigdha -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "শুরুতেই মানচিত্রের দিকে মনযোগ দিবেন না" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "dist-upgrade চালানোর চেষ্টা" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "শুরু করার সময় হালনাগাদ পরীক্ষা করা যাবে না।" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "স্যান্ডবক্স aufs ওভারলে দিয়ে আপগ্রেড পরীক্ষা করা" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "আংশিক আপগ্রেড চালানো হচ্ছে" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "পরিবর্তণের পরিবর্তে প্যাকেজের বর্ণনা প্রদর্শন করুন" # snigdha -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "$distro-প্রস্তাবিত থেকে আপগ্রেডারের সাহায্যে সর্বশেষ রিলিজে আপগ্রেড করুন" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2398,11 +2417,11 @@ "বর্তমানে ডেস্কটপ সিস্টেমের নিয়মিত আপগ্রেডের জন্য 'desktop' এবং সার্ভার সিস্টেমের " "জন্য 'server'।" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "উল্লেখিত ফ্রন্টএন্ড চালনা" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2410,11 +2429,11 @@ "নতুন কোনো ডিস্ট্রিবিউশন রিলিজ বিদ্যমান কি না পরীক্ষা করুন এবং exit কোডের মাধ্যে " "রিপোর্ট করুন" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "নতুন উবুন্টু রিলিজের জন্য খোঁজ নেয়া হচ্ছে" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2422,68 +2441,68 @@ "তথ্য আপগ্রেডের জন্য, অনুগ্রহ করে দেখুন:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "নতুন কোন সংস্করণ পাওয়া যায় নি" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "নতুন রিলিজ '%s' বিদ্যমান।" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "আপগ্রেড করতে 'do-release-upgrade' চালান।" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "উবুন্টু %(version)s আপগ্রেড বিদ্যমান" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "আপনি উবুন্টু %s তে আপগ্রেড করতে চেয়েছেন" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "ডিবাগ আউটপুট সংযুক্ত করুন" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "এই মেশিনের অসমর্থিত প্যাকেজ প্রদর্শন করুন" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "এই মেশিনের সমর্থিত প্যাকেজ প্রদর্শন করুন" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "তাদের অবস্থার সাথে সব প্যাকেজ প্রদর্শন করুন" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "তালিকার সব প্যাকেজ প্রদর্শন করুন" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "'%s' এর অবস্থার সারাংশ সমর্থন:" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "আপনার %(num)s প্যাকেজ (%(শতকরা).1f%%) সমর্থিত যতক্ষণ না %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "আপনার %(num)s প্যাকেজ (%(শতকরা).1f%%) যা পারেনা/ডাউনলোডের যোগ্য নেই" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "আপনার %(num)s প্যাকেজ (%(শতকরা).1f%%) যা অসমর্থিত" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2491,122 +2510,153 @@ "সচল --প্রদর্শন করুন-অসমর্থিত, --প্রদর্শন করুন-সমর্থিত অথবা --প্রদর্শন করুন-সব আরও " "বিস্তারিত দেখতে" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "আর ডাউনলোডের যোগ্য নেই:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "অসমর্থিত: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "%s পর্যন্ত সমর্থিত:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "অসমর্থিত" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "অবাস্তবায়িত মেথড: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "ডিস্কে একটি ফাইল" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb প্যাকেজ" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "অনুপস্থিত প্যাকেজ ইনস্টল।" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "%s প্যাকেজ ইনস্টল করা প্রয়োজন।" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb প্যাকেজ" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s কে ম্যানুয়ালী ইনস্টলের জন্য চিহ্নিত করা প্রয়োজন।" - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"আপগ্রেড করার সময়, যদি kdelibs4-dev ইনস্টল করা হয়, তবে kdelibs5-dev ইনস্টল করা " -"প্রয়োজন। বিস্তারিত জানতে bugs.launchpad.net, bug #279621 দেখুন।" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "স্ট্যাটাস ফাইলে %i অবসোলেট এন্ট্রি" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "dpkg স্ট্যাটাসে অবসোলেট এন্ট্রি" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "অবসোলেট dpkg স্ট্যাটাস এন্ট্রি" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"আপগ্রেড করার সময়, যদি kdelibs4-dev ইনস্টল করা হয়, তবে kdelibs5-dev ইনস্টল করা " +"প্রয়োজন। বিস্তারিত জানতে bugs.launchpad.net, bug #279621 দেখুন।" + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s কে ম্যানুয়ালী ইনস্টলের জন্য চিহ্নিত করা প্রয়োজন।" + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "lilo অপসারন করা হয়েছে grub ইনস্টল করা হয়েছে। (বিস্তারিতের জন্য বাগ #314004 " "দেখুন।)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "আপনার প্যাকেজের তথ্য হালনাগাদের পরে গুরুত্বপূর্ণ প্যাকেজ '%s' আর খুঁজে পাওয়া যায়নি " -#~ "তাই বাগ প্রতিবেদন করার প্রক্রিয়া শুরু হচ্ছে।" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "সংস্করণ ১২.০৪ এ উবুন্টু উন্নীত করা হচ্ছে" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s আপডেট নির্বাচিত হয়েছে।" -#~ msgstr[1] "%(count)s আপডেট নির্বাচিত হয়েছে।" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "উবুন্টুতে স্বাগতম" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "এই সংস্করণ অবমুক্ত হওয়ার পর থেকে এই সকল সফটওয়্যার হালনাগাদ প্রদত্ত হয়ে আসছে।" - -#~ msgid "Software updates are available for this computer." -#~ msgstr "এই কম্পিউটারের জন্য সফটওয়্যার হালনাগাদকরণ অব্যবহৃত।" - -#~ msgid "Update Manager" -#~ msgstr "আপডেট ম্যানেজার" - -#~ msgid "Starting Update Manager" -#~ msgstr "আপডেট ম্যানেজার শুরু করা হচ্ছে" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "আপনি ওয়ারলেস মোডেম দিয়ে সংযুক্ত।" - -#~ msgid "_Install Updates" -#~ msgstr "আপডেট ইন্সটল করো (_I)" +#~ "আপনার প্যাকেজের তথ্য হালনাগাদের পরে গুরুত্বপূর্ণ প্যাকেজ '%s' আর খুঁজে পাওয়া যায়নি " +#~ "তাই বাগ প্রতিবেদন করার প্রক্রিয়া শুরু হচ্ছে।" #~ msgid "Your system is up-to-date" #~ msgstr "আপনার সিস্টেম আপ-টু-ডেট" @@ -2751,6 +2801,9 @@ #~ "আপনার ইনটেল গ্রাফিক্স হার্ডওয়্যারের জন্য উবুন্টু ১১.০৪ সমর্থন সীমিত এবং উন্নীত করার " #~ "পরে আপনি সমস্যার সম্মুখীন হতে পারেন। আপনি কি উন্নীত করণ চালিয়ে যেতে চান?" +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "উবুন্টু সংস্করণ ১১.১০ তে উন্নীত করা হচ্ছে" + #~ msgid "" #~ "These software updates have been issued since this version of Ubuntu was " #~ "released. If you don't want to install them now, choose \"Update Manager" diff -Nru update-manager-17.10.11/po/bo.po update-manager-0.156.14.15/po/bo.po --- update-manager-17.10.11/po/bo.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/bo.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2011. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-12-06 06:39+0000\n" "Last-Translator: Tennom \n" "Language-Team: Tibetan \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s ཡི་ཞབས་ཞུ་བ" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "ཞབས་ཞུ་བ་གཙོ་བོ" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "རང་བཟོས་ཞབས་ཞུ་བ" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "གཏེར་མཛོད་གྲངས་ཐོ་བརྩི་མི་ཐུབ" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "ཡིག་ཆ་ཐུམ་བུ་གནས་སྟོན་ཐུབ་མི་འདུག འདི་ཕལ་ཆེར་མ་ལག་Ubuntu་མཛོད་སྡེར་རེད་མི་འདུག་ཡང་ན་སྒྲིག་བཟོ་ " "ཡང་དག་པ་རེད་མི་འདུག" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "་་CD་་འོད་སྡེར་ནང་ཚན་ཁ་སྣོན་ཐུབ་མ་བྱུང་།" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,12 +83,12 @@ "ནོར་འཁྲུལ་ཡི་གེ་ནི། \n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "སྐྱོན་ཅན་གྱི་ཐུམ་བུ་བསུབ་པ" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -103,15 +104,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "ཕལ་ཆེར་དྲ་ཞབས་ཞུ་བ་འདིར་ཁུར་པོ་ལྗིད་དྲག་འདུག" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "སྐྱོན་ཤོར་བའི་ཐུམ་བུ" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -120,7 +121,7 @@ "synaptic་འམ་ཡང་ན་apt-get་བེད་སྤྱོད་གཏོང་ནས་བཟོ་བཅོས་བྱེད་རོགས" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -140,26 +141,26 @@ " * མ་ལག་Ubuntu་ཀྱིས་མཁོ་སྤྲོད་མ་བྱས་པའི་གཞུང་བཟོས་མཉེན་ཆས་ཐུམ་བུ་མིན་པ\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "This is most likely a transient problem. Please try again later." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "རིམ་སྤོར་རྩིས་འདངས་རྒྱག་མི་ཐུབ་པ" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "ཐུམ་བུ་འགའ་ངོས་འཛིན་བྱེད་པ་ནོར་འཁྲུལ་" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -169,39 +170,39 @@ "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "རྟགས་'%s'འདི་འཁོད་ཡོད་པ་ཚང་མ་བསུབ་དགོས་ཀྱང་འདི་བསུབ་རྒྱུའི་དེབ་ཐོ་ནང་དུ་མི་འདུག" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "གལ་ཆེན་ཐུམ་བུ'%s' འདིར་བསུབ་དགོས་པའི་རྟགས་འཁོད་འདུག" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "རྟགས་ངན་ཅན་པར་གཞི་'%s་སྒྲིག་འཇུག་ཚོད་ལྟ་བཞིན་པ'" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "'%s'སྒྲིག་འཇུག་མི་ཐུབ་པ" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "meta-package་ཚོད་དཔགས་མི་ཐུབ་པ" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -214,15 +215,15 @@ "བྱེད་པ་འགྲུབ་མི་སྲིད \n" "མདུན་སྐྱོད་མ་བྱས་གོང་synaptic་དང་ཡང་ན་ apt-get་བེད་སྤྱོད་ནས་གོང་གི་ཐུམ་བུ་ཞིག་སྒྲིག་འཇུག་བྱེད་རོགས" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "དྲ་ཤུལ་ཀློག་བཞིན་པ" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "གཅིག་འགྱུར་གྱི་ཟྭ་མ་ཐོབ་པ" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -230,11 +231,11 @@ "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "རྒྱང་འབྲེལ་སྦྲེལ་མཐུད་རིམ་སྤོར་བྱེད་པ་རྒྱབ་སྐྱོར་མེད" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -247,11 +248,11 @@ "\n" "རིམ་སྤོར་འདི་ད་ལྟ་མཚམས་བཅད་རྒྱུ་ཡིན་པ་དང་sshམ་སྤྱད་པ་ཚོད་ལྟ་བྱེད་རོགས" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -268,11 +269,11 @@ "If you continue, an additional ssh daemon will be started at port '%s'.\n" "Do you want to continue?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Starting additional sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -283,7 +284,7 @@ "started on port '%s'. If anything goes wrong with the running ssh, you can " "still connect to the additional one.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -295,29 +296,29 @@ "འགུལ་གྱིས་བཟོས་མེད། ཁྱོད་ཀྱིས་འདི་སྤྱད་ནས་མཐུད་སྣེ་ཁ་འབྱེད་ཆོག་པ། དཔེར་ན:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Cannot upgrade" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "An upgrade from '%s' to '%s' is not supported with this tool." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Sandbox setup failed" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "It was not possible to create the sandbox environment." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Sandbox mode" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -327,17 +328,17 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Package 'debsig-verify' is installed" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -347,12 +348,12 @@ "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -360,11 +361,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Include latest updates from the Internet?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -384,16 +385,16 @@ "latest updates soon after upgrading.\n" "If you answer 'no' here, the network is not used at all." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "disabled on upgrade to %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "No valid mirror found" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -413,11 +414,11 @@ "If you select 'No' the upgrade will cancel." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Generate default sources?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -430,21 +431,21 @@ "Should default entries for '%s' be added? If you select 'No', the upgrade " "will cancel." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "གསོག་མཛོད་ཆ་འཕྲིན་ཕན་ནུས་མེད་པ" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "གཉེར་མཁན་གསུམ་པའི་འབྱུང་ཁུངས་ནུས་མེད་སྒྱུར" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -454,12 +455,12 @@ "enable them after the upgrade with the 'software-properties' tool or your " "package manager." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "འཐུམ་སྒྲིལ་མཉམ་སྒྲིལ་མིན་པ" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -473,11 +474,11 @@ "'%s' འཐུམ་སྒྲིལ་ནི་མཉམ་དུ་སྦྲེལ་མི་འདུག་པས་ཡང་བསྐྱར་སྒྲིག་འཇུག་གནང་རོགས། ཡིནའང་སྒྲིག་འཇུག་ཡིག་ཚགས་ཀྱང་" "རྙེད་མི་འདུག་པས་འཐུམ་སྒྲིལ་ལག་པས་སྒྲིག་འཇུག་བཤིགས་པའམ་མ་ལག་ཐོག་ནས་འདོར་དགོས" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "གསར་སྒྱུར་གྱི་ནོར་འཁྲུལ" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -485,13 +486,13 @@ "གསར་སྒྱུར་སྐབས་ནོར་འཁྲུལ་བྱུང་བ། ནམ་རྒྱུན་འདི་ནི་དྲ་བའི་གནོད་སྐྱོན་ཡིན་པས་ problem, please check " "your network connection and retry." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "བླུགས་སྡེར་འདངས་བ་མེད་པ" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -505,21 +506,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "བཟོ་བཅོས་འདི་བརྩི་འདངས་རྒྱག་བཞིན་པ" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "རིམ་སྤོར་འགོ་འཛུགས་དགོས་སམ" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "རིམ་སྤོར་རྩིས་མེད་གཏོང" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -527,12 +528,12 @@ "རིམ་སྤོར་རྩིས་མེད་གཏོང་ནས་མ་ལག་ཐོག་མའི་གནས་སྟངས་བསྐྱར་གསོས་བྱེད་རྒྱུ ཁྱོད་ཀྱིས་རྗེས་སུ་རིམ་སྤོར་དེ་མི་མཐུད་" "ཐུབ" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "རིམ་སྤོར་ལེན་འཇུག་མི་ཐུབ་པ" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -540,27 +541,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "ངོས་འཛིན་སྐབས་སྐྱོན་བྱུང་བ" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "མ་ལག་ཐོག་མའི་གནས་སྟངས་བསྐྱར་གསོ་བཞིན་པ" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "རིམ་སྤོར་སྒྲིག་འཇུག་མི་ཐུབ་པ" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -568,7 +569,7 @@ "རིམ་སྤོར་ཆད་སོང་། ཁྱོད་ཀྱི་མ་ལག་དེ་སྤྱོད་མི་རུང་བའི་གནས་ལ་ལྷུང་འགྲོ་ཉེན་ཆེ། ད་ལྟ་སྐྱོན་གསོ་བྱེད་ཞིག་འཁོར་" "སྐྱོད་བྱེད་པ (dpkg --configure -a)" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -579,7 +580,7 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -587,20 +588,20 @@ "གསར་སྒྱུར་དེ་ཆད་སོང་། ཁྱོད་ཀྱི་དྲ་བ་སྦྲེལ་མཐུད་དང་ཡང་ན་སྒྲིག་འཇུག་འཇུག་ཟམ་ལ་ཞིབ་བཤེར་བྱས་ནས་ཡང་བསྐྱར་" "ཚོད་ལྟ་བྱེད་རོགས " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "དུས་ཡོལ་འཐུམ་སྒྲིལ་བསུབ་པ" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "ཉར་འཇོག_K" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "བསུབ་པ_R" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -608,37 +609,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "དགོས་མཁོའི་ཞོལ་གཏོགས་སྒྲིག་འཇུག་བྱས་མི་འདུག" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "དགོས་མཁོའི་ཞོལ་གཏོགས་'%s' སྒྲིག་འཇུག་མི་འདུག " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "འཐུམ་སྒྲིལ་དོ་དམ་པ་ཞིབ་བཤེར་བཞིན་པ" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "ལེགས་འགྲུབ་མ་ཐུབ་པའི་རིམ་སྤོར་ལ་གྲ་སྒྲིག་བཞིན་པ" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "སྔོན་འགྲོའི་ཆ་རྐྱེན་ཐོབ་མ་ཐུབ་པ" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -646,68 +647,68 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "གསོག་མཛོད་གྱི་གནས་ཚུལ་གསར་སྒྱུར་བཞིན་པ" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "་་CD་་འོད་སྡེར་བཀོལ་ཆས་ཁ་སྣོན་མ་ཐུབ" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "དགོངས་དག འོད་སྡེར་འཇུག་གནས་སྣོན་མ་ཐུབ་པ" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "འཐུམ་སྒྲིལ་གནས་ཚུལ་ཕན་ནུས་མེད་པ" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "ལེན་བཞིན་པ" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "རིམ་སྤོར་བཞིན་པ" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "རིམ་སྤོར་ལེགས་འགྲུབ" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "རིམ་སྤོར་ལེགས་འགྲུབ་ཚར་ནའང་རིམ་སྤོར་སྐྱོད་བཞིན་པའི་སྐབས་ནོར་འཁྲུལ་ཞིག་འདུག" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "དུས་ཡོལ་གྱི་མཉེན་ཆས་འཚོལ་བཞིན་པ" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "མ་ལག་རིམ་སྤོར་ལེགས་འགྲུབ་ཚར" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "ཆ་ཤས་རིམ་སྤོར་ཞིག་ལེགས་འགྲུབ་ཚར" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms་སྤྱོད་བཞིན་པ" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -716,11 +717,11 @@ "ཁྱོད་ཀྱི་མ་ལག་གིས་/proc/mounts་ནང་གི'evms'འཇུག་སྣོད་དོ་དམ་ཆས་སྤྱོད་པ 'evms' ལ་རམ་འདེགས་མེད་" "པས་འདིར་གློག་སྒོ་བརྒྱབ་ནས་རིམ་སྤོར་ཞིག་ཡང་བསྐྱར་བྱེད་དགོས" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -728,9 +729,9 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -738,8 +739,8 @@ "རིམ་སྤོར་གྱིས་མདུན་ངོས་ཀྱི་རྣམ་པ་དང་རྩེད་རིགས་ཀྱི་འགྲོ་སྟངས། པར་རིས་མང་པོ་ཡོད་པའི་བྱ་རིམ་ལ་འགྱུར་ལྡོག་ཡོད་" "ཉེན་ཆེཨ" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -752,7 +753,7 @@ "\n" "ཁྱོད་ཀྱིས་མུ་མཐུད་འདོད་དམ" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -765,11 +766,11 @@ "\n" "ཁྱོད་ཀྱིས་མུ་མཐུད་དགོས་སམ" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "i686 CPU་མེད་པ" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -781,11 +782,11 @@ "minimal architecture. It is not possible to upgrade your system to a new " "Ubuntu release with this hardware." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "ARMv6 CPU་མེད་པ" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -797,11 +798,11 @@ "minimal architecture. It is not possible to upgrade your system to a new " "Ubuntu release with this hardware." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "init ་མེད་པ" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -817,15 +818,15 @@ "\n" "Are you sure you want to continue?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "aufs་བེད་སྤྱོད་ནསSandbox རིམ་སྤོར་བྱེད་པ" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "རྒྱུད་ཁོངས་དེ་སྤྱོད་ནས་རིམ་སྤོར་ཐུམ་བུ་ཡོད་པའི་འོད་སྡེར་སྒུལ་སྐྱོད་པ་འཚོལ་བཤེར་བྱེད་པ" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -833,57 +834,57 @@ "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "རིམ་སྤོར་དུམ་བུ་ཞིག་ཁོ་ན་བྱེད་པ (འབྱུང་ཁུངས་ཐོ་འགོད་བསྐྱར་འབྲི་མི་བྱེད་པ)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "GNUའཆར་ངོས་རམ་འདེགས་ནུས་མེད་བསྒྱུར" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "datadir་སྒྲིག་འཛུགས་བྱེད་པ" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "སྒུལ་ཆས་'%2s'ནང་དུ་'%1s'འཇུག་རོགས" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "ལེན་འཇུག་ལེགས་འགྲུབ" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "ཡིག་ཆ་ %2li ནང་ནས་ %1li ཚད་ %s B/s ཐོག་ལེན་འཇུག་བྱེད་བཞིན་པ" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "ཕལ་ཆེར་ %s ་ལྷགས་ཡོད" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "ཡིག་ཆ་ %2li ནང་ནས་ %1li ལེན་འཇུག་བཞིན་པ" @@ -893,27 +894,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "བཟོ་བཅོས་འདོན་བཞིན་པ" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "འཁོར་གཏོགས་སྐོར་སྐྱོན - སྒྲིག་བཟོ་མེད་པ་སྐྱུར་ཡོད་པ" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Could not install '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -925,7 +926,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -936,7 +937,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -944,20 +945,20 @@ "ཁྱོད་ཀྱིས་གལ་སྲིད་སྒྲིག་བཟོ་ཡིག་ཆ་དེ་པར་གཞི་གསར་པ་ཞིག་གིས་ཚབས་བཅུག་ན་ དེ་སྔར་དེའི་ཐོག་སྒྲིག་བཟོ་བྱས་པ་" "རྣམས་བཀླགས་འགྲོའོ།" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "'diff'བཀའ་བརྡ་མ་རྙེད་པ" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "ནོར་འཁྲུལ་ཚབས་ཆེན་ཞིག་བྱུང་བ" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -969,13 +970,13 @@ "འགྲོའོ།\n" "ཁྱོད་ཀྱི་ཐོག་མའི་འབྱུང་ཁུངས་མིང་ཐོ /etc/apt/sources.list.distUpgrade་གསོག་འཇོག་བྱས་ཡོད།" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c ་གནོན་བྱུང་།" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -983,134 +984,134 @@ "འདིས་བྱ་འགུལ་འདི་མཚམས་གཅོད་པ་དང་མ་ལག་ལའང་སྐྱོན་གཏོང་ངེས་ཡིན།ཁྱོད་ཀྱིས་འདི་བྱེད་པར་གཏན་ཁེལ་ཡིན་ནམ།" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "ཆ་འཕྲིན་གྲངས་མི་བརླགས་པའི་ཆེད་དུ་ཉེར་སྤྱོད་དང་ཡིག་གེ་ཡོངས་རྫོགས་སྒོ་རྒྱག་དགོས" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Canonical (%s)ཡིས་རམ་འདེགས་མི་བྱེད་པ" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "རིམ་ཆགས (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "(%s)འདོར་བ" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "འདི་མི་དགོས་པ(%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "(%s)སྒྲིག་འཇུག་བྱེད་པ" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "(%s)་རིམ་སྤོར" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "འཇུག་ཟམ་བརྗེ་བ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "ཁྱད་པར་མངོན་པ>>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< ཁྱད་པར་སྐུངས་པ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "ནོར་འཁྲུལ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "རྩིས་མེད་གཏོང་ &C" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "སྒོ་རྒྱག་ &C" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "འཇུག་སྒོ་སྟོན་པ >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< འཇུག་སྒོ་སྐུངས་པ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "གནས་ཚུལ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "ཞིབ་ཕྲ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "འདི་ལ་རམ་འདེགས་མི་བྱེད་པ %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "%s་འདོར་བ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "%s་འདོར་བ (རང་འགུལ་སྒྲིག་འཇུག་བྱས་པ)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "%s་སྒྲིག་འཇུག་བྱེད་པ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "%s་རིམ་སྤོར" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "འགོ་བསྐྱར་འཛུགས་དགོས་པ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "་མ་ལག་འགོ་བསྐྱར་འཛུགས་བྱས་ནས་རིམ་སྤོར་ལེགས་འགྲུབ་བྱེད་པ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "ད་ལྟ་འགོ་བསྐྱར་འཛུགས_R" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1121,29 +1122,29 @@ "\n" "རིམ་སྤོར་རྩིས་མེད་གཏོང་ན་མ་ལག་སྤྱོད་མི་རུང་བ་འགྱུར་ཉེན་ཡོད་པས་རིམ་སྤོར་ མུ་མཐུད་ན་དགའ་ངོས་ཡིན" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "རིམ་སྤོར་རྩིས་མེད་གཏོང་དགོས་སམ" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "ཉིན་%li" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "ཆུ་ཚོད་%li" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "སྐར་མ་%li" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1158,7 +1159,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1172,14 +1173,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1188,34 +1189,32 @@ "ལེན་འཇུག་འདི་ལ་ས་ཡ་ཚིག་1་ཅན་DSL སྦྲེལ་མཐུད་དང་56k ་དྲ་འཇུག་སྣེ%s་ཅན་ཚད་ཀྱིས་ དུས་ཚོད་%s་དགོས།" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "ཁྱོད་ཀྱི་སྦྲེལ་མཐུད་ཀྱིས་ལེན་འཇུག་འདི་བྱེད་པར་དུས་ཚོད་ %s་དགོས " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "རིམ་སྤོར་གྲལ་སྒྲིག་བཞིན་པ" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "མཉེན་ཆས་རྩ་འཛུགས་གསར་བ་འདོན་བཞིན་པ" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "ཐུམ་བུ་གསར་བ་འདོན་བཞིན་པ" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "རིམ་སྤོར་སྒྲིག་འཇུག་བཞིན་པ" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "གཙང་དག་བཟོ་བཞིན་པ" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1229,25 +1228,25 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "ཐུམ་བུ་%d་བསུབ་འགྲོ་ངེས།" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "ཐུམ་སྒྲིལ་གསར་བ་%d་སྒྲིག་འཇུག་བྱེད་ངེས" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "ཐུམ་སྒྲིལ་གསར་བ་%d་རིམ་སྤོར་བྱེད་ངེས" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1258,145 +1257,145 @@ "\n" "ཁྱོད་ཀྱིས་ཁྱོན་བསྡོམས་ལེན་འཇུག་དགོས་པའི་ཚད %s " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "ཁྱོད་ཀྱི་མ་ལག་ལ་རིམ་སྤོར་མེད་པས་རིམ་སྤོར་འདི་ད་ལྟ་རྩིས་མེད་གཏོང་རྒྱུ་ཡིན" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "འགོ་བསྐྱར་འཛུགས་དགོས་པ" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "རིམ་སྤོར་མཇུག་རྫོགས་ཚར་བ་དང་འགོ་བསྐྱར་འཛུགས་དགོས་པ། ད་ལྟ་འདི་བྱེད་དགོས་པ་ཡིན་ནམ" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "རིམ་སྤོར་སྤྱོད་ཆས་འཁོར་སྐྱོད་བྱེད་མི་ཐུབ་པ" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "རིམ་སྤོར་སྤྱོད་ཆས་གྱི་ས་ཡིག" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "རིམ་སྤོར་སྤྱོད་ཆས" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "ལེན་འཇུག་མ་ཐུབ་པ" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "རིམ་སྤོར་ལེན་འཇུག་མ་ཐུབ་པ། འདི་ནི་དྲ་བའི་གནོད་སྐྱོན་ཞིག་ཕལ་ཆེར་རེད " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "བདེན་དཔངས་མ་ཐུབ་པ" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "རིམ་སྤོར་བདེན་དཔངས་མ་ཐུབ་པ། འདི་ཕལ་ཆེར་དྲ་བའམ་དྲ་བ་ཞབས་ཞུ་བའི་སྐྱོན་ཡིན་ངེས " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "ཕྱིར་རུ་འདོན་མི་ཐུབ་" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "རིམ་སྤོར་ཕྱིར་རུ་འདོན་མི་ཐུབ་པ། འདི་ཕལ་ཆེར་དྲ་བའམ་དྲ་བ་ཞབས་ཞུ་བའི་སྐྱོན་ཡིན་ངེས " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "ར་སྤྲོད་མ་ཐུབ་པ" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "རིམ་སྤོར་ར་སྤྲོད་མ་ཐུབ་པ། འདི་ཕལ་ཆེར་དྲ་བའམ་དྲ་བ་ཞབས་ཞུ་བའི་སྐྱོན་ཡིན་ངེས " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "རིམ་སྤོར་འཁོར་སྐྱོད་མི་ཐུབ་པ" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "ནོར་འཁྲུལ་བརྡ་འཕྲིན་ '%s'" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1407,73 +1406,73 @@ "log མཉམ་དུ་ཡར་ཞུ་སྤྲོད་རོགས། རིམ་སྤོར་འདི་འདོར་ཚར་བ\n" "ཁྱོད་ཀྱི་ཐོག་མའི་འབྱུང་ཁུངས་མིང་ཐོ་ནི /etc/apt/sources.list.distUpgrade གསོག་འཇོག་ཡོད་པ" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "བར་གཅོད་བཞིན་པ" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "རིམ་ཆགས་ཟིན་པ:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "མུ་མཐུད་དགོས་ན [ENTER]མནན་རོགས" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "མུ་མཐུད་པ་[ཡིན/མིན] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "ཞིབ་ཕྲ [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "ཡིན" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "མིན" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "ཞིབ་ཕྲ" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "རམ་འདེགས་མེད་པ: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "བསུབ་པ: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "སྒྲིག་འཇུག: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "རིམ་སྤོར: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "མུ་མཐུད་ [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1540,7 +1539,7 @@ msgstr "འགྲེམ་སྤེལ་རིམ་སྤོར" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1559,152 +1558,166 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "འདིར་ཡུད་ཙམ་འགོར་ཉེན་ཆེ་བས་ཉིད་ཀྱིས་སྒུག་རོགས" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "གསར་སྒྱུར་ལེགས་འགྲུབ་ཚར" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "པར་བསྐྲུན་གསལ་བཤད་རྙེད་མི་འདུག" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "དྲ་བ་ཞབས་ཞུ་བ་ལ་ཁུར་པོ་ལྗི་དྲགས་པ " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "པར་བསྐྲུན་གསལ་བཤད་གེན་འཇུག་མི་ཐུབ" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "ཁྱོད་ཀྱི་དྲ་བ་སྦྲེལ་མཐུད་ལ་ལྟ་ཞིབ་བྱེད་རོགས" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "རིམ་སྤོར" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "པར་བསྐྲུན་གསལ་བཤད" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "ཐུམ་བུ་ཡིག་ཆ་ཁ་སྣོན་དུ་ལེན་འཇུག་བཞིན་པ་་་" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "ཡིག་ཆ་ %2s ་ནང་གི་ %1s ་ཚད་ %s ཚིག་/སྐར་ཆ" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "ཡིག་ཆ་ %2s ནང་གི་ %1s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "ལྟ་བཤེར་བའི་ནང་དུ་སྦྲེལ་མཐུད་ཁ་འབྱེད" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "དྲས་པང་ཐོག་ཏུ་སྦྲེལ་མཐུད་འདྲ་བཤུ" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" "ཁྱོན་ཡོངས་%(total)li་ནང་ནས་ཡིག་ཆ་%(current)li་ལེན་འཇུག་བཞིན་པ་ ་ཚད %(speed)s/སྐར་ཆ" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "ཁྱོན་ཡོངས་%(total)li་ནང་ནས་ཡིག་ཆ་%(current)li་ལེན་འཇུག་བཞིན་པ་" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "ཁྱོད་ཀྱི་Ubuntu པར་གཞི་འདིར་རྒྱབ་སྐྱོར་མེད་པ།" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "རིམ་སྤོར་གནས་ཚུལ" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "སྒྲིག་འཇུག" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "པར་གཞི་ %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "དྲ་བའི་སྦྲེལ་མཐུད་རྙེད་མ་ཐུབ ཁྱོད་ཀྱིས་བཟོས་བཅོས་ཐོ་འགོད་སྐོར་ལེན་འཇུག་མི་ཐུབ" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "བཟོ་བཅོས་ཁག་ཅིག་ལེན་འཇུག་བཞིན་པ་་་" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "གསར་སྒྱུར་དགོས་པ་%(count)s བདམས་ཟིན་པ" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s ལེན་འཇུག་བྱེད་པ" #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "གདམ་ཟིན་པའི་ཐུམ་བུ་གསར་སྒྱུར་རྣམས་མ་ལག་འདིའི་ཐོག་ལེན་འཇུག་དང་སྒྲིག་འཇུག་བྱས་ཚར" +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "ལེན་འཇུག་གི་ཆེ་ཆུང་ཚད་མི་ཤེས" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1713,13 +1726,13 @@ "ཐུམ་བུ་འདི་ཐེངས་རྗེས་མའི་གསར་སྒྱུར་བྱས་པ་ནི་ཉིན་%(days_ago)s འགོར་སོང་།\n" "འོག་གི་ལྟ་བཤེར་མཐེབ་ལ་མནན་ནས་མཉེན་ཆས་གསར་སྒྱུར་ལྟ་བཤེར་བྱེད་དགོས" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "ཐུམ་བུ་སྐོར་ཐེངས་རྗེས་མའི་གསར་སྒྱུར་བྱས་ནས་ཉིན་ %(days_ago)s འགོར་སོང་།" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1727,34 +1740,43 @@ msgstr[0] "ཐུམ་བུ་སྐོར་ཐེངས་རྗེས་མའི་གསར་སྒྱུར་བྱས་ནས་ཆུ་ཚོད་ %(hours_ago)s འགོར་སོང་།" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"མཉེན་ཆས་གསར་སྒྱུར་བྱས་ན་ནོར་འཁྲུལ་དག་བཅོས་བཟོ་བ་དང་བདེ་སྲུང་ཉེན་ཁ་འདོར་བ། ཁྱད་ནུས་གསར་བ་སྟེར་བ" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "རྩིས་འཁོར་འདི་ལ་མཉེན་ཆས་གསར་སྒྱུར་བྱེད་རྒྱུ་ཡོད་སྲིད" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Ubuntu མ་ལག་གིས་དགའ་བསུ་ཞུ" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1765,7 +1787,7 @@ "བླུགས་སྡེར་སྟོང་བ་%s ་བཟོ་རོགས། འདིར་གད་སྙིགས་བཤོ་བ་དང་'sudo apt-get clean'སྤྱོད་ནས་ སྔོན་གྱི་" "སྒྲིག་འཇུག་གི་གནས་སྐབས་ཐུམ་བུ་བསུབ་ཆོག" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1773,23 +1795,23 @@ "རིམ་སྤོར་སྒྲིག་འཇུག་ལེགས་འགྲུབ་ཀྱི་ཆེད་དུ་རྩིས་འཁོར་འགོ་བསྐྱར་འཛུགས་དགོས་པ། ཁྱོད་ཀྱི་ལས་ཀ་གསོག་འཇོག་བྱས་" "ནས་ནུ་མཐུད" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "ཐུམ་བུ་ཀློག་བཞིན་པ" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "མཐུད་བཞིན་པ་་་" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "ཁྱོད་ཀྱིས་ཕལ་ཆེར་གསར་སྒྱུར་གསར་པར་འཚོར་ཞིབ་དང་གསར་སྒྱུར་མི་ཐུབ" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "ཐུམ་བུ་སྐོར་འགོ་སློང་མི་ཐུམ་པ" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1800,7 +1822,7 @@ "ཐུམ་བུ་སྐོར་འགོ་སློང་བའི་སྐབས་བསྐྱར་གསོ་མི་ཐུབ་པའི་སྐྱོན་བྱུང་བ། \n" "ནོར་འཁྲུལ་འདི་དང་གཤམ་གྱི་ནོར་འཁྲུལ་ཡིག་གེ་མཉམ་དུ་་གསར་སྒྱུར་དོ་དམ་པ་ལ་ཡར་ཞུ་ སྤྲོད་རོགས:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1811,31 +1833,31 @@ "\n" "ནོར་འཁྲུལ་འདི་དང་གཤམ་གྱི་ནོར་འཁྲུལ་ཡིག་གེ་མཉམ་དུ་་གསར་སྒྱུར་དོ་དམ་པ་ལ་ཡར་ཞུ་ སྤྲོད་རོགས:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (སྒྲིག་འཇུག་གསར་པ)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(ཆེ་ཆུང: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "པར་གཞི་%(old_version)s ནས་ %(new_version)s་སྒྱུར་བ" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "པར་གཞི་ %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "ད་ལྟ་འགྲེམས་སྤེལ་གསར་པའི་རིམ་སྤོར་བྱེད་མི་ཐུབ" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1844,21 +1866,21 @@ "འགྲེམས་སྤེལ་གསར་པའི་རིམ་སྤོར་ད་ལྟ་སྒྲུབ་མི་ཐུབ རྗེས་སུ་ཡང་བསྐྱར་ཚོད་ལྟ་གནོང་རོགས ཞབས་ཞུ་བས་ཡར་ཞུ། " "'%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "རིམ་སྤོར་འགྲེམས་སྤེལ་སྤྱོད་ཆས་ལེན་འཇུག་བཞིན་པ" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Ubuntu་མ་ལག་འགྲེམས་སྤེལ་གསར་པ་ '%s' སྤྱོད་རུང་བ" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "མཉེན་ཆས་ཟུར་རྟགས་འཕྲོ་བརླགས་ཚར་འདུག" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1868,6 +1890,17 @@ "པའམ་terminal་་སྒོ་འཇུག་་ནང་དུ་ \"sudo apt-get install -f\" འཇུག་ནས་ གནས་ཚུལ་འདི་བཟོ་" "བཅོས་བྱེད་རོགས།" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "འགྲེམ་སྤེལ་གསར་པ་'%s' སྤྱོད་རུང་བ" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "རྩིས་མེད་གཏོང" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1877,22 +1910,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "རྩིས་མེད་གཏོང" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "གསར་སྒྱུར་མིང་ཐོ་བཟོ་བཞིན་པ" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1916,20 +1945,20 @@ " * Ubuntu་མ་ལག་དཔོན་ས་ནས་ཐོབ་པའི་མཉེན་ཆས་མིན་པ\n" " * Ubuntu་མ་ལག་གི་འགྲེམས་སྤེལ་སྔོན་མའི་རྒྱུན་ལྡན་བཟོ་བཅོས་ཡིན་པ" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "བཟོ་བཅོས་ཟིན་ཐོ་ལེན་འཇུག་བཞིན་པ" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "གསར་སྒྱུར་གཞན་པ (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -1937,7 +1966,7 @@ "བཟོ་བཅོས་ཐོ་འགོད་ལེན་འཇུག་མ་ཐུབ་པ།\n" "དྲ་བ་སྦྲེལ་མཐུད་ལ་བརྟག་བཤེར་བྱེད་རོགས།" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1946,7 +1975,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1960,7 +1989,7 @@ "+changelog\n" "སྤྱོད་པའམ་གཞུགས་ནས་ཚོད་ལྟ་བྱེད་རོགས" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1974,51 +2003,43 @@ "+changelog\n" "སྤྱོད་པའམ་གཞུགས་ནས་ཚོད་ལྟ་བྱེད་རོགས" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "འགྲེམ་སྤེལ་བཙལ་མ་ཐུབ་པ" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "མ་ལག་གང་ཞིག་སྤྱོད་བཞིན་པར་རྟག་བཤེར་སྐབས་ནོར་འཁྲུལ་ '%s' བྱུང་བ།" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "བདེ་འཇགས་གསར་སྒྱུར་རྩ་ཆེན" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "མཚམས་སྦྱོར་གསར་སྒྱུར" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Proposed updates" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backports" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "འགྲེམས་སྤེལ་གསར་སྒྱུར" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "གསར་སྒྱུར་གཞན་པ" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "གསར་སྒྱུར་དོ་དམ་པ་འགོ་འཛུགས་བཞིན་པ" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"མཉེན་ཆས་གསར་སྒྱུར་བྱས་ན་ནོར་འཁྲུལ་དག་བཅོས་བཟོ་བ་དང་བདེ་སྲུང་ཉེན་ཁ་འདོར་བ། ཁྱད་ནུས་གསར་བ་སྟེར་བ" - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "རིམ་སྤོར་དུམ་བུ_P" @@ -2088,60 +2109,60 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "མཉེན་ཆས་རིམ་སྤོར" +msgid "Update Manager" +msgstr "གསར་སྒྱུར་དོ་དམ་པ" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "མཉེན་ཆས་རིམ་སྤོར" +msgid "Starting Update Manager" +msgstr "གསར་སྒྱུར་དོ་དམ་པ་འགོ་འཛུགས་པ" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "རིམ་སྤོར_p" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "རིམ་སྤོར" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "སྒྲིག་འཇུག" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "བཟོ་བཅོས" +msgid "updates" +msgstr "རིམ་སྤོར" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "གསལ་བཤད" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "གསར་སྒྱུར་གསལ་བཤད" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "" "ཁྱོད་ཀྱིས་རྒྱ་བསྐྱེད་དྲ་བ་བརྒྱུད་ནས་སྦྲེལ་མཐུད་བྱས་འདུག་པས་གསར་སྒྱུར་གྱི་རིན་འབབ་ཆ་འཕྲིན་གྲངས་ཚད་ལ་བསྟུན་སྲིད" -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "ཁྱོད་ཀྱིས་སྐུད་མེད་མཐུན་སྒྲིག་ཆས་བརྒྱུད་ནས་སྦྲེལ་མཐུད་བྱས་འདུག" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "གསར་སྒྱུར་མ་བྱས་སྔོན་རྩིས་འཁོར་ACགློག་ཁུངས་དང་མཐུད་ན་བཟང" +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "རིམ་སྤོར་སྒྲིག་འཇུག_I" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "བཟོ་བཅོས" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "" +msgid "Description" +msgstr "གསལ་བཤད" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "སྒྲིག་འཇུག" +msgid "Description of update" +msgstr "གསར་སྒྱུར་གསལ་བཤད" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2164,9 +2185,8 @@ msgstr "ཁྱོད་ཀྱིས་Ubuntuགསར་པར་རིམ་སྤོར་བྱེད་པར་འདོར་ཚར" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "རྗེས་སུ་རིམ་སྤོར་དགོས་ན་གསར་སྒྱུར་དོ་དམ་པ་ཁ་ཕྱེ་ནས་\"རིམ་སྤོར་\"ལ་རྡེབ་གནོན་བྱེད་དགོས་" @@ -2178,58 +2198,58 @@ msgid "Show and install available updates" msgstr "རིམ་སྤོར་སྤྱོད་རུང་རྣམས་མངོན་པ་དང་སྒྲིག་འཇུག་བྱེད" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "པར་གཞི་མངོན་ནས་ཕྱིར་འདོན" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Directory that contains the data filesཆ་འཕྲིན་གྲངས་ཡིག་ཆའི་འཇུག་སྣོད" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Ubuntu་འགྲེལ་སྤེལ་གསར་པ་ལྟ་བཤེར་བྱེད་པ" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "Check if upgrading to the latest devel release is possibleཐེངས་རྗེས་མའི་འགྲེམ་སྤེལ་ལ་" "རིམ་སྤོར་ཐུབ་མིན་རྟགས་བཤེར" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "པར་གཞི་རིམ་སྤོར་བའི་ཐེངས་རྗེས་མའི་པར་གཞི་བེད་སྤྱོད་ནས་རིམ་སྤོར་བྱེད་པ" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "སྒོ་འབྱེད་པ་དང་ས་ཁྲ་གཙོ་འཛིན་མི་བྱེད་པ" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "dist-རིམ་སྤོར་འཁོར་སྐྱོད་ཚོད་ལྟ་བྱེད་པ" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "འགོ་འཛུགས་པ་དང་གསར་སྒྱུར་ལྟ་བཤེར་བྱེད་མི་དགོས" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "sandbox aufs ཕྱི་རིམ་ཞིག་གིས་རིམ་སྤོར་ཚོད་ལྟ་བ" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "རིམ་སྤོར་ཚོ་གཅིག་འཁོར་སྐྱོད་བཞིན་པ" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "$distro-proposedཡི་རིམ་སྤོར་ཆས་སྤྱོད་ནས་ཐེངས་རྗེས་མའི་པར་གཞི་ལ་རིམ་སྤོར་བྱེད་པ" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2239,11 +2259,11 @@ "དང་ཐོག་གི་གཙོ་ངོས་མ་ལག་ལ་་གཙོ་ངོས་་ཀྱི་ཚད་ལྡན་རིམ་སྤོར་དང་ཞབས་ཞུ་བའི་མ་ལག་ལ་ ཞབས་ཞུ་བའི་རམ་" "འདེགས་ཡོད་པ།" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "དམིགས་བསལ་ཅན་གྱི་མདུན་སྣེ་འཁོར་སྐྱོད" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2251,11 +2271,11 @@ "འགྲེམས་སྤེལ་གསར་པ་ཁོ་ན་ཡོད་མིན་འཚོར་བཤེར་བྱེད་པ་དང་ཕྱིར་ཐོན་ཨང་རྟགས་བརྒྱུད་ནས་འདིའི་མཇུག་འབྲས་ཡར་ཞུ་" "བྱེད་དགོས" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2263,167 +2283,211 @@ "རིམ་སྤོར་སྐོར་འདིར་འདྲི་ཞིབ་བྱེད་རོགས:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "འགྲེམ་སྤེལ་གསར་པ་མ་རྙེད" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "འགྲེམ་སྤེལ་གསར་པ་'%s' སྤྱོད་རུང་བ" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "'do-release-upgrade'འགྲེལ་སྤེལ་རིམ་སྤོར་བྱོས་་འཁོར་སྤྱོད་བྱས་ནས་དེ་ལ་རིམ་སྤོར་བྱེད་པ" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Ubuntu %(པར་གཞི་)་ལ་རིམ་སྤོར་ཆོག་པ" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Ubuntu %s་རིམ་སྤོར་བྱེད་པར་ཁྱོད་ཀྱིས་འདོར་ཚར" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "ལེགས་འགྲུབ་མ་བྱུང་བའི་ཐབས་ཤེས: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "བླུགས་སྡེར་ནང་གི་ཡིག་ཆ་ཞིག" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb འཐུམ་སྒྲིལ" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "ཆ་མ་ཚང་བའི་འཐུམ་བུ་སྒྲིག་འཇུག" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "%s་འཐུམ་བུ་སྒྲིག་འཇུག་དགོས་པ" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb འཐུམ་སྒྲིལ" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%sལ་ལག་བཟོས་སྒྲིག་འཇུག་དགོས་པ" - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"རིམ་སྤོར་སྐབས་གལ་སྲིད་kdelibs4-devསྒྲིག་འཇུག་ཚར་ན་kdelibs5-devཡང་སྒྲིག་འཇུག་དགོས་པ bugs." -"launchpad.net, bug #279621ལ་བལྟས་ནས་ཞིབ་ཕྲ་ཀློག་པ" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "གནས་སྟངས་ཡིག་ཆ་ནང་%iའཇུག་སྣོད་རྙིང་པ་འདུག" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Obsolete entries in dpkg གནས་སྟངས་ནང་དུ་འཇུག་སྣོད་རཉིང་པ་འདུག" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Obsolete dpkg གནས་སྟངས་འཇུག་སྣོད་རྙིང་པ" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" -msgstr "grub སྒྲིག་འཛུགས་ཡོད་པའི་སྟབས་ཀྱིས་lilo་བསུབ་དགོས(ཞིབ་ཕྲ་སྐྱོན་ #314004 ལ་ལྟ་རོགས)" +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"རིམ་སྤོར་སྐབས་གལ་སྲིད་kdelibs4-devསྒྲིག་འཇུག་ཚར་ན་kdelibs5-devཡང་སྒྲིག་འཇུག་དགོས་པ bugs." +"launchpad.net, bug #279621ལ་བལྟས་ནས་ཞིབ་ཕྲ་ཀློག་པ" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "གསར་སྒྱུར་དགོས་པ་%(count)s བདམས་ཟིན་པ" +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%sལ་ལག་བཟོས་སྒྲིག་འཇུག་དགོས་པ" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +msgstr "grub སྒྲིག་འཛུགས་ཡོད་པའི་སྟབས་ཀྱིས་lilo་བསུབ་དགོས(ཞིབ་ཕྲ་སྐྱོན་ #314004 ལ་ལྟ་རོགས)" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Ubuntu མ་ལག་གིས་དགའ་བསུ་ཞུ" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Update Manager" -#~ msgstr "གསར་སྒྱུར་དོ་དམ་པ" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "Starting Update Manager" -#~ msgstr "གསར་སྒྱུར་དོ་དམ་པ་འགོ་འཛུགས་པ" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "You are connected via a wireless modem." -#~ msgstr "ཁྱོད་ཀྱིས་སྐུད་མེད་མཐུན་སྒྲིག་ཆས་བརྒྱུད་ནས་སྦྲེལ་མཐུད་བྱས་འདུག" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "རིམ་སྤོར་སྒྲིག་འཇུག_I" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" #~ "This upgrade is running in sandbox (test) mode. All changes are written " @@ -2455,6 +2519,10 @@ #~ "ད་ནས་བཟུང་ཁྱོད་ལ་བདེ་འཇགས་བཟོ་བཅོས་དང་གསར་སྒྱུར་གཙོ་ཆེན་ཐོབ་མི་སྲིད་པསUbuntu Linux་མ་ལག་" #~ "པར་གཞི་གསར་པར་རིམ་སྤོར་བྱེད་རོགས" +#~ msgid "The update has already been downloaded, but not installed" +#~ msgid_plural "The updates have already been downloaded, but not installed" +#~ msgstr[0] "གདམ་ཟིན་པའི་ཐུམ་བུ་གསར་སྒྱུར་རྣམས་མ་ལག་འདིའི་ཐོག་ལེན་འཇུག་དང་སྒྲིག་འཇུག་བྱས་ཚར" + #~ msgid "There are no updates to install" #~ msgstr "སྒྲིག་འཇུག་བྱེད་དགོས་པའི་གསར་སྒྱུར་མེད་པ" diff -Nru update-manager-17.10.11/po/br.po update-manager-0.156.14.15/po/br.po --- update-manager-17.10.11/po/br.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/br.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-02-23 20:01+0000\n" "Last-Translator: Alan \n" "Language-Team: Breton \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f Me" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Dafariad evit %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Penndafariad" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Dafariadoù personelaet" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "N'eus ket tu da jediñ enankad sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "N'eo ket gouest da zelec'hiañ tamm restr pakad ebet, marteze n'eo ket ur " "gantenn Ubuntu pe an adeiladezh fall ?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "C'hwitadenn war ouzhpennañ ar CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,13 +83,13 @@ "Kemennadenn ar fazi a oa :\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Dilemel ar pakad en ur stad fall" msgstr[1] "Dilemel ar pakadoù en ur stad fall" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -109,15 +110,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Marteze ez eo an dafariad dreistkarget" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Pakadoù torr" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -127,7 +128,7 @@ "an argerzh." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -148,26 +149,26 @@ " * Pakadoù meziantoù ankefridiel ket pourchaset gant Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Stumm ur gudenn badennek zo warni, klaskit diwezhatoc'h, mar plij." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "N'eo ket gouest da jediñ an hizivadenn" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Fazi gant dilesa pakadoù zo" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -177,7 +178,7 @@ "Marteze ho po c'hoant da glask diwezhatoc'h. Taolit ur sell amañ dindan war " "ur rollad pakadoù andilesaet." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -185,33 +186,33 @@ "Merket eo ar pakad '%s' da vezañ dilamet, war roll du an dilemel emañ " "koulskoude." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Merket eo ar pakad pennañ '%s' da vezañ dilamet." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Klask da staliañ an handelv '%s' a zo war ar roll du" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "N'hall ket staliañ '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "N'hall ket dinoiñ ar metapakad" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -225,15 +226,15 @@ " Mar plij, staliit unan eus ar pakadoù meneget a-us en ur obr gant synaptic " "pe apt-get kent mont war-raok." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "O lenn ar grubuilh" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "N'eo ket gouest da gaout un unprenn" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -241,11 +242,11 @@ "Dre voaz e talv ez eus un arload ardeiñ evit ar pakadoù (evel apt-get pe " "aptitude) war erounit. Mar plij, serrit an arload-mañ da gentañ." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "N'eo ket skoret an hizivaat dre ur c'hennask a-bell" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -259,11 +260,11 @@ "\n" "Dilezet e vo an hizivaat bremañ. Klaskit hep ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Kenderc'hel da erounit gant SSH ?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -280,11 +281,11 @@ "Mar kendalc'hot e vo loc'het ur gwazerezh SSH ouzhpenn dre ar porzh '%s'.\n" "Ha fellout a ra deoc'h kenderc'hel ?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "O loc'hañ SSHD ouzhpenn" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -295,7 +296,7 @@ "ouzhpenn dre ar porzh '%s'. Mar degouezho un dra bennak fall gant SSH war " "erounit e c'hallot kennaskañ ouzh unan ouzhpenn.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -304,30 +305,30 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "N'hall ket hizivaat" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" "Un hizivadur diouzh '%s' betek '%s' n'eo ket skoret gant ar benveg-mañ." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "C'hwitadenn war kefluniadur ar rannvaez gwarezet (sandbox)" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "N'eus ket bet tro da grouiñ endro ar rannvaez gwarezet (sandbox)." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Mod ar rannvaez gwarezet (sandbox)" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -337,18 +338,18 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Kontronet eo ho staliadenn evit Python. Ratreañ an ere aouezek '/usr/bin/" "python'" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Staliet eo ar pakad 'debsig-verify'" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -358,12 +359,12 @@ "Dilamit ar pakad gant synaptic pe 'apt-get remove debsig-verify' da gentañ " "ha lañsit an hizivaat en-dro." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -371,11 +372,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Enkorfañ an hizivadennoù diwezhañ diouzh Internet ?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -395,16 +396,16 @@ "hizivadennoù diwezhañ tost war-lec'h an hizivaat.\n" "Mar respontot 'ket' ne vo ket arveret ar rouedad, tamm ebet." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "diweredekaet evit an hizivaat da %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "N'eus ket bet kavet ur velezour talvoudek" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -424,11 +425,11 @@ "Mar dibabot 'Ket' e vo dilamet an hizivaat." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Genel an tarzhioù dre ziouer ?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -442,21 +443,21 @@ "Ha ret e vefe ouzhpennañ an enankadoù dre ziouer evit '%s' ? Mar dibabot " "'Ket' e vo dilamet an hizivaat." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Stlennoù ar mirlec'h didalvoudek" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Diweredekaet eo an tarzhioù a-berzh un trede" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -466,13 +467,13 @@ "Adgweredekaet e vezont goude an hizivaat gant ar benveg 'perzhioù-ar-" "meziant' pe hoc'h ardoer pakadoù." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Pakad en ur stad digeverlec'h" msgstr[1] "Pakadoù en ur stad digeverlec'h" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -491,11 +492,11 @@ "ne gaver ket dielloù evitañ avat. Mar plij, adstaliit ar pakadoù dre zorn pe " "zilamit ar pakad-mañ diouzh ar reizhiad." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Fazi e-pad an hizivaat" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -504,13 +505,13 @@ "gudenn gant ar rouedad, mar plij, gwiriit ho kennask ouzh ar rouedad ha " "klaskit en-dro." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "N'eus ket egor dieub a-walc'h war ho kantenn" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -521,32 +522,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "O jediñ ar c'hemmoù" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "C'hoant hoc'h eus da gregiñ un hivizadur?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Dilezet eo bet an hizivadur" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "N'haller ket pellgargañ an hizivadennoù" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -555,33 +556,33 @@ # drebadek : permanent #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Fazi e-pad ma oa o lakaat da zrebadek" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Oc'h adsevel stad orin ar reizhiad" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "N'haller ket staliañ an hizivadennoù" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -592,26 +593,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Dilemel ar pakadoù dispredet ?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Mirout" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Dilemel" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -621,37 +622,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "N'eo ket bet staliet diazalc'hadennoù azgoulennet" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "N'eo ket bet staliet an diazalc'hadenn '%s' azgoulennet. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "O wiriañ ardoer ar pakadoù" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "C'hwitadenn war prientiñ an hizivaat" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "C'hwitadenn war kaout ar meziantoù rakgoulennet ret d'an hizivaat" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -659,68 +660,68 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "O hizivaat stlennoù ar mirlec'h" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Stlennoù ar pakadoù didalvoudek" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "O tastum" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "O hizivaat" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Echu eo an hizivaat" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "O klask meziantoù dispredet" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Echu eo hizivadur ar rezizhiad" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Peurechu eo an hizivaat darnel" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms war arver" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -730,11 +731,11 @@ "skoret ar meziant 'evms' ken. Mar plij, lazhit eñ ha loc'hit an hizivaat en-" "dro goude." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -742,9 +743,9 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -752,8 +753,8 @@ "Dre an hizivaat e vo gwashaet efedoù ar burev marteze, an digonadoù evit ar " "c'hoarioù hag ar gouvlevioù a c'houlenn kalz a-fet kevregadoù." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -767,7 +768,7 @@ "\n" "Ha fellout a ra deoc'h kenderc'hel ?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -781,11 +782,11 @@ "\n" "Ha fellout a ra deoc'h kenderc'hel ?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -793,11 +794,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Korrgewerier ARMv6 ebet" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -809,12 +810,12 @@ "c'houlenne da gaout ARMv6 evit adeiladezh izek. N'eus ket tro da hizivaat ho " "reizhiad da handelv nevez Ubuntu gant ar periant-mañ." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "an deraouekaat n'eo ket hegerz" # daemon : argerzh en drekva -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -829,15 +830,15 @@ "gefluniañ galloudel da gentañ.\n" "Ha fellout a ra deoc'h kenderc'hel ?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Hizivaat ar rannvaez gwarezet (sandbox) en ur ober gant aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Implij an treug lavaret evit klask ur CD-ROM gant pakadoù da hizivadus" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -845,59 +846,59 @@ "Implij ur c'hetal kevregat, setu ar pezh a zo hegerz : \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Seveniñ an hizivaat gant un doare darnel hepken (arabat skrivañ war sources." "list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Arventennañ kavlec'hiad ar roadennoù" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Mar plij, enlakait '%s' el lenner '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Echu eo an dastum" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "O tastum ar restr %li eus %li da %s eizhbit/eilenn" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Chom a ra tro dro %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "O tastum ar restr %li eus %li" @@ -907,27 +908,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "O seveniñ ar c'hemmoù" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "Kudennoù gant an diazalc'hadennoù - laosket eo bet ankefluniet" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "N'eo ket bet gouest da staliañ '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -939,7 +940,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -950,7 +951,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -958,20 +959,20 @@ "Kollet e vo an holl gemmoù graet ganeoc'h d'ar restr kefluniañ-mañ mar " "dibabot da amsaviñ ar restr-mañ gant unan nevesoc'h." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "N'eo ket bet kavet an arc'had 'diff'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Degouezhet ez eus bet ur fazi lazhus" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -979,13 +980,13 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c pouezet" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -994,136 +995,136 @@ "gant ur stad torr. Ha sur oc'h e fell deoc'h ober an dra-mañ ?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "A-benn mirout ouzh koll roadennoù e vefe gwell serriñ an arloadoù digor hag " "an teulioù :" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Dilemel (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Staliañ (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Hiziavaat (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Kemm ar media" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Diskouez an disheñvelder >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Kuzhat an disheñvelder" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Fazi" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Nullañ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Serriñ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Diskouez an dermenell >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Kuzhat an dermenell" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Titouroù" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Munudoù" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "N'eo ket skoret ken %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Dilemel %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Dilemel (staliet e oa bet emgefreek) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Staliañ %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Hizivaat %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Ret eo adloc'hañ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Adloc'hañ ar reizhiad evit echuiñ an hizivadenn" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Adloc'hañ diouzhtu" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1135,32 +1136,32 @@ "Marteze e vo distabil ar reizhiad mar dilezot an hizivaat. Gwell e vefe " "deoc'h adloc'hañ an hizivaat." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Nullañ an hizivadenn ?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li deiz" msgstr[1] "%li a zezioù" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li eur" msgstr[1] "%li eur" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li vunutenn" msgstr[1] "%li a vunutennoù" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1176,7 +1177,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1190,14 +1191,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1207,34 +1208,32 @@ "gant ur modem 56k." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Tro-dro %s e pado ar pellgargañ gant ho kennask. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "O prientiñ da hizivaat" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "O kaout dastumlec'hioù meziantoù nevez" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "O tapout pakadoù nevez" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "O staliañ an hizivadennoù" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Naetadur" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1247,28 +1246,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "Emañ %d pakad o vont da vezañ dilamet." msgstr[1] "Emañ %d a bakadoù o vont da vezañ dilamet." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "Emañ %d pakad nevez o vont da vezañ staliet." msgstr[1] "Emañ %d a bakadoù nevez o vont da vezañ staliet." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "Emañ %d pakad o vont da vezañ hizivaet." msgstr[1] "Emañ %d a bakadoù o vont da vezañ hizivaet." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1279,28 +1278,28 @@ "\n" "Ur sammad a %s ez eus da bellgargañ " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1308,72 +1307,72 @@ "N'eus hizivadenn ebet hegerz evit ho reizhiad. Dilezet e vo an hizivaat " "bremañ." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Ret eo deoc'h adloc'hañ an urzhiataer" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Echu eo an hizivadenn ha ret eo adloc'hañ an urzhiataer. Ha c'hoant ho-peus " "d'ober se diouzhtu ?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "N'hall ket erounit ar benveg da hizivaat" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Sinadur ar benveg da hizivaat" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Benveg da hizivaat" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "C'hwitadenn war an dastum" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "C'hwitadenn war dastum an hizivadenn. Marteze ez eus ur gudenn gant ar " "rouedad. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "C'hwitadet eo an dilesa" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1381,13 +1380,13 @@ "C'hwitadenn war dilesa an hizivadenn. Marteze ez eo en abeg d'ur gudenn gant " "ar rouedad pe gant an dafariad. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "C'hwitet eo an eztennañ" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1395,13 +1394,13 @@ "C'hwitadenn war an eztennañ. Marteze ez eo en abeg d'ur gudenn gant ar " "rouedad pe gant an dafariad. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "C'hwitet eo ar gwiriañ" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1409,27 +1408,27 @@ "C'hwitadenn war gwiriañ an hizivadennoù. Marteze ez eo en abeg d'ur gudenn " "gant ar rouedad pe gant an dafariad. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "N'hall ket seveniñ an hizivaat" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Ar gemennadenn fazi zo '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1437,73 +1436,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "O tilezel" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Izelaet e renk :\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Kenderc'hel [yK] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Munudoù [m]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "k" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "m" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "N'eo ket skoret ken : %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Dilemel : %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Staliañ : %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Hizivaat : %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Kenderc'hel [Yk] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1570,7 +1569,7 @@ msgstr "Hizivadur an dasparzhadenn" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1589,166 +1588,180 @@ msgid "Terminal" msgstr "Termenell" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Gortozit mar plij, moarvat e pado un tamm amzer." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Echu eo an hizivaat" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "N'hall ket kavout notennoù an handelv" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Marteze ez eo soulgarget an dafariad. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "N'hall ket pellgargañ notennoù an handelv" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Mar plij, gwiriit ho kennask internet." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Hiziavaat" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Notennoù an handelv" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "O pellgargañ restroù pakadoù ouzhpenn..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Restr %s eus %s da %sB/eilenn" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Restr %s eus %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Digeriñ an ere er merdeer" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Eilañ an ere er golver" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "O pellgargañ ar restr %(current)li eus %(total)li da %(speed)s/eilenn" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "O pellgargañ ar restr %(current)li eus %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Titouroù a-fet hizivaat" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Staliañ" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Handelv %s : \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "O pellgargañ roll ar c'hemmoù..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "Pellgarget e vo %s." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "Marteze ez eo soulgarget an dafariad. " -msgstr[1] "Marteze ez eo soulgarget an dafariad. " +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Ment ar pellgargañ dianav." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1757,34 +1770,44 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Gant hizivadennoù ar meziantoù e vez reishaet ar fazioù, dilamet gwanderioù " +"a-fet diogelroez ha kinniget molladoù nevez." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Degemer mat e Ubuntu" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1796,7 +1819,7 @@ "ha dilamit ar pakadoù padennek o teus eus staliadurioù kent en ur arverañ " "'sudo apt-get clean'." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1804,23 +1827,23 @@ "Ret eo adloc'hañ an urzhiataer a-benn peurechuiñ an hizivadurioù. Mar plij, " "enrollit ho labourioù kent kenderc'hel ganti." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "O lenn stlennoù ar pakad(où)" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "O kennaskañ…" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "N'hall ket deraouekaat stlennoù ar pakad(où)" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1834,7 +1857,7 @@ "Mar plij, savit un danevell a-fet beug a-zivout pakad 'update-manager' ha " "lakait ar gemennadenn a-fet fazi da heul :\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1847,52 +1870,52 @@ "Mar plij, savit un danevell a-fet beug a-zivout pakad 'update-manager' ha " "lakait ar gemennadenn a-fet fazi da heul :" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Staliadur nevez)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Ment : %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Eus an handelv %(old_version)s da %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Handelv %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "O pellgargañ an ostilh da hizivaat an handelvoù" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Hegerz ez eus un handelv nevez eus Ubuntu '%s'" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Torret eo ibil ar meziantoù" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1902,6 +1925,17 @@ "ardoer pakadoù \"Synaptic\" pe erounezit \"sudo apt-get install -f\" gant un " "dermenell a-benn ratreañ ar gudenn-mañ da gentañ." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Un handelv nevez '%s' hegerz." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Nullañ" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1911,22 +1945,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Nullañ" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "O sevel roll an hizivadennoù" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1950,20 +1980,20 @@ " * Pakadoù meziantoù ankefridiel ket pourchaset gant Ubuntu\n" " * Kemmoù reol ur rakhandelv eus Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "O pellgargañ kerzhlevr ar c'hemmoù" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Hizivadennoù all (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -1971,7 +2001,7 @@ "C'hwitadenn war pellgargañ ar roll kemmoù. \n" "Gwiriit ho kennask internet." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1980,7 +2010,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1993,7 +2023,7 @@ "Grit gant http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "betek ma 'z ay ar c'hemmoù da hegerz pe glaskit diwezhatoc'h." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2006,54 +2036,45 @@ "Grit gant http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "betek ma 'z ay ar c'hemmoù da hegerz pe glaskit diwezhatoc'h." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "C'hwitadenn war dinoiñ an dasparzhadenn" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" "Degouezhet ez eus bet ur fazi '%s' e-pad ma oa o wiriañ peseurt reizhiad " "emaoc'h oc'h ober gantañ." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Hizivadennoù a-fet diogelroez pouezus" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Hizivadennoù erbedet" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Hizivadennoù kinniget" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Drekpakadoù" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Hizivadennoù an darzparzhadenn" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Hizivadennoù all" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "O loc'hañ an ardoer hizivaat" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Gant hizivadennoù ar meziantoù e vez reishaet ar fazioù, dilamet gwanderioù " -"a-fet diogelroez ha kinniget molladoù nevez." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "Hizivaat darnel" @@ -2127,59 +2148,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Hizivadennoù ar meziantoù" +msgid "Update Manager" +msgstr "Ardoer an hizivaat" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Hizivadennoù ar meziantoù" +msgid "Starting Update Manager" +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "Hi_zivaat" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "hizivadennoù" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Staliañ" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Kemmoù" +msgid "updates" +msgstr "hizivadennoù" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Deskrivadur" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Deskrivadur an hizivadenn" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Staliañ an hizivadennoù" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Kemmoù" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "" +msgid "Description" +msgstr "Deskrivadur" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Staliañ" +msgid "Description of update" +msgstr "Deskrivadur an hizivadenn" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2204,9 +2225,8 @@ msgstr "N'hoc'h eus ket bet c'hoant da hizivaat betek handelv Ubutu nevez" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Hizivaet e vo diwezhatoc'h en ur zigeriñ Ardoer an hizivaat ha klikañ war " @@ -2221,60 +2241,60 @@ msgid "Show and install available updates" msgstr "Diskouez ha staliañ an hizivadennoù hegerz" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Diskouez an handelv ha mont kuit" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Kavlec'hiad gant ar restroù roadennoù ennañ" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Gwiriañ hag-eñ ez eus un handelv nevez eus Ubutu" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Gwiriañ hag-eñ ez eus tro da hizivaat d'an handelv diorren" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Hizivadenn en ur ober gant an handelv nevesañ kinniget da veziant hizivaat " "an dasparzhadenn" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Arabat loc'hañ war an drekleur" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Klaskit da erounit 'dist-upgrade'" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Prouadiñ an hizivaat gant ur rannvaez gwarezet (sandbox aufs)" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Oc'h erounit un hizivaat darnel" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Klask hizivaat d'an handelv diwezhañ en ur ober gant ar meziant hizivaat eus " "$distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2284,11 +2304,11 @@ "Bremañ e vez skoret 'desktop evit hizivaat reol reizhiad ar burev ha " "'server' evit reizhiad un dafariad." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Erounit ar c'hetal erspizet" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2296,166 +2316,223 @@ "Gwiriañ hag-eñ ez eus un handelv nevez evit an dasparzhdenn ha sevel un " "danevell dre ar voneg ec'hankañ" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Handelv nevez ebet bet kavet" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Un handelv nevez '%s' hegerz." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Erounit 'do-release-upgrade' a-benn hizivaat." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Hizivadenn Ubuntu %(version)s hegerz" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Nac'hac'het hoc'h eus hizivaat da Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "N'eo ket kefloueret an hentenn : %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Ur restr war ar gantenn" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "Pakadoù mod .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Staliañ ar pakadoù a vank." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Ar pakad %s a rankfe bezañ staliet." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "Pakadoù mod .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s a rank bezañ merket evem ma vefe staliet gant an dorn." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"Pa vez o hizivaat, mar bez staliet kdelibs4-dev e vo ret staliañ kdelibs5-" -"dev. Lennit bugs.launchpad.net, bug #279621 a-benn gouzout hiroc'h." - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i enkankad dispredet e restr ar stad" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Enankadoù dispredet e stad dpkg" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Enankadoù evit stad dpkg dispredet" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"Pa vez o hizivaat, mar bez staliet kdelibs4-dev e vo ret staliañ kdelibs5-" +"dev. Lennit bugs.launchpad.net, bug #279621 a-benn gouzout hiroc'h." + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s a rank bezañ merket evem ma vefe staliet gant an dorn." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Dilemel lilo rak staliet eo grub ivez. (Lennit ar beug #314004 evit gouzout " "hiroc'h.)" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Degemer mat e Ubuntu" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Ardoer an hizivaat" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "_Staliañ an hizivadennoù" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "Your system is up-to-date" #~ msgstr "Ho reizhiad a zo hizivaet" diff -Nru update-manager-17.10.11/po/bs.po update-manager-0.156.14.15/po/bs.po --- update-manager-17.10.11/po/bs.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/bs.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-26 08:34+0000\n" "Last-Translator: Samir Ribić \n" "Language-Team: Bosnian \n" @@ -21,7 +22,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -30,13 +31,13 @@ msgstr[2] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Server za zemlju %s" @@ -44,20 +45,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Glavni server" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Podešeni serveri" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Nemoguće izračunati sources.list unos" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -65,11 +66,11 @@ "Nemoguće pronaći pakete, možda ovo nije Ubuntu Instalacijski Disk ili " "pogrešna Unix arhitektura?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Nemoguće dodati CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -84,14 +85,14 @@ "Poruka je bila:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Ukloni paket u lošem stanju" msgstr[1] "Ukloni pakete u lošem stanju" msgstr[2] "Ukloni pakete u lošem stanju" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -116,15 +117,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Server je možda preopterećen" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Neispravni paketi" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -133,7 +134,7 @@ "programom. Popravite ih koristeći synaptic ili apt-get prije nastavljanja." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -154,12 +155,12 @@ " * U upotrebi su nezvanični paketi softvera\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Ovo je najverovatnije prolazni problem, molimo pokušajte ponovo kasnije." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -167,16 +168,16 @@ "Ako se nijedna ne primenjuje, molim vas prijavite grešku koristeći komandu " "'ubuntu-bug update-manager' u konzoli" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Nemoguće izračunati nadogradnju" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Greška kod autentikacije nekih paketa" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -186,29 +187,29 @@ "problem s mrežom i trebali biste pokušati ponovo kasnije. Pogledajte spisak " "neidentificiranih paketa." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" "Paket '%s' je označen za uklanjanje azli se nalazi na crnoj listi uklanjanja." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Neophodni paket '%s' je označen za uklanjanje." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Покушавам да инсталирам верзију '%s' из црне листе" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Nemoguće instalirati '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -217,11 +218,11 @@ "koristeći 'ubuntu-bug update-manager' u konzoli." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Nisam mogao odrediti meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -234,15 +235,15 @@ "koristite.Molim Vas da prvo instalirate neke od gornjih paketa koristeci " "synaptic ili apt-get prije nego nastavite." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Čitam spremnik" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Nemoguće dobiti isključivo zaključavanje" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -251,11 +252,11 @@ "get ili aptitude). Molim vas prvo zatvorite tu aplikaciju pa onda pokrenite " "ovu." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Ažuriranje preko udaljenog računara nije podržano" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -269,11 +270,11 @@ "\n" "Nadogradnja će sada biti prekinuta. Molim probajte bez SŠ protokola - (ssh)." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Nastavi rad pod SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -289,11 +290,11 @@ "Ako nastavite, dodatni ssh demon će biti pokrenut na portu '%s'.\n" "Da li želite da nastavite?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Pokretanje dodatnog sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -304,7 +305,7 @@ "ce biti pokrenut na portu '%s'. Ukoliko se nešto loše desi sa aktivnim ssh " "vi se još uvijek možete priključiti na dodatni.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -317,29 +318,29 @@ "Možete da otvorite port sa npr:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Nemoguće nadograditi" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Nadogradnja sa '%s' na '%s' nije podržana sa ovim alatom." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Podešavanje test okruženja nije uspjelo" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Nije bilo moguće napraviti test okruženje." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Režim testnog okruženja" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -354,17 +355,17 @@ "*Nikakve* izmene zapisane u sistemskom direktorijumu od sada sve do " "sljedećeg ponovnog učitavanja neće biti stalne." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Python instalacija je oštećena. Popravite simbolički link „/usr/bin/python“." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Paket 'debsig-verify' je instaliran" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -374,12 +375,12 @@ "Molim vas da alatkom „synaptic“ „apt-get“uklonite paket „debsig-verify“ i " "onda pokrenete nadogradnju." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Ne mogu da pišem u „%s“" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -390,11 +391,11 @@ "Nadogradnja ne može biti nastavljena.\n" "Provjerite da li je moguće upisivanje u sistemski direktorijum." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Uključi najnovije nadogradnje sa Interneta?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -414,16 +415,16 @@ "instalirati zadnje aktualizacije ubrzo nakon nadogradnje.\n" "Ukoliko sada odgovorite sa 'ne' , internet se neće uopste koristiti." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "onemogućeno pri nadogradnji na %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Nisam pronašao ispravan mirror" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -443,11 +444,11 @@ "Ako izaberete 'Ne' nadogradnja će se otkazati." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Kreirati uobičajene izvore?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -460,11 +461,11 @@ "Trebaju li biti dodati podrazumijevani unosi za '%s'? Ako izaberete 'Ne', " "nadograđivanje će se otkazati." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Podaci repozitorija neispravni" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -472,11 +473,11 @@ "Nadograđivanje podataka o repozitoriju je rezultiralo neispravnom datotekom " "tako da je pokrenut proces za izvještavanje o grešci." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Izvori trećih strana su isključeni" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -486,14 +487,14 @@ "onemogućene. Nakon nadogradnje ih možete ponovo omogućiti pomoću alata " "„software-properties“ ili vašim upravnikom paketa." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Paket u nekonzistentnom stanju" msgstr[1] "Paketi u nekonzistentnom stanju" msgstr[2] "Paketi u nekonzistentnom stanju" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -516,11 +517,11 @@ "nema arhiva za njih. Molim vas da ih instalirate ručno ili da ih uklonite sa " "sistema." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Greška prilikom nadogradnje" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -528,13 +529,13 @@ "Nastao je problem tokom nadogradnje. Ovo je uobicajeno neka vrsta problema " "sa mrezom, molim Vas da provjerite Vasu mreznu vezu i pokusajte ponovo." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Nema dovoljno praznog mjesta na disku" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -549,21 +550,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Izračunavanje promjena" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Želite li pokrenuti nadogradnju?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Nadogradnja prekinuta" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -571,12 +572,12 @@ "Nadrgradnja će sada otkazati i originalno stanje sistema će biti obnovljen. " "Možete da nastavite nadogradnju kasnije." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Nisam mogao preuzeti nadogradnje" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -586,27 +587,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Javila se greška tokom upisivanja" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Vraćam u početno stanje" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Nisam mogao instalirati nadogradnje" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -614,7 +615,7 @@ "Nadogradnja je prekinuta. Vaš sistem bi mogao biti u neupotrebljivom stanju. " "Popravak će upravo biti pokrenut (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -631,27 +632,27 @@ "„/var/log/dist-upgrade/“.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" "Nadogradnja je prekinuta. Vaš sistem bi mogao biti u neupotrebljivom stanju. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Ukloniti zastarjele pakete?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Zadrži" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Ukloni" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -661,27 +662,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Neophodna međuzavisnost nije instlirana." -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Neophodna međuzavisnost „%s“ nije instlirana. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Provjeravam menadžera paketa" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Neuspjelo pripremanje nadogradnje" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -689,11 +690,11 @@ "Priprema sistema za nadogradnju nije uspjela tako da je pokrenut proces za " "izvještavanje o greški." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Neuspjelo dobavljanje preduslova za nadogradnju" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -705,69 +706,69 @@ "\n" "Uz ovo, pokrenut je i proces za izvještavanje o grešci." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Nadograđujem podatke repozitorija" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Neuspjelo dodavanje CD ROM-a" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Nažalost, dodavanje CD-roma nije uspjelo." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Neispravni podaci paketa" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Dobavljanje" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Nadograđujem" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Nadogradnja završena" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "Nadogradnja je završila, ali su bile greške tokom postupka nadogradnje." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Tražim zastarjele programe" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Nadogradnja sistema je završena." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Djelimična nadogradnja završena." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms у употреби" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -777,11 +778,11 @@ "nije podržan, molim vas da ga isključite i ponovo pokrenete nadogradnju kada " "to uradite." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "Vaš grafički hardver možda nije potpuno podržan u Ubuntu 12.04 LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -793,9 +794,9 @@ "wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx Želite li nastaviti sa " "nadogradnjom?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -803,8 +804,8 @@ "Nadogradnja može reducirati desktop efekte i učinak u igrama i drugim " "grafički zahtjevnim programima." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -817,7 +818,7 @@ "\n" "Da li želite da nastavite?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -830,11 +831,11 @@ "\n" "Da li želite da nastavite?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Nema i686 procesora" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -846,11 +847,11 @@ "arhitekturu. Nije moguće nadograditi sistem na novo Ubuntu izdanje s ovim " "hardverom." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Nema ARMv6 procesora" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -862,11 +863,11 @@ "minimalnu arhitekturu. Nije moguće nadograditi vaš sistem na novo Ubuntu " "izdanje sa ovim hardverom." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "init nije dostupan" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -881,15 +882,15 @@ "\n" "Da li ste sigurni da želite na nastavite?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Testiranje nadogradnje korišćenjem aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Koristiti datu putanju za traženje CD-roma sa nadogradivim paketima" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -897,58 +898,58 @@ "Koristi pročelje. Trenutno su dostupni:\n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*ZASTARJELO* ova opcija će biti ignorisana" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "izvrši samo djelimičnu nadogradnju (bez ponovnog ispisivanja sources.list )" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Onemogući GNU ekransku podršku" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Postavi datadir" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Molim, ubacite '%s' u uređaj '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Preuzimanje je završeno" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Preuzimam datoteku broj %li od ukupno %li brzinom %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Otprilike je ostalo %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Preuzimam datoteku %li od %li" @@ -958,27 +959,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Primijenjujem promjene" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "problemi sa međuzavisnostima - ostavljam nekonfigurisano" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Nisam mogao instalirati '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -990,7 +991,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1001,7 +1002,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1009,20 +1010,20 @@ "Izgubit ćete sve promjene napravljene na ovoj konfiguracijskoj datoteci ako " "odaberete izmjenu s novijom verzijom programa." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Nisam našao naredbu 'diff'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Pojavila se ozbiljna greška" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1035,13 +1036,13 @@ "Izvorna inačica datoteke sources.list je spremljena u /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Pritisnuto Ctrl-c" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1050,136 +1051,136 @@ "Da li ste sigurni da to želite učiniti?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "Da spriječite gubitak podataka zatvorite sve programe i datoteke." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Više ne podržava Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Povratak na stariju verziju (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Ukloni (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Nije više potrebno (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Instaliraj (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Nadogradi (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Izmjena Medija" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Pokaži Razliku >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Sakrij Razliku" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Greška" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Odustani" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Zatvori" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Pokaži Terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Sakrij Terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Obavještenje" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Detalji" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Nije više podržano %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Ukloni %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Ukloni (bio autoinstaliran) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Instaliraj %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Nadogradi %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Potreban restart" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" "Ponovno pokretanje računara potrebno je za završetak nadogradnje" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "Ponovno pok_reni računar" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1187,11 +1188,11 @@ "strongly advised to resume the upgrade." msgstr "otkaži tekuću nadogradnju?" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Poništi Nadogradnju?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" @@ -1199,7 +1200,7 @@ msgstr[1] "%li dana" msgstr[2] "%li dana" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" @@ -1207,7 +1208,7 @@ msgstr[1] "%li sata" msgstr[2] "%li sati" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" @@ -1215,7 +1216,7 @@ msgstr[1] "%li minute" msgstr[2] "%li minuta" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1232,7 +1233,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1246,14 +1247,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1262,34 +1263,32 @@ "Ovo preuzimanje će 1Mbit DSL vezom trajati oko %s, a 56k modemom oko %s." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Ovo preuzimanje će vašom vezom trajati oko %s. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Priprema za nadogradnju" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Preuzima nove kanale softvera" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Preuzima nove pakete" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Instaliranje nadogradnji" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Čišćenje" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1309,7 +1308,7 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." @@ -1317,7 +1316,7 @@ msgstr[1] "%d paket će biti uklonjen." msgstr[2] "%d paket će biti uklonjen." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." @@ -1325,7 +1324,7 @@ msgstr[1] "%d novi paket će biti instaliran." msgstr[2] "%d novi paket će biti instaliran." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." @@ -1333,7 +1332,7 @@ msgstr[1] "%d paket će biti nadograđen." msgstr[2] "%d paket će biti nadograđen." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1344,7 +1343,7 @@ "\n" "Morate preuzeti ukupno %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1352,7 +1351,7 @@ "Instalacija nadogradnje može da potraje nekoliko sati. Nakon završenog " "preuzimanja, proces ne može biti otkazan." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1360,53 +1359,53 @@ "Dovlačenje i instalacija nadogradnje može da potraje nekoliko sati. Nakon " "završenog preuzimanja, proces ne može biti otkazan." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Uklanjanje paketa može da potraje nekoliko sati. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Softver na ovom računaru je ažuriran." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "Nema nadogradnji za vaš sistem. Nadogradnja će biti otkazana." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Potrebno je ponovno pokretanje računara" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Nadogradnja je završena i potrebno je ponovo pokrenuti računar. Želite li to " "učiniti sada?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "potvrdi identitet „%(file)s“ za potpis „%(signature)s“ " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "izvlačim „%s“" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Nisam mogao pokrenuti alat za nadogradnju" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1414,33 +1413,33 @@ "Ovo je vjerovatno bug u alatki za ažuriranje. Molim vas prijavite ovu grešku " "koristeći 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Potpis alata za nadogradnju" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Alat za nadogradnju" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Preuzimanje nije uspjelo" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Preuzimanje nadogradnje nije uspjelo. Vjerojatno je problem u mreži. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Provjera identiteta nije uspjela." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1448,13 +1447,13 @@ "Autorizacija nadogradnje nije uspjela. Vjerojatno je problem u mreži ili s " "serverom. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Raspakivanje nije uspelo" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1462,13 +1461,13 @@ "Ne mogu da raspakujem nadogradnju. Možda postoji problem sa mrežom ili " "serverom. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Provjera vjerodostojnosti nije uspjela" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1476,15 +1475,15 @@ "Provjera nadogradnje nije uspjela. Vjerojatno je problem u mreži ili s " "serverom. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Nemoguće izvršiti nadogradnju" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1492,13 +1491,13 @@ "Ovo je vjerovatno izazvano sistemom gdje je /tmp montiran sa noexec-om. " "Molim remontirajte bez noexec-a i izvršite ažuriranje ponovo" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Poruka greške je '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1510,73 +1509,73 @@ "Izvorna verzija datoteke sources.list je spremljena u /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Prekidanje" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Degradirano:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Za nastavak pritisnite [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Nastavi [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Detalji [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Nije više podržano: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Ukloni: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Instaliraj: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Nadogradi: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Nastaviti? [Dn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1643,9 +1642,8 @@ msgstr "Nadogradnja Distribucije" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Ažuriranje Ubuntu-a na verziju 11.10, Oneiric Ocelot" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Nadogradnja Ubuntua na izdanje 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1663,84 +1661,85 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Molim pričekajte, ovo može potrajati." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Nadogradnja je gotova" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Nisam mogao naći bilješke izdanja" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Server bi mogao biti preopterećen. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Nisam mogao preuzeti bilješke izdanja" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Molim, provjerite vašu internet konekciju." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Nadogradi" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Bilješke izdanja" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Preuzimanje dodatnih zapakovanih datoteka ..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Datoteka %s od %s na %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Datoteka %s od %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Otvori vezu u veb čitaču" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Kopiraj vezu u odlagalište" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Preuzimanje datoteke %(current)li od %(total)li brzinom %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Preuzimam datoteku %(current)li od %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Vaš Ubuntu izdanje nije podržano više." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1748,52 +1747,59 @@ "Nećete dobiti nikakve dodatne bezbjednosne ispravke i kritična ažuriranja. " "Molim nadogradite sistem na najnovije izdanje Ubuntua." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Informacije o nadogradnji" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Instalacija" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Naziv" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Verzija %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Mrežna veza nije otkrivena, ne možete preuzeti informacije o izmjenama." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Preuzimam spisak promjena..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Ukini izbor za sve" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Izaberi _sve" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "Označena je %(count)s dopuna." +msgstr[1] "Označene su %(count)s dopune." +msgstr[2] "Označeno je %(count)s dopuna." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s će biti preuzeto." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "Ažuriranje je već preuzeto, ali nije instalirano." msgstr[1] "Ažuriranja su već preuzeta, ali nisu instalirana." msgstr[2] "Ažuriranja su već preuzeta, ali nisu instalirana." @@ -1802,11 +1808,18 @@ msgid "There are no updates to install." msgstr "Nema ažuriranja za instaliranje." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Nepoznata veličina preuzimanja." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1814,7 +1827,7 @@ "Nije poznato kada su informacije o paketima ažurirane posljednji put. " "Kliknite dugme \"Provjeri\" da biste ažurirali informacije." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1823,7 +1836,7 @@ "Informacija o paketima je zadnji put ažurirana prije %(days_ago)s dana.\n" "Pritisnite dugme 'Provjeri' da provjerite nova softverska ažuriranja." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1834,7 +1847,7 @@ msgstr[2] "" "Informacije o paketima su posljednji put ažurirane prije %(days_ago)s dana." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1847,34 +1860,45 @@ "Informacije o paketima su posljednji put ažurirane prije %(hours_ago)s sati." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Paketske informacije su zadnji put ažurirane prije oko %s minuta." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Paketske informaciej us upravo ažurirane." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Nadogradnje programa popravljaju greške, uklanjaju sigurnosne propuste i " +"donose nove mogućnosti." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Softverska ažuriranja mogu biti dostupna za vaš računar." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Dobrodošli u Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Ova ažuriranja softvera su objavljena od kada je izdato ovo izdanje Ubuntua." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Dostupna su ažuriranja softvera za ovaj računar." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1886,7 +1910,7 @@ "uklonite privremene pakete prethodnih instalacija koristeći komandu „sudo " "apt-get clean“." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1894,23 +1918,23 @@ "Da bi ste završili sa instaliranjem osvježenja, potrebno je restartovati " "računar. Molim sačuvajte vaš rad prije nego što nastavite." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Čitanje informacije paketa" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Povezivanje..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "Možda nećete moći provjeriti postoje li nove dopune ili ih preuzeti." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Nemoguće inicijalizirati informaciju paketa" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1923,7 +1947,7 @@ "Molim Vas da prijavite ovu gresku u 'update-manager' paketu i uključite " "sljedeću poruku o grešci\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1935,31 +1959,31 @@ "Molim prijavite ovo kao grešku paketa „update-manager“ i uključite sljedeću " "poruku o grešci:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Nova instalacija)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Veličina: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Verzija %(old_version)s u %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Verzija %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Nadogradnja izdanja trenutno nije moguća" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1968,21 +1992,21 @@ "Nadogradnju izdanja trenutno nije moguće obaviti, molim pokušajte ponovo. " "Server je odgovorio: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Preuzimanje alatke izdanja nadogradnje" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Novo Ubuntu izdanje '%s' je dostupno" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Spisak programa je oštećen" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1992,6 +2016,17 @@ "upravitelja paketima \"Synaptic\" ili upišite \"sudo apt-get install -f\" u " "terminalu za ispravljanje ovog problema." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Dostupno je novo izdanje „%s“" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Odustani" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Provjeri ažuriranja" @@ -2001,22 +2036,18 @@ msgstr "Instaliraj sva moguća ažuriranja" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Odustani" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Dnevnik izmjena" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Nadogradnje" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Pripremam listu ažuriranja" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2040,20 +2071,20 @@ " * Nezvaničnim softverskim paketima koje ne obezbjeđuje Ubuntu\n" " * Normalnim promjenama pred-izdanja Ubuntu verzije" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Preuzimam dnevnik izmjena" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Ostala ažuriranja (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "Ovo ažuriranje ne dolazi iz izvora koji podržava changelogove" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2061,7 +2092,7 @@ "Preuzimanje spiska promjena nije uspjelo.\n" "Molim, provjerite svoju internet konekciju." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2074,7 +2105,7 @@ "Dostupna verzija: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2087,7 +2118,7 @@ "Molim koristite http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "dok promjene ne postanu dostupne, ili probajte kasnije." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2099,52 +2130,43 @@ "Molim Vas da koristite http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "dok promjene ne budu dostupne ili pokušajte ponovo poslije." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Neuspjela detekcija distribucije" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "greška '%s' je nastala tokom provjere koji sistem koristite" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Važne sigurnosne nadogradnje" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Preporučene nadogradnje" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Predložene nadogradnje" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backporti" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Ažuriranje distribucije" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Druge nadogradnje" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Upravnik ažuriranja se startuje" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Nadogradnje programa popravljaju greške, uklanjaju sigurnosne propuste i " -"donose nove mogućnosti." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Djelomična Nadogradnja" @@ -2215,37 +2237,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Ažuriranje Programa" +msgid "Update Manager" +msgstr "Upravnik nadogradnje sistema" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Ažuriranje Programa" +msgid "Starting Update Manager" +msgstr "Pokretanje Upravitelja nadogradnjama" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "Na_dogradnja" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "ažuriranja" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Instalacija" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Promjene" +msgid "updates" +msgstr "ažuriranja" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Opis" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Opis ažuriranja" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2253,23 +2265,33 @@ "Povezani ste preko u rominga i može vam biti naplaćen prijenos podataka koje " "troši ova ispravka." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Povezani ste preko bežičnog modema." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "Sigurnije je povezati računar na naizmjeničnu struju prije ažuriranja." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Instaliraj Ažuriranja" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Promjene" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Postavke..." +msgid "Description" +msgstr "Opis" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Instalacija" +msgid "Description of update" +msgstr "Opis ažuriranja" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Postavke..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2292,9 +2314,8 @@ msgstr "Odbili ste da nadogradite na novu Ubuntu verziju" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Možete da nadogradite u kasnijem vremenu otvaranjem Menadžera Ažuriranja i " @@ -2308,58 +2329,58 @@ msgid "Show and install available updates" msgstr "Prikaži i instaliraj dostupna ažuriranja" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Prikaži verziju i izađi" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Direktorijum koji sadrži datoteke podataka" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Provjeri da li je novo Ubuntu izdanje dostupno" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Provjeri da li je moguće nadograditi na najnovije razvojno izdanje" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "Nadogradi pomoću posljednje predložene verzije programa za nadogradnju" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Ne fokusiraj mapu prilikom startovanja" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Pokušaj pokrenuti nadogradnju distribucije" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Ne provjeravaj da li postoje nadogradnje prilikom pokretanja" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Testiraj ažuriranje pomoću aufs" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Pokretanje djelomične nadogradnje" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Prikaži opis paketa umjesto dnevnika izmena" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Pokušaj nadogradnju na zadnje izdanje koristeći alat za nadogradnju iz " "$distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2369,11 +2390,11 @@ "Trenutno su dostupni režimi „desktop“ za redovne nadogradnje radnih stanica " "i „server“ za ažuriranje serverskih sistema." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Izvrši naznačeni prednji prikaz" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2381,11 +2402,11 @@ "Provjeri samo da li je dostupno novo izdanje distribucije i izvesti o " "rezultatu putem izlaznog koda" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Provjeravam za novim izdanjem Ubuntua" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2393,69 +2414,69 @@ "Za informacije o ažuriranjima posjetite:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Nema novih izdanja" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Dostupno je novo izdanje „%s“" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Pokrenite komandu „do-release-upgrade“ da biste prešli na to izdanje." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Dostupna je Ubuntu %(version)s nadogradnja" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Odbili ste nadogradnju na Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Dodaj izlaz za uklanjanje grešaka" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Prikaži nepodržane pakete na ovom računaru" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Prikaži podržane pakete na ovom računaru" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Prikaži sve pakete sa njihovim stanjima" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Prikaži sve pakete na spisku" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Sažetak stanja podrške za „%s“:" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "Broj paketa podržanih do %(time)s — %(num)s (%(percent).1f%%)" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" "Broj paketa koji ne mogu više biti preuzimani — %(num)s (%(percent).1f%%)" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "Broj nepodržanih paketa — %(num)s (%(percent).1f%%)" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2463,124 +2484,153 @@ "Da prikažete više pojedinosti pokrenite uz „--show-unsupported“, „--show-" "supported“ ili „--show-all“" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Više ne mogu biti preuzeti:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Nepodržani: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Podržani do %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Nepodržan" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Metod nije implementiran: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Datoteka na disku" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb пакет" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Instaliraj paket koji nedostaje." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Paket %s bi trebalo da bude instaliran." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb пакет" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s mora biti označen kao ručno instaliran." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"Prilikom nadogradnje, ako je kdelibs4-dev instalirano, kdelibs5-dev treba " -"biti instalirano. Pogledajte bugs.launchpad.net, bug #279621 za detalje." - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i prevaziđena stavka u statusnoj datoteci" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Prevaziđene stavke u dpkg statusu" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Prevaziđene stavke dpkg statusa" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"Prilikom nadogradnje, ako je kdelibs4-dev instalirano, kdelibs5-dev treba " +"biti instalirano. Pogledajte bugs.launchpad.net, bug #279621 za detalje." + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s mora biti označen kao ručno instaliran." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Uklonite lilo obzirom da je grub također instaliran.(Pogledajte grešku broj " "#314004 za više detalja.)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Nakon ažuriranja podataka o paketima osnovni paket „%s“ više ne može biti " -#~ "pronađen tako da je pokrenut proces za izvještavanje o grešci." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Nadogradnja Ubuntua na izdanje 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "Označena je %(count)s dopuna." -#~ msgstr[1] "Označene su %(count)s dopune." -#~ msgstr[2] "Označeno je %(count)s dopuna." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Dobrodošli u Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Ova ažuriranja softvera su objavljena od kada je izdato ovo izdanje " -#~ "Ubuntua." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Dostupna su ažuriranja softvera za ovaj računar." - -#~ msgid "Update Manager" -#~ msgstr "Upravnik nadogradnje sistema" - -#~ msgid "Starting Update Manager" -#~ msgstr "Pokretanje Upravitelja nadogradnjama" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Povezani ste preko bežičnog modema." - -#~ msgid "_Install Updates" -#~ msgstr "_Instaliraj Ažuriranja" +#~ "Nakon ažuriranja podataka o paketima osnovni paket „%s“ više ne može biti " +#~ "pronađen tako da je pokrenut proces za izvještavanje o grešci." #~ msgid "Your system is up-to-date" #~ msgstr "Vaš sistem sadrži posljednje nadogradnje" @@ -2710,6 +2760,10 @@ #~ "Ažuriranje informacija o repozitorijumima nije uspjela. Molim vas " #~ "prijavite ovu grešku koristeći 'ubuntu-bug update-manager' u konzoli." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "" +#~ "Ažuriranje Ubuntu-a na verziju 11.10, Oneiric Ocelot" + #~ msgid "0 kB" #~ msgstr "0 kB" diff -Nru update-manager-17.10.11/po/ca.po update-manager-0.156.14.15/po/ca.po --- update-manager-17.10.11/po/ca.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/ca.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # Jordi Irazuzta Cardús , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-22 09:23+0000\n" "Last-Translator: David Planella \n" "Language-Team: Catalan \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Servidor per %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Servidor principal" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Servidors personalitzats" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "No s'ha pogut calcular l'entrada del fitxer sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "No s'ha pogut trobar cap paquet, esteu utilitzat un disc de l'Ubuntu per a " "l'arquitectura adequada?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "No s'ha pogut afegir el CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,13 +83,13 @@ "El missatge d'error ha estat:\n" "«%s»" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Elimina el paquet en mal estat" msgstr[1] "Elimina els paquets en mal estat" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -109,15 +110,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Pot ser que el servidor estigui sobrecarregat" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Paquets trencats" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -126,7 +127,7 @@ "aquesta aplicació. Utilitzeu el Synaptic o l'apt-get abans de continuar." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -148,12 +149,12 @@ "per l'Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Això és probablement un problema transitori, torneu a provar-ho més tard." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -161,16 +162,16 @@ "Si cap d'aquestes s'aplica, llavors informeu d'aquest error utilitzant " "l'ordre «ubuntu-bug update-manager» en un terminal." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "No s'ha pogut calcular l'actualització" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "S'ha produït un error en autenticar alguns paquets" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -180,7 +181,7 @@ "amb la xarxa. Podeu provar-ho més tard. A continuació es mostra la llista " "amb els paquets no autenticats." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -188,22 +189,22 @@ "El paquet «%s» està marcat per a eliminar-lo, però apareix a la llista negra " "de fitxers a eliminar." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "El paquet essencial «%s» està marcat per a ésser eliminat." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "S'està intentant instal·lar la versió «%s» de la llista negra" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "No s'ha pogut instal·lar «%s»" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -212,11 +213,11 @@ "utilitzant l'ordre «ubuntu-bug update-manager» en un terminal." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "No s'ha pogut conjecturar el metapaquet" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -230,15 +231,15 @@ "Instal·leu un d'aquests paquets abans de continuar; per fer-ho podeu " "utilitzar el Synaptic o l'apt-get" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "S'està llegint la memòria cau" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "No s'ha pogut obtenir un bloqueig exclusiu" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -246,11 +247,11 @@ "Normalment això es deu al fet que teniu un altre gestor de paquets en " "execució (com ara l'apt-get o l'aptitude) i cal que abans el tanqueu." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "No és possible actualitzar a través d'una connexió remota" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -264,11 +265,11 @@ "\n" "S'interromprà l'actualització. Torneu-ho a intentar sense SSH." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Voleu continuar treballant via SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -285,11 +286,11 @@ "Si continueu, s'iniciarà un dimoni addicional al port «%s».\n" "Voleu continuar?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "S'està iniciant un sshd addicional" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -300,7 +301,7 @@ "addicional al port «%s». Si alguna cosa anés malament amb l'ssh en ús, podeu " "fer servir l'addicional.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -313,29 +314,29 @@ "exemple, podeu obrir el port amb:\n" "«%s»" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "No es pot actualitzar" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Aquesta eina no permet l'actualització de «%s» a «%s»." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Ha fallat la configuració d'un entorn de proves" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "No ha estat possible crear un entorn de proves." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Mode de prova" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -349,18 +350,18 @@ "\n" "Cap dels canvis fets als directoris del sistema seran permanents." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "La vostra instal·lació del Python està malmesa. Reviseu l'enllaç simbòlic «/" "usr/bin/python»." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "El paquet «debsig-verify» està instal·lat" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -370,12 +371,12 @@ "Elimineu-lo amb el Synaptic o amb l'ordre «apt-get remove debsig-verify» i " "torneu a executar l'actualització." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "No es pot escriure a «%s»" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -386,11 +387,11 @@ "l'actualització no pot continuar.\n" "Assegureu-vos que aquest directori tingui els permisos d'escriptura adients." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Voleu incloure les darreres actualitzacions d'Internet?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -410,16 +411,16 @@ "sistema.\n" "Si responeu «no» la xarxa no s'utilitzarà per a res." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "desactivat en actualitzar a %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "No s'ha trobat cap rèplica vàlida" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -440,11 +441,11 @@ "cancel·larà l'actualització." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Voleu generar les fonts per defecte?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -458,11 +459,11 @@ "Voleu que s'afegeixin entrades per a «%s»? Si trieu que «No», es cancel·larà " "l'actualització." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "La informació dels dipòsits no és vàlida" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -470,11 +471,11 @@ "En actualitzar la informació dels dipòsits s'ha obtingut un fitxer no vàlid, " "per la qual cosa s'iniciarà el procés d'informe d'errors." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "S'han desactivat les fonts de tercers" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -484,13 +485,13 @@ "l'actualització des de l'eina «software-properties» en el vostre gestor de " "paquets." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Paquet en estat inconsistent" msgstr[1] "Paquets en estat inconsistent" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -509,11 +510,11 @@ "instal·lar, però no s'ha trobat els arxius per a fer-ho. Torneu-los a " "instal·lar manualment o suprimiu-los del sistema." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "S'ha produït un error en l'actualització" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -522,13 +523,13 @@ "això es degut a problemes de xarxa. Comproveu la vostra connexió de xarxa i " "torneu a intentar-ho." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "No disposeu de suficient espai al disc" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -543,21 +544,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "S'estan calculant els canvis" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Voleu iniciar l'actualització?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "S'ha cancel·lat l'actualització" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -565,12 +566,12 @@ "Ara es cancel·larà l'actualització i es restaurarà a l'estat original del " "sistema. Podeu continuar l'actualització més tard." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "No s'han pogut baixar les actualitzacions" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -581,27 +582,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "S'ha produït un error durant l'enviament" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "S'està restaurant l'estat original del sistema" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "No s'han pogut instal·lar les actualitzacions" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -610,7 +611,7 @@ "en un estat inestable. Ara s'executarà un procés de recuperació (dpkg --" "configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -627,7 +628,7 @@ "fitxers que hi hagi a /var/log/dist-upgrade/ a l'informe d'error.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -635,20 +636,20 @@ "S'ha interromput l'actualització. Verifiqueu la vostra connexió a Internet o " "el suport d'instal·lació i torneu-ho a intentar. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Voleu suprimir els paquets obsolets?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Manté" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "Sup_rimeix" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -658,27 +659,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Les dependències requerides no estan instal·lades" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "La dependència requerida «%s» no està instal·lada. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "S'està comprovant el gestor de paquets" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "S'ha produït un error en la preparació de l'actualització" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -686,11 +687,11 @@ "Ha fallat la preparació del sistema per l'actualització, per la qual cosa " "s'iniciarà el procés d'informe d'errors." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "S'ha produït un error en obtenir els prerequisits de l'actualització" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -703,70 +704,70 @@ "\n" "També s'iniciarà el procés d'informe d'errors." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "S'està actualitzant la informació dels dipòsits" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "No s'ha pogut afegir el CD-ROM" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "No s'ha pogut afegir el CD-ROM correctament." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "La informació dels paquets no és valida" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "S'està recollint" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "S'està actualitzant" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "S'ha completat l'actualització" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "S'ha completat l'actualització, però s'han produït errors durant aquest " "procés." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "S'està cercant programari obsolet" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "S'ha completat l'actualització del sistema." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "L'actualització parcial s'ha completat." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "S'està utilitzant l'evms" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -776,13 +777,13 @@ "programari no es mantindrà més, desconnecteu-lo i torneu a executar " "l'actualització." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "Sembla que el vostre maquinari gràfic no és totalment compatible amb " "l'Ubuntu 12.04 LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -794,9 +795,9 @@ "informació visiteu https://wiki.ubuntu.com/X/Bugs/" "UpdateManagerWarningForI8xx. Voleu continuar amb l'actualització?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -804,8 +805,8 @@ "L'actualització pot reduir els efectes d'escriptori i el rendiment en jocs i " "altres programes que facin un ús exhaustiu de processament gràfic." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -819,7 +820,7 @@ "\n" "Voleu continuar?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -833,11 +834,11 @@ "\n" "Voleu continuar?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Sense CPU i686" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -849,11 +850,11 @@ "un i686 com a arquitectura mínima. No és possible actualitzar el sistema a " "una versió nova de l'Ubuntu amb aquest maquinari." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "No és una CPU ARMv6" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -865,11 +866,11 @@ "requereixen l'ARMv6 com a arquitectura mínima. No és possible actualitzar el " "vostre sistema a una versió nova de l'Ubuntu amb aquest maquinari." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "No hi ha cap sistema d'inicialització disponible" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -885,16 +886,16 @@ "\n" "Segur que voleu continuar?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Actualització en entorn de proves utilitzant aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Utilitza el camí especificat per cercar un CDROM amb paquets actualitzables" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -902,58 +903,58 @@ "Utilitzeu un frontal. Actualment es disposa de: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*OBSOLET* aquesta opció s'ignorarà" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Realitza només una actualització parcial (sense reescriure el sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Inhabilita la compatibilitat amb el GNU screen" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Estableix el «datadir» (directori de dades)" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Inseriu «%s» a la unitat «%s»" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "S'ha completat el recull" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "S'està obtenint el fitxer %li de %li a %s B/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Queden %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "S'està obtenint el fitxer %li de %li" @@ -963,27 +964,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "S'estan aplicant els canvis" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "problemes de dependències - es deixarà sense configurar" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "No s'ha pogut instal·lar «%s»" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -996,7 +997,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1007,7 +1008,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1015,20 +1016,20 @@ "Perdreu tots els canvis realitzats en el fitxer de configuració si trieu " "reemplaçar-lo per una versió més nova." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "No s'ha trobat l'ordre «diff»" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "S'ha produït un error greu" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1041,13 +1042,13 @@ "S'ha desat el vostre fitxer sources.list original a /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "S'ha premut Ctrl+C" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1056,136 +1057,136 @@ "sistema. Esteu segur que ho voleu fer?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Per a evitar una possible pèrdua de dades, tanqueu tots els documents i " "aplicacions." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Ja no mantinguts per Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Es desactualitzaran (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Se suprimiran (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Ja no són necessaris (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "S'instal·laran (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "S'actualitzaran (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Canvi de suport" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Mostra les diferències >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Oculta les diferències" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "S'ha produït un error" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Cancel·la" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Tanca" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Mostra el terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Oculta el terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Informació" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Detalls" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Ja no es mantenen %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Suprimeix %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Suprimeix %s (s'havia instal·lat automàticament)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Instal·la %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Actualitza %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Cal que reinicieu el sistema" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Reinicieu el sistema per a completar l'actualització" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Reinicia" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1197,32 +1198,32 @@ "El sistema pot quedar inusable si la cancel·leu. És molt recomanable " "continuar amb l'actualització." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Voleu cancel·lar l'actualització?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li dia" msgstr[1] "%li dies" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li hora" msgstr[1] "%li hores" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minut" msgstr[1] "%li minuts" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1238,7 +1239,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1252,14 +1253,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1269,34 +1270,32 @@ "aproximadament %s amb un mòdem de 56k" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "La baixada trigarà aproximadament %s amb la vostra connexió. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "S'està preparant l'actualització" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "S'estan obtenint canals de programari nous" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "S'estan obtenint els paquets nous" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "S'estan instal·lant les actualitzacions" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "S'està netejant" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1313,28 +1312,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "Se suprimirà %d paquet." msgstr[1] "Se suprimiran %d paquets." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "S'instal·larà %d paquet nou" msgstr[1] "S'instal·laran %d paquets nous" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "S'actualitzarà %d paquet" msgstr[1] "S'actualitzaran %d paquets" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1345,7 +1344,7 @@ "\n" "Heu de baixar un total de %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1353,7 +1352,7 @@ "La instal·lació de l'actualització pot trigar unes quantes hores. Un cop " "hagi finalitzat la baixada dels fitxers, el procés no es pot cancel·lar." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1362,16 +1361,16 @@ "Un cop hagi finalitzat la baixada dels fitxers, el procés no es pot " "cancel·lar." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "La supressió de paquets pot trigar unes quantes hores. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "El programari d'aquest ordinador està actualitzat." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1379,37 +1378,37 @@ "No hi ha actualitzacions disponibles per al vostre sistema. L'actualització " "es cancel·larà" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Cal que reinicieu el sistema" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "L'actualització ha finalitzat i cal reiniciar el sistema. Voleu fer-ho ara?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "autenticació del fitxer «%(file)s» amb la signatura «%(signature)s» " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "s'està extraient «%s»" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "No es pot executar l'eina d'actualització" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1417,35 +1416,35 @@ "Sembla que hi ha un error en l'eina d'actualització. Informeu d'aquest error " "utilitzant l'ordre «ubuntu-bug update-manager» en un terminal." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Signatura de l'eina d'actualització" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Eina d'actualització" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Ha fallat la baixada" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "Ha fallat l'obtenció de l'actualització. Pot ser que hi hagi algun problema " "a la xarxa. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Ha fallat l'autenticació" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1453,13 +1452,13 @@ "Ha fallat l'autenticació de l'actualització. Pot ser que hi hagi algun " "problema a la xarxa o al servidor. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Ha fallat l'extracció" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1467,13 +1466,13 @@ "Ha fallat l'extracció de l'actualització. Pot ser que hi hagi algun problema " "a la xarxa o al servidor. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Ha fallat la verificació" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1481,15 +1480,15 @@ "Ha fallat la verificació de l'actualització. Pot ser que hi hagi algun " "problema a la xarxa o al servidor. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "No es pot executar l'actualització" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1498,13 +1497,13 @@ "executable. Torneu-lo a muntar sense l'opció de no executable i torneu a " "executar l'actualització." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "El missatge d'error és «%s»." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1517,73 +1516,73 @@ "S'ha desat el vostre fitxer sources.list original a /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "S'està interrompent" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Degradat:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Premeu la tecla de retorn per continuar" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Continua [sN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Detalls [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "s" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Ja no es mantenen: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Suprimeix: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Instal·la: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Actualitza: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Continua [Sn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1650,9 +1649,8 @@ msgstr "Actualització de la distribució" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "S'està actualitzant l'Ubuntu a la versió 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Actualització de l'Ubuntu a la versió 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1670,84 +1668,85 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Espereu un moment, això pot tardar una estona." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "S'ha completat l'actualització" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "No s'han trobat les notes de la versió" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "El servidor potser està sobrecarregat. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "No s'han pogut baixar les notes de la versió" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Comproveu la vostra connexió a Internet" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Actualització" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Notes de la versió" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "S'estan baixant els fitxers de paquet addicionals..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Fitxer %s de %s a %s B/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Fitxer %s de %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Obre l'enllaç al navegador" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Copia l'enllaç al porta-retalls" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "S'està baixant el fitxer %(current)li de %(total)li a %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "S'està baixant el fitxer %(current)li de %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "La vostra versió de l'Ubuntu ja no està mantinguda." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1755,53 +1754,59 @@ "Ja no rebreu més actualitzacions de seguretat o crítiques. Hauríeu " "d'actualitzar-vos a la darrera versió de l'Ubuntu." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Informació de l'actualització" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Instal·la" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Nom" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Versió %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "No s'ha detectat cap connexió de xarxa, no podeu baixar informació del " "registre de canvis." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "S'està descarregant la llista de canvis..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Desselecciona-ho tot" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Seleccion_a-ho tot" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "S'ha seleccionat %(count)s actualització." +msgstr[1] "S'han seleccionat %(count)s actualitzacions." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "Es baixaran %s." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "L'actualització ja s'ha baixat, però no s'ha instal·lat." msgstr[1] "Les actualitzacions ja s'han baixat, però no s'han instal·lat." @@ -1809,11 +1814,18 @@ msgid "There are no updates to install." msgstr "No hi ha cap actualització per instal·lar." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "No s'ha pogut determinar la mida de la baixada." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1821,7 +1833,7 @@ "No se sap quan s'ha actualitzat la informació del paquet per últim cop. Feu " "clic al botó «Comprova» per actualitzar la informació." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1831,14 +1843,14 @@ "Premeu el botó «Comprova» de més avall per comprovar si hi ha " "actualitzacions noves." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "La informació dels paquets es va actualitzar fa %(days_ago)s dia." msgstr[1] "La informació dels paquets es va actualitzar fa %(days_ago)s dies." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1848,35 +1860,47 @@ "La informació dels paquets es va actualitzar fa %(hours_ago)s hores." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "La informació del paquet es va actualitzar per últim cop fa %s minuts." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "La informació del paquet s'acaba d'actualitzar." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Les actualitzacions de programari corregeixen errors, eliminen problemes de " +"seguretat i proporcionen prestacions noves." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" "Pot ser que hi hagi actualitzacions de programari per a aquest ordinador." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Benvingut a l'Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Aquestes actualitzacions de programari estan disponibles des que es va " +"publicar aquesta versió de l'Ubuntu." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Hi ha actualitzacions disponibles per a aquest ordinador." + +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1887,7 +1911,7 @@ "d'alliberar almenys %s d'espai de disc a «%s». Buideu la vostra paperera i " "esborreu els paquets temporals utilitzant «sudo apt-get clean»." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1895,25 +1919,25 @@ "Cal reiniciar l'ordinador per a finalitzar la instaŀlació de les " "actualitzacions. Deseu la vostra feina abans de continuar." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "S'està llegint la informació dels paquets" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "S'està connectant..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Pot ser que no pugueu comprovar si hi ha actualitzacions o baixar-ne de " "noves." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "No es pot inicialitzar la informació dels paquets" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1926,7 +1950,7 @@ "\n" "Informeu d'aquest error de l'update-manager i incloeu el missatge següent:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1937,31 +1961,31 @@ "\n" "Informeu d'aquest error de l'update-manager i incloeu el missatge següent:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Instal·lació nova)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Mida: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "De la versió %(old_version)s a la %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Versió %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "En aquests moments no es pot efectuar l'actualització de versió" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1970,21 +1994,21 @@ "En aquests moments no es pot efectuar l'actualització de versió. Torneu-ho a " "provar més tard. El servidor ha respost: «%s»" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "S'està baixant l'eina d'actualització a una versió nova" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "La versió nova de l'Ubuntu «%s» està disponible" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "L'índex de programari està trencat" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1994,6 +2018,17 @@ "utilitzeu el gestor de paquets «Synaptic» o executeu «sudo apt-get install -" "f» en un terminal." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "La versió nova «%s» ja està disponible" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Cancel·la" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Comprova si hi ha actualitzacions" @@ -2003,22 +2038,18 @@ msgstr "Instal·la totes les actualitzacions disponibles" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Cancel·la" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Registre de canvis" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Actualitzacions" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "S'està construint la llista d'actualitzacions" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2042,22 +2073,22 @@ " * Paquets de programari no oficial que no estan proveïts per l'Ubuntu\n" " * Canvis normals en una versió de desenvolupament de l'Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "S'està baixant el registre de canvis" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Altres actualitzacions (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" "Aquesta actualització no prové d'una font que funcioni amb registres de " "canvis." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2065,7 +2096,7 @@ "S'ha produït un error en baixar la llista de canvis. \n" "Comproveu la vostra connexió a Internet." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2078,7 +2109,7 @@ "Versió disponible: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2091,7 +2122,7 @@ "Vegeu http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "mentre els canvis no estan disponobles o torneu a provar-ho més tard." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2104,54 +2135,45 @@ "Utilitzeu http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "mentre els canvis no estiguin disponibles o torneu a provar-ho més tard." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "No s'ha pogut detectar la distribució" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" "S'ha produït un error «%s» mentre es comprovava el sistema que esteu " "utilitzant." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Actualitzacions de seguretat importants" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Actualitzacions recomanades" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Actualitzacions proposades" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backports" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Actualitzacions de la distribució" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Altres actualitzacions" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "S'està iniciant el gestor d'actualitzacions" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Les actualitzacions de programari corregeixen errors, eliminen problemes de " -"seguretat i proporcionen prestacions noves." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "Actualització _parcial" @@ -2225,37 +2247,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Actualitzacions de programari" +msgid "Update Manager" +msgstr "Gestor d'actualitzacions" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Actualitzacions de programari" +msgid "Starting Update Manager" +msgstr "S'està iniciant el Gestor d'actualitzacions" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Actualitza" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "actualitzacions" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Instal·la" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Canvis" +msgid "updates" +msgstr "actualitzacions" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Descripció" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Descripció de l'actualització" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2263,25 +2275,35 @@ "Esteu connectat per itinerància i potser us cobraran per les dades baixades " "per l'actualització." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Esteu connectat a través d'un mòdem sense fil." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "És més segur connectar l'ordinador a la xarxa elèctrica abans de començar " "l'actualització." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Instal·la les actualitzacions" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Canvis" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Paràmetres..." +msgid "Description" +msgstr "Descripció" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Instal·la" +msgid "Description of update" +msgstr "Descripció de l'actualització" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Paràmetres..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2306,9 +2328,8 @@ msgstr "Heu triat no actualitzar a la versió nova de l'Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Podeu actualitzar més endavant obrint el Gestor d'actualitzacions i fent " @@ -2322,61 +2343,61 @@ msgid "Show and install available updates" msgstr "Mostra i instal·la les actualitzacions disponibles" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Mostra la versió i surt" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "El directori que conté els fitxers de dades" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Comprova si hi ha una versió nova de l'Ubuntu disponible" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "Comprova si és possible actualitzar a la darrera versió de desenvolupament" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Duu a terme l'actualització utilitzant la darrera versió proposada de " "l'actualitzador" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "No passes a primer pla en iniciar" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Prova d'executar un dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "No comprovis si hi ha actualitzacions en iniciar" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Prova d'actualitzar en un entorn de proves amb aufs" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "S'està executant una actualització parcial" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Mostra la descripció del paquet en lloc del registre de canvis" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Proveu d'actualitzar a l'última versió fent servir l'actualitzador de " "$distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2386,11 +2407,11 @@ "Actualment disposeu del mode «desktop» per a actualitzacions de sistemes " "d'escriptori i del mode «server» per a sistemes servidors." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Executa el frontal especificat" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2398,11 +2419,11 @@ "Només verifica si hi ha disponible una versió nova i informa del resultat " "mitjançant el codi de sortida" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "S'està cercant una versió nova de l'Ubuntu" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2410,68 +2431,68 @@ "Per obtenir més informació sobre actualitzacions, aneu a:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "No s'ha trobat cap versió nova" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "La versió nova «%s» ja està disponible" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Executeu «do-release-upgrade» per actualitzar a la nova versió." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Hi ha disponible una actualitzacio de l'Ubuntu %(version)s" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Heu triat no actualitzar a l'Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Afegeix informació de depuració" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Mostra els paquets no oficials en aquest dispositiu" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Mostra els paquets mantinguts en aquest ordinador" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Mostra tots els paquets i el seu estat" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Mostra una llista de tots els paquets" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Estat de manteniment de «%s»:" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "Teniu %(num)s paquets (%(percent).1f%%) mantinguts fins %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "Teniu %(num)s paquets (%(percent).1f%%) que ja no es poden baixar" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "Teniu %(num)s paquets (%(percent).1f%%) que no estan mantinguts" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2479,54 +2500,71 @@ "Executeu aquest programa amb una de les opcions --show-unsupported, --show-" "supported o --show-all per veure'n més detalls" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Ja no es poden baixar:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "No mantinguts: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Mantinguts fins %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "No mantingut" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "El mètode %s no està implementat" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Un fitxer en disc" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "Paquet .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Instal·la el paquet que falta." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "El paquet %s s'hauria d'instal·lar." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "Paquet .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s s'ha de marcar com a instal·lat manualment." +msgid "%i obsolete entries in the status file" +msgstr "%i entrades obsoletes en el fitxer status" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "Entrades obsoletes a dpkg status" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "Entrades obsoletes a dpkg status" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2535,69 +2573,82 @@ "caldrà instal·lar el paquet kdelibs5-dev. Vegeu l'informe d'error número " "279621 a bugs.launchpad.net per a obtenir-ne més detalls." -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "%i entrades obsoletes en el fitxer status" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "Entrades obsoletes a dpkg status" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "Entrades obsoletes a dpkg status" +msgid "%s needs to be marked as manually installed." +msgstr "%s s'ha de marcar com a instal·lat manualment." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Esborra el lilo ja que el grub també està instal·lat (Si voleu més detalls " "vegeu l'error #314004)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "En actualitzar la informació dels paquets s'ha detectat que el paquet " -#~ "essencial «%s» ja no està disponible, per la qual cosa s'iniciarà el " -#~ "procés d'informe d'errors." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Actualització de l'Ubuntu a la versió 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "S'ha seleccionat %(count)s actualització." -#~ msgstr[1] "S'han seleccionat %(count)s actualitzacions." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Benvingut a l'Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Aquestes actualitzacions de programari estan disponibles des que es va " -#~ "publicar aquesta versió de l'Ubuntu." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Hi ha actualitzacions disponibles per a aquest ordinador." - -#~ msgid "Update Manager" -#~ msgstr "Gestor d'actualitzacions" - -#~ msgid "Starting Update Manager" -#~ msgstr "S'està iniciant el Gestor d'actualitzacions" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Esteu connectat a través d'un mòdem sense fil." - -#~ msgid "_Install Updates" -#~ msgstr "_Instal·la les actualitzacions" +#~ "En actualitzar la informació dels paquets s'ha detectat que el paquet " +#~ "essencial «%s» ja no està disponible, per la qual cosa s'iniciarà el " +#~ "procés d'informe d'errors." #~ msgid "Checking for a new ubuntu release" #~ msgstr "S'està comprovant si hi ha una versió nova de l'Ubuntu" @@ -2754,6 +2805,9 @@ #~ "llançament d'aquesta versió de l'Ubuntu. Si no les voleu instal·lar ara, " #~ "obriu més tard el «Gestor d'actualitzacions» del menú d'Administració." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "S'està actualitzant l'Ubuntu a la versió 11.10" + #~ msgid "" #~ "These software updates have been issued since this version of Ubuntu was " #~ "released. If you don't want to install them now, choose \"Update Manager" diff -Nru update-manager-17.10.11/po/ca@valencia.po update-manager-0.156.14.15/po/ca@valencia.po --- update-manager-17.10.11/po/ca@valencia.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/ca@valencia.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # Jordi Irazuzta Cardús , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-12-06 06:43+0000\n" "Last-Translator: Joan Duran \n" "Language-Team: Catalan \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Servidor per %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Servidor principal" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Servidors personalitzats" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "No s'ha pogut calcular l'entrada del fitxer sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "No s'ha pogut trobar cap paquet, esteu utilitzat un disc de l'Ubuntu per a " "l'arquitectura adequada?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "No s'ha pogut afegir el CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,13 +83,13 @@ "El missatge d'error ha estat:\n" "«%s»" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Elimina el paquet en mal estat" msgstr[1] "Elimina els paquets en mal estat" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -109,15 +110,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Pot ser que el servidor estiga sobrecarregat" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Paquets trencats" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -126,7 +127,7 @@ "aplicació. Utilitzeu el Synaptic o l'apt-get abans de continuar." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -148,12 +149,12 @@ "per l'Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Això és probablement un problema transitori, torneu a provar-ho més tard." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -161,16 +162,16 @@ "Si cap d'estes s'aplica, llavors informeu d'este error utilitzant l'orde " "«ubuntu-bug update-manager» en un terminal." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "No s'ha pogut calcular l'actualització" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "S'ha produït un error en autenticar alguns paquets" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -180,7 +181,7 @@ "amb la xarxa. Podeu provar-ho més tard. A continuació es mostra la llista " "amb els paquets no autenticats." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -188,22 +189,22 @@ "El paquet «%s» està marcat per a eliminar-lo, però apareix a la llista negra " "de fitxers a eliminar." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "El paquet essencial «%s» està marcat per a ésser eliminat." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "S'està intentant instal·lar la versió «%s» de la llista negra" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "No s'ha pogut instal·lar «%s»" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -212,11 +213,11 @@ "utilitzant l'orde «ubuntu-bug update-manager» en un terminal." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "No s'ha pogut conjecturar el metapaquet" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -230,15 +231,15 @@ "Instal·leu un d'estos paquets abans de continuar; per fer-ho podeu utilitzar " "el Synaptic o l'apt-get" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "S'està llegint la memòria cau" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "No s'ha pogut obtindre un bloqueig exclusiu" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -246,11 +247,11 @@ "Normalment això es deu al fet que teniu un altre gestor de paquets en " "execució (com ara l'apt-get o l'aptitude) i cal que abans el tanqueu." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "No és possible actualitzar a través d'una connexió remota" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -264,11 +265,11 @@ "\n" "S'interromprà l'actualització. Torneu-ho a intentar sense SSH." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Voleu continuar treballant via SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -285,11 +286,11 @@ "Si continueu, s'iniciarà un dimoni addicional al port «%s».\n" "Voleu continuar?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "S'està iniciant un sshd addicional" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -300,7 +301,7 @@ "addicional al port «%s». Si alguna cosa anés malament amb l'ssh en ús, podeu " "fer servir l'addicional.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -313,29 +314,29 @@ "podeu obrir el port amb:\n" "«%s»" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "No es pot actualitzar" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Esta eina no permet l'actualització de «%s» a «%s»." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Ha fallat la configuració d'un entorn de proves" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "No ha estat possible crear un entorn de proves." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Mode de prova" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -345,18 +346,18 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "La vostra instal·lació del Python està malmesa. Reviseu l'enllaç simbòlic «/" "usr/bin/python»." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "El paquet «debsig-verify» està instal·lat" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -366,12 +367,12 @@ "Elimineu-lo amb el Synaptic o amb l'orde «apt-get remove debsig-verify» i " "torneu a executar l'actualització." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -379,11 +380,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Voleu incloure les darreres actualitzacions d'Internet?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -403,16 +404,16 @@ "sistema.\n" "Si responeu «no» la xarxa no s'utilitzarà per a res." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "desactivat en actualitzar a %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "No s'ha trobat cap rèplica vàlida" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -433,11 +434,11 @@ "cancel·larà l'actualització." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Voleu generar les fonts per defecte?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -451,21 +452,21 @@ "Voleu que s'afigen entrades per a «%s»? Si trieu que «No», es cancel·larà " "l'actualització." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "La informació dels dipòsits no és vàlida" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "S'han desactivat les fonts de tercers" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -475,13 +476,13 @@ "l'actualització des de l'eina «software-properties» en el vostre gestor de " "paquets." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Paquet en estat inconsistent" msgstr[1] "Paquets en estat inconsistent" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -500,11 +501,11 @@ "instal·lar, però no s'ha trobat els arxius per a fer-ho. Torneu-los a " "instal·lar manualment o suprimiu-los del sistema." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "S'ha produït un error en l'actualització" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -513,13 +514,13 @@ "això es degut a problemes de xarxa. Comproveu la vostra connexió de xarxa i " "torneu a intentar-ho." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "No disposeu de suficient espai al disc" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -534,21 +535,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "S'estan calculant els canvis" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Voleu iniciar l'actualització?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "S'ha cancel·lat l'actualització" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -556,12 +557,12 @@ "Ara es cancel·larà l'actualització i es restaurarà a l'estat original del " "sistema. Podeu continuar l'actualització més tard." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "No s'han pogut baixar les actualitzacions" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -572,27 +573,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "S'ha produït un error durant l'enviament" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "S'està restaurant l'estat original del sistema" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "No s'han pogut instal·lar les actualitzacions" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -601,7 +602,7 @@ "en un estat inestable. Ara s'executarà un procés de recuperació (dpkg --" "configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -612,7 +613,7 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -620,20 +621,20 @@ "S'ha interromput l'actualització. Verifiqueu la vostra connexió a Internet o " "el suport d'instal·lació i torneu-ho a intentar. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Voleu suprimir els paquets obsolets?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Manté" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "Sup_rimeix" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -643,37 +644,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Les dependències requerides no estan instal·lades" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "La dependència requerida «%s» no està instal·lada. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "S'està comprovant el gestor de paquets" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "S'ha produït un error en la preparació de l'actualització" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "S'ha produït un error en obtindre els prerequisits de l'actualització" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -681,69 +682,69 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "S'està actualitzant la informació dels dipòsits" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "No s'ha pogut afegir el CD-ROM" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "No s'ha pogut afegir el CD-ROM correctament." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "La informació dels paquets no és valida" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "S'està recollint" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "S'està actualitzant" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "S'ha completat l'actualització" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "S'ha completat l'actualització, però s'han produït errors durant este procés." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "S'està cercant programari obsolet" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "S'ha completat l'actualització del sistema." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "L'actualització parcial s'ha completat." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "S'està utilitzant l'evms" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -753,11 +754,11 @@ "programari no es mantindrà més, desconnecteu-lo i torneu a executar " "l'actualització." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -765,9 +766,9 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -775,8 +776,8 @@ "L'actualització pot reduir els efectes d'escriptori i el rendiment en jocs i " "altres programes que facen un ús exhaustiu de processament gràfic." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -790,7 +791,7 @@ "\n" "Voleu continuar?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -804,11 +805,11 @@ "\n" "Voleu continuar?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Sense CPU i686" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -820,11 +821,11 @@ "un i686 com a arquitectura mínima. No és possible actualitzar el sistema a " "una versió nova de l'Ubuntu amb este maquinari." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "No és una CPU ARMv6" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -836,11 +837,11 @@ "requereixen l'ARMv6 com a arquitectura mínima. No és possible actualitzar el " "vostre sistema a una versió nova de l'Ubuntu amb este maquinari." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "No hi ha cap sistema d'inicialització disponible" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -856,16 +857,16 @@ "\n" "Segur que voleu continuar?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Actualització en entorn de proves utilitzant aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Utilitza el camí especificat per cercar un CDROM amb paquets actualitzables" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -873,58 +874,58 @@ "Utilitzeu un frontal. Actualment es disposa de: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*OBSOLET* esta opció s'ignorarà" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Realitza només una actualització parcial (sense reescriure el sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Inhabilita la compatibilitat amb el GNU screen" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Estableix el «datadir» (directori de dades)" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Inseriu «%s» a la unitat «%s»" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "S'ha completat el recull" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "S'està obtenint el fitxer %li de %li a %s B/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Queden %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "S'està obtenint el fitxer %li de %li" @@ -934,27 +935,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "S'estan aplicant els canvis" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "problemes de dependències - es deixarà sense configurar" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "No s'ha pogut instal·lar «%s»" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -967,7 +968,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -978,7 +979,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -986,20 +987,20 @@ "Perdreu tots els canvis realitzats en el fitxer de configuració si trieu " "reemplaçar-lo per una versió més nova." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "No s'ha trobat l'orde «diff»" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "S'ha produït un error greu" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1012,13 +1013,13 @@ "S'ha alçat el vostre fitxer sources.list original a /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "S'ha premut Ctrl+C" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1027,136 +1028,136 @@ "sistema. Esteu segur que ho voleu fer?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Per a evitar una possible pèrdua de dades, tanqueu tots els documents i " "aplicacions." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Ja no mantinguts per Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Es desactualitzaran (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Se suprimiran (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Ja no són necessaris (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "S'instal·laran (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "S'actualitzaran (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Canvi de suport" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Mostra les diferències >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Oculta les diferències" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "S'ha produït un error" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Cancel·la" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Tanca" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Mostra el terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Oculta el terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Informació" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Detalls" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Ja no es mantenen %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Suprimeix %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Suprimeix %s (s'havia instal·lat automàticament)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Instal·la %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Actualitza %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Cal que reinicieu el sistema" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Reinicieu el sistema per a completar l'actualització" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Reinicia" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1168,32 +1169,32 @@ "El sistema pot quedar inusable si la cancel·leu. És molt recomanable " "continuar amb l'actualització." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Voleu cancel·lar l'actualització?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li dia" msgstr[1] "%li dies" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li hora" msgstr[1] "%li hores" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minut" msgstr[1] "%li minuts" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1209,7 +1210,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1223,14 +1224,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1240,34 +1241,32 @@ "aproximadament %s amb un mòdem de 56k" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "La baixada trigarà aproximadament %s amb la vostra connexió. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "S'està preparant l'actualització" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "S'estan obtenint canals de programari nous" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "S'estan obtenint els paquets nous" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "S'estan instal·lant les actualitzacions" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "S'està netejant" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1284,28 +1283,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "Se suprimirà %d paquet." msgstr[1] "Se suprimiran %d paquets." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "S'instal·larà %d paquet nou" msgstr[1] "S'instal·laran %d paquets nous" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "S'actualitzarà %d paquet" msgstr[1] "S'actualitzaran %d paquets" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1316,28 +1315,28 @@ "\n" "Heu de baixar un total de %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1345,37 +1344,37 @@ "No hi ha actualitzacions disponibles per al vostre sistema. L'actualització " "es cancel·larà" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Cal que reinicieu el sistema" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "L'actualització ha finalitzat i cal reiniciar el sistema. Voleu fer-ho ara?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "No es pot executar l'eina d'actualització" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1383,35 +1382,35 @@ "Pareix que hi ha un error en l'eina d'actualització. Informeu d'este error " "utilitzant l'orde «ubuntu-bug update-manager» en un terminal." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Signatura de l'eina d'actualització" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Eina d'actualització" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Ha fallat la baixada" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "Ha fallat l'obtenció de l'actualització. Pot ser que hi haja algun problema " "a la xarxa. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Ha fallat l'autenticació" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1419,13 +1418,13 @@ "Ha fallat l'autenticació de l'actualització. Pot ser que hi haja algun " "problema a la xarxa o al servidor. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Ha fallat l'extracció" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1433,13 +1432,13 @@ "Ha fallat l'extracció de l'actualització. Pot ser que hi haja algun problema " "a la xarxa o al servidor. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Ha fallat la verificació" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1447,15 +1446,15 @@ "Ha fallat la verificació de l'actualització. Pot ser que hi haja algun " "problema a la xarxa o al servidor. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "No es pot executar l'actualització" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1464,13 +1463,13 @@ "executable. Torneu-lo a muntar sense l'opció de no executable i torneu a " "executar l'actualització." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "El missatge d'error és «%s»." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1483,73 +1482,73 @@ "S'ha alçat el vostre fitxer sources.list original a /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "S'està interrompent" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Degradat:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Premeu la tecla de retorn per continuar" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Continua [sN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Detalls [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "s" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Ja no es mantenen: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Suprimeix: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Instal·la: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Actualitza: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Continua [Sn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1616,9 +1615,8 @@ msgstr "Actualització de la distribució" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "S'està actualitzant l'Ubuntu a la versió 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1636,149 +1634,162 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Espereu un moment, això pot tardar una estona." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "S'ha completat l'actualització" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "No s'han trobat les notes de la versió" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "El servidor potser està sobrecarregat. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "No s'han pogut baixar les notes de la versió" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Comproveu la vostra connexió a Internet" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Actualització" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Notes de la versió" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "S'estan baixant els fitxers de paquet addicionals..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Fitxer %s de %s a %s B/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Fitxer %s de %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Obri l'enllaç al navegador" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Copia l'enllaç al porta-retalls" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "S'està baixant el fitxer %(current)li de %(total)li a %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "S'està baixant el fitxer %(current)li de %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "La vostra versió de l'Ubuntu ja no està mantinguda." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Informació de l'actualització" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Instal·la" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Versió %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "No s'ha detectat cap connexió de xarxa, no podeu baixar informació del " "registre de canvis." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "S'està descarregant la llista de canvis..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Desselecciona-ho tot" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Seleccion_a-ho tot" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "S'ha seleccionat %(count)s actualització." +msgstr[1] "S'han seleccionat %(count)s actualitzacions." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "Es baixaran %s." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "L'actualització ja s'ha baixat, però encara no s'ha instal·lat" +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" msgstr[1] "" -"Les actualitzacions ja s'han baixat, però encara no s'han instal·lat" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "No s'ha pogut determinar la mida de la baixada." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1786,7 +1797,7 @@ "No se sap quan s'ha actualitzat la informació del paquet per últim cop. Feu " "clic al botó «Comprova» per actualitzar la informació." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1796,14 +1807,14 @@ "Premeu el botó «Comprova» de més avall per comprovar si hi ha " "actualitzacions noves." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "La informació dels paquets es va actualitzar fa %(days_ago)s dia." msgstr[1] "La informació dels paquets es va actualitzar fa %(days_ago)s dies." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1813,35 +1824,45 @@ "La informació dels paquets es va actualitzar fa %(hours_ago)s hores." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "La informació del paquet es va actualitzar per últim cop fa %s minuts." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "La informació del paquet s'acaba d'actualitzar." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Les actualitzacions de programari corregeixen errors, eliminen problemes de " +"seguretat i proporcionen prestacions noves." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" "Pot ser que hi haja actualitzacions de programari per a este ordinador." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Benvingut a l'Ubuntu" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1852,7 +1873,7 @@ "d'alliberar almenys %s d'espai de disc a «%s». Buideu la vostra paperera i " "esborreu els paquets temporals utilitzant «sudo apt-get clean»." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1860,25 +1881,25 @@ "Cal reiniciar l'ordinador per a finalitzar la instaŀlació de les " "actualitzacions. Alceu la vostra faena abans de continuar." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "S'està llegint la informació dels paquets" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "S'està connectant..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Pot ser que no pugueu comprovar si hi ha actualitzacions o baixar-ne de " "noves." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "No es pot inicialitzar la informació dels paquets" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1891,7 +1912,7 @@ "\n" "Informeu d'este error de l'update-manager i incloeu el missatge següent:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1902,31 +1923,31 @@ "\n" "Informeu d'este error de l'update-manager i incloeu el missatge següent:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Instal·lació nova)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Mida: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "De la versió %(old_version)s a la %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Versió %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "En estos moments no es pot efectuar l'actualització de versió" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1935,21 +1956,21 @@ "En estos moments no es pot efectuar l'actualització de versió. Torneu-ho a " "provar més tard. El servidor ha respost: «%s»" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "S'està baixant l'eina d'actualització a una versió nova" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "La versió nova de l'Ubuntu «%s» està disponible" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "L'índex de programari està trencat" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1959,6 +1980,17 @@ "utilitzeu el gestor de paquets «Synaptic» o executeu «sudo apt-get install -" "f» en un terminal." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "La versió nova «%s» ja està disponible" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Cancel·la" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Comprova si hi ha actualitzacions" @@ -1968,22 +2000,18 @@ msgstr "Instal·la totes les actualitzacions disponibles" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Cancel·la" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "S'està construint la llista d'actualitzacions" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2007,21 +2035,21 @@ " * Paquets de programari no oficial que no estan proveïts per l'Ubuntu\n" " * Canvis normals en una versió de desenvolupament de l'Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "S'està baixant el registre de canvis" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Altres actualitzacions (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" "Esta actualització no prové d'una font que funcione amb registres de canvis." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2029,7 +2057,7 @@ "S'ha produït un error en baixar la llista de canvis. \n" "Comproveu la vostra connexió a Internet." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2042,7 +2070,7 @@ "Versió disponible: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2055,7 +2083,7 @@ "Vegeu http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "mentre els canvis no estan disponobles o torneu a provar-ho més tard." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2068,54 +2096,45 @@ "Utilitzeu http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "mentre els canvis no estiguen disponibles o torneu a provar-ho més tard." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "No s'ha pogut detectar la distribució" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" "S'ha produït un error «%s» mentre es comprovava el sistema que esteu " "utilitzant." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Actualitzacions de seguretat importants" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Actualitzacions recomanades" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Actualitzacions proposades" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backports" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Actualitzacions de la distribució" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Altres actualitzacions" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "S'està iniciant el gestor d'actualitzacions" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Les actualitzacions de programari corregeixen errors, eliminen problemes de " -"seguretat i proporcionen prestacions noves." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "Actualització _parcial" @@ -2189,37 +2208,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Actualitzacions de programari" +msgid "Update Manager" +msgstr "Gestor d'actualitzacions" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Actualitzacions de programari" +msgid "Starting Update Manager" +msgstr "S'està iniciant el Gestor d'actualitzacions" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Actualitza" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "actualitzacions" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Instal·la" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Canvis" +msgid "updates" +msgstr "actualitzacions" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Descripció" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Descripció de l'actualització" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2227,25 +2236,35 @@ "Esteu connectat per itinerància i potser vos cobraran per les dades baixades " "per l'actualització." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Esteu connectat a través d'un mòdem sense fil." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "És més segur connectar l'ordinador a la xarxa elèctrica abans de començar " "l'actualització." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Instal·la les actualitzacions" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Canvis" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Paràmetres..." +msgid "Description" +msgstr "Descripció" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Instal·la" +msgid "Description of update" +msgstr "Descripció de l'actualització" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Paràmetres..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2270,9 +2289,8 @@ msgstr "Heu triat no actualitzar a la versió nova de l'Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Podeu actualitzar més avant obrint el Gestor d'actualitzacions i fent clic a " @@ -2286,61 +2304,61 @@ msgid "Show and install available updates" msgstr "Mostra i instal·la les actualitzacions disponibles" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Mostra la versió i ix" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "El directori que conté els fitxers de dades" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Comprova si hi ha una versió nova de l'Ubuntu disponible" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "Comprova si és possible actualitzar a la darrera versió de desenvolupament" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Duu a terme l'actualització utilitzant la darrera versió proposada de " "l'actualitzador" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "No passes a primer pla en iniciar" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Prova d'executar un dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "No comprovis si hi ha actualitzacions en iniciar" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Prova d'actualitzar en un entorn de proves amb aufs" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "S'està executant una actualització parcial" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Proveu d'actualitzar a l'última versió fent servir l'actualitzador de " "$distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2350,11 +2368,11 @@ "Actualment disposeu del mode «desktop» per a actualitzacions de sistemes " "d'escriptori i del mode «server» per a sistemes servidors." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Executa el frontal especificat" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2362,11 +2380,11 @@ "Només verifica si hi ha disponible una versió nova i informa del resultat " "mitjançant el codi d'eixida" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2374,121 +2392,138 @@ "Per obtindre més informació sobre actualitzacions, aneu a:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "No s'ha trobat cap versió nova" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "La versió nova «%s» ja està disponible" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Executeu «do-release-upgrade» per actualitzar a la nova versió." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Hi ha disponible una actualitzacio de l'Ubuntu %(version)s" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Heu triat no actualitzar a l'Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "El mètode %s no està implementat" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Un fitxer en disc" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "Paquet .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Instal·la el paquet que falta." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "El paquet %s s'hauria d'instal·lar." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "Paquet .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s s'ha de marcar com a instal·lat manualment." +msgid "%i obsolete entries in the status file" +msgstr "%i entrades obsoletes en el fitxer status" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "Entrades obsoletes a dpkg status" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "Entrades obsoletes a dpkg status" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2497,48 +2532,74 @@ "caldrà instal·lar el paquet kdelibs5-dev. Vegeu l'informe d'error número " "279621 a bugs.launchpad.net per a obtindre'n més detalls." -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "%i entrades obsoletes en el fitxer status" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "Entrades obsoletes a dpkg status" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "Entrades obsoletes a dpkg status" +msgid "%s needs to be marked as manually installed." +msgstr "%s s'ha de marcar com a instal·lat manualment." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Esborra el lilo ja que el grub també està instal·lat (Si voleu més detalls " "vegeu l'error #314004)" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "S'ha seleccionat %(count)s actualització." -#~ msgstr[1] "S'han seleccionat %(count)s actualitzacions." - -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" - -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Benvingut a l'Ubuntu" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Gestor d'actualitzacions" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "Starting Update Manager" -#~ msgstr "S'està iniciant el Gestor d'actualitzacions" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Esteu connectat a través d'un mòdem sense fil." +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "_Instal·la les actualitzacions" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" #~ "This upgrade is running in sandbox (test) mode. All changes are written " @@ -2571,6 +2632,12 @@ #~ "És recomanable que actualitzeu el sistema a una versió més nova de " #~ "l'Ubuntu." +#~ msgid "The update has already been downloaded, but not installed" +#~ msgid_plural "The updates have already been downloaded, but not installed" +#~ msgstr[0] "L'actualització ja s'ha baixat, però encara no s'ha instal·lat" +#~ msgstr[1] "" +#~ "Les actualitzacions ja s'han baixat, però encara no s'han instal·lat" + #~ msgid "There are no updates to install" #~ msgstr "No hi ha actualitzacions a instal·lar" @@ -2672,6 +2739,9 @@ #~ "és limitat i podríeu tindre problemes després d'actualitzar. Voleu " #~ "continuar amb l'actualització?" +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "S'està actualitzant l'Ubuntu a la versió 11.10" + #~ msgid "" #~ "These software updates have been issued since this version of Ubuntu was " #~ "released. If you don't want to install them now, choose \"Update Manager" diff -Nru update-manager-17.10.11/po/ceb.po update-manager-0.156.14.15/po/ceb.po --- update-manager-17.10.11/po/ceb.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/ceb.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2009. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-12-06 06:45+0000\n" "Last-Translator: James Banogon \n" "Language-Team: Cebuano \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "" @@ -42,30 +43,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -75,13 +76,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -96,22 +97,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -124,65 +125,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -191,25 +192,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -218,11 +219,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -233,11 +234,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -245,7 +246,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -254,29 +255,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -286,28 +287,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -315,11 +316,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -331,16 +332,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -353,11 +354,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -366,34 +367,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -406,23 +407,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -433,32 +434,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -466,33 +467,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -503,26 +504,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -530,37 +531,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -568,79 +569,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -648,16 +649,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -666,7 +667,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -675,11 +676,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -687,11 +688,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -699,11 +700,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -713,71 +714,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -787,27 +788,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -817,7 +818,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -826,26 +827,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -853,147 +854,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1001,32 +1002,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1042,7 +1043,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1056,14 +1057,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1071,34 +1072,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1111,28 +1110,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1140,145 +1139,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1286,73 +1285,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1410,7 +1409,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1429,133 +1428,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1563,31 +1570,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1596,34 +1610,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1631,29 +1653,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1662,7 +1684,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1670,58 +1692,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1731,22 +1763,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1760,26 +1788,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1788,7 +1816,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1797,7 +1825,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1806,47 +1834,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1907,54 +1929,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1979,7 +2004,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1991,216 +2016,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/ckb.po update-manager-0.156.14.15/po/ckb.po --- update-manager-17.10.11/po/ckb.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/ckb.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2008. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2009-06-29 02:56+0000\n" "Last-Translator: jwtear nariman \n" "Language-Team: Kurdish (Sorani) \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "" @@ -42,30 +43,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -75,13 +76,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -96,22 +97,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -124,65 +125,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "ناتوانێت جێگیری بکات '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -191,25 +192,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -218,11 +219,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -233,11 +234,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -245,7 +246,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -254,29 +255,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -286,28 +287,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -315,11 +316,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -331,16 +332,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -353,11 +354,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -366,34 +367,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -406,23 +407,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -433,32 +434,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -466,33 +467,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -503,26 +504,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -530,37 +531,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -568,79 +569,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -648,16 +649,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -666,7 +667,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -675,11 +676,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -687,11 +688,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -699,11 +700,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -713,71 +714,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -787,27 +788,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -817,7 +818,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -826,26 +827,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -853,147 +854,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1001,32 +1002,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1042,7 +1043,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1056,14 +1057,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1071,34 +1072,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1111,28 +1110,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1140,145 +1139,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1286,73 +1285,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1410,7 +1409,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1429,133 +1428,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1563,31 +1570,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1596,34 +1610,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1631,29 +1653,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1662,7 +1684,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1670,58 +1692,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1731,22 +1763,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1760,26 +1788,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1788,7 +1816,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1797,7 +1825,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1806,47 +1834,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1907,54 +1929,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1979,7 +2004,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1991,216 +2016,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/crh.po update-manager-0.156.14.15/po/crh.po --- update-manager-17.10.11/po/crh.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/crh.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # # Reşat SABIQ , 2010, 2011. +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-12-06 06:44+0000\n" "Last-Translator: Reşat SABIQ \n" "Language-Team: QIRIMTATARCA (Qırım Türkçesi) longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Deñişiklikler uyğulana" @@ -997,14 +998,14 @@ #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "bağımlılık sorunları - yapılandırılmadan bırakılıyor." # tr #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "\"%s\" kurulamadı" @@ -1012,7 +1013,7 @@ # tr #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -1025,7 +1026,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1037,7 +1038,7 @@ # tr #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1046,22 +1047,22 @@ "yapmış olduğunuz değişiklikleri kaybedeceksiniz." # tr -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "\"diff\" komutu bulunamadı" # tr -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Ölümcül bir hata oluştu" # tr -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1073,14 +1074,14 @@ "dosyelerini dahil etiñiz. Üst-qademeleme abortlanğandır.\n" "Özgün menba listeñiz /etc/apt/sources.list.distUpgrade içinde saqlandı." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c basıldı" # tr -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1090,137 +1091,137 @@ # tr #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Veri kaybını önlemek için açık olan tüm uygulamaları ve belgeleri kapatın." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Canonical tarafından artıq desteklenmey (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Alt-qademele (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Çetleştir (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Artıq kerekmey (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Qur (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Üst-qademele (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Vasat Deñişimi" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Farqnı Köster >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Farqnı Gizle" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Hata" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "%Vazgeç" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Qapat" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Terminalnı Köster >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Terminalnı Gizle" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Malümat" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Tafsilât" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Artıq desteklenmey %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "%s çetleştirilsin" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "%s çetleştirilsin (avto qurulğan edi)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "%s qurulsın" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "%s üst-qademelensin" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Kene başlatuv şarttır" # tr -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Yükseltmeyi tamamlamak için sistemi yeniden başlatın" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "Şimdi _Kene Başlat" # tr #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1231,33 +1232,33 @@ "Yükseltmeyi iptal ederseniz sistem kullanılamaz duruma gelebilir. " "Yükseltmeye devam etmeniz ısrarla tavsiye edilir." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Üst-qademelemeden Vazgeçilsinmi?" # tr -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li gün" # tr -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li saat" # tr -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li dakika" # tr -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1273,7 +1274,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1288,7 +1289,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" @@ -1296,7 +1297,7 @@ # tr #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1307,39 +1308,37 @@ # tr #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" "Bu indirme işlemi sizin bağlantınızla yaklaşık olarak %s kadar sürecektir. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Üst-qademelemege azırlanıla" # tr -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Yeni yazılım kanalları alınıyor" # tr -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Yeni paketler alınıyor" # tr -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Yükseltmeler yükleniyor" # tr -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Temizlik yapılıyor" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1354,28 +1353,28 @@ # tr #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d paket kaldırılacak." # tr -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d yeni paket kurulacak." # tr -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d paket yükseltilecek." # tr -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1386,29 +1385,29 @@ "\n" "Toplam %s indirmeniz gerekmektedir. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" # tr -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1417,78 +1416,78 @@ "iptal edilecek." # tr -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Sistemi yeniden başlatmanız gerekiyor" # tr -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Yükseltme tamamlandı. Sistemi yeniden başlatmanız gerekiyor. Bunu şimdi " "yapmak ister misiniz?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" # tr -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Yükseltme aracı çalıştırılamadı." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" # tr -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Yükseltme aracı imzası" # tr -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Yükseltme aracı" # tr -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Getirme başarısız" # tr -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Yükseltme indirilemedi. Ağda bir sorun olabilir. " # tr -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Kimlik denetimi başarısız oldu" # tr -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1497,56 +1496,56 @@ "olabilir. " # tr -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Çıkarılamadı" # tr -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "Yükseltme açılamadı. Ağda ya da sunucunuda bir sorun olabilir. " # tr -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Doğrulama başarısız oldu" # tr -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "Yükseltme onaylanamadı. Ağda ya da sunucuda bir sorun olabilir. " # tr -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Yükseltme çalıştırılamıyor" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" # tr -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Hata mesajı '%s'" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1559,75 +1558,75 @@ "Özgün menba listeñiz /etc/apt/sources.list.distUpgrade içinde saqlandı." # tüklü -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Vazgeçile" # tr -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Kaldırıldı:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Devam etmek içün lütfen [ENTER] basıñız" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Devam [eH] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Tafsilât [t]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "e" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "h" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "t" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Artıq desteklenmey: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Çetleştir: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Qur: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Üst-qademele: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Devam Et [eH] " # tr -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1700,7 +1699,7 @@ msgstr "Dağıtım Üst-qademelemesi" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" # tr @@ -1721,166 +1720,179 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Lütfen bekleñiz, bu biraz vaqıt alabilir." # tr -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Güncelleme tamamlandı" # tr -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Yayım notları bulunamadı" # tr -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Sunucu aşırı yüklenmiş olabilir. " # tr -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Yayım notları indirilemedi" # tr -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Lütfen internet bağlantınızı denetleyin." # tr -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Yükselt" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Çıqarılış Notları" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Ek paket dosyeleri endirile..." # tr -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Dosya %s / %s, %sB/s hızla" # tr -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Dosya %s / %s" # tr -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Bağlantıyı Tarayıcıda Aç" # tr -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Bağlantıyı Panoya Kopyala" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" "Dosye %(current)li endirile (topyekün: %(total)li; sur'at: %(speed)s/s)" # tüklü -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Dosye %(current)li endirile (topyekün: %(total)li)" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Ubuntu sürümiñiz artıq desteklenmey" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" # tr -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Yükseltme bilgisi" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Qur" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Sürüm %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Şebeke bağlantısı tapılmadı, deñişiklik kütügi malümatını endiralmaysıñız." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Deñişiklikler listesi endirile..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s yañartma saylanğandır." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s endirilecek." -# tüklü #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "Yañartma(lar) endi endirilgendir, amma qurulmağandır" +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Bilinmegen endirme ölçüsi." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1890,13 +1902,13 @@ "Yañı yazılım yañartmaları içün teşkermek üzre aşağıdaki 'Teşker' dögmesine " "basıñız." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "Paket malümatı eñ soñ %(days_ago)s kün evel yañartıldı." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1904,35 +1916,45 @@ msgstr[0] "Paket malümatı eñ soñ %(hours_ago)s saat evel yañartıldı." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Yazılım yañartmaları hatalarnı tüzetir, emniyet örselenebilirlikleriniñ " +"ögüni alır ve yañı hususiyetlerni temin eter." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Bilgisayarıñız içün yazılım yañartmaları faydalanışlı olabilir." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Ubuntu'ğa Hoşkeldiñiz" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" # tr -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1943,7 +1965,7 @@ "olarak %s boş alanı '%s' üzerinde oluşturun. Çöpünüzü boşaltın ve 'sudo apt-" "get clean' kullanarak önceki yüklemelerin geçici paketlerini kaldırın." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1951,27 +1973,27 @@ "Yañartmalarnı quruvnı tamamlamaq içün bilgisayar kene başlatılmağa muhtac. " "Devam etmezden evel lütfen çalışmañıznı saqlañız." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Paket malümatı oqula" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Bağlanıla..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Belki de yañartmalar içün teşkeralmazsıñız yaki yañı küncelleştirmelerni " "endiralmazsıñız." # tr -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Paket bilgisi başlangıç durumuna getirilemedi" # tr -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1984,7 +2006,7 @@ "Lütfen bu yanlışı 'update-manager' paketi hatası olarak izleyen hata " "iletisiyla beraber gönderin:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1997,33 +2019,33 @@ "aşağıdaki hata mesajını dahil etiñiz:" # tr -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Yeni kurulum)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Ölçü:%s)" # tr -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "%(old_version)s sürümünden %(new_version)s sürümüne" # tr -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Sürüm %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Çıqarılış üst-qademelemesi şu ande mümkün degil" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -2033,24 +2055,24 @@ "deñeñiz. Sunucı raportladı: '%s'" # tr -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Sürüm güncelleme aracı indiriliyor" # tr -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Yeni Ubuntu sürümü '%s' var" # tr #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Yazılım dizini bozulmuş" # tr -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -2060,6 +2082,18 @@ "durumu düzeltmek için öncelikle \"Synaptic\" paket yöneticisini kullanın ya " "da uçbirim penceresine \"sudo apt-get install -f\" komutunu yazıp çalıştırın." +# tr +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Yeni sürüm çıktı ('%s')." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Vazgeç" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -2069,22 +2103,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Vazgeç" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Yañartmalar Listesi İnşa Etile" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2108,21 +2138,21 @@ " * Ubuntu tarafından temin etilmegen ğayrı resmiy yazılım paketleri\n" " * Çıqarılışaldı bir Ubuntu sürüminiñ normal deñişiklikleri" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Deñişiklik kütügi endirile" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Diger yañartmalar (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" # tr -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2130,7 +2160,7 @@ "Değişiklik listesini indirme başarısız oldu. \n" "Lütfen İnternet bağlantınızı denetleyin." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2140,7 +2170,7 @@ msgstr "" # tr -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2155,7 +2185,7 @@ "http://launchpad.net/ubuntu/+source/%s/%s/+changelog adresini kullanın." # tr -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2170,53 +2200,44 @@ "adresini kullanın ya da daha sonra yeniden deneyin." # tr -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Dağıtım belirleme başarısız oldu" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Angi sistemni qullanğanıñıznı teşkergende bir '%s' hatası sudur etti." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Müim emniyet yañartmaları" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Tevsiye etilgen yañartmalar" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Teklif etilgen yañartmalar" # tüklü -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Keritaşımalar (Backports)" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Dağıtım yañartmaları" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Diger yanartmalar" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Yañartma İdarecisi Başlatıla" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Yazılım yañartmaları hatalarnı tüzetir, emniyet örselenebilirlikleriniñ " -"ögüni alır ve yañı hususiyetlerni temin eter." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Qısmiy Üst-qademeleme" @@ -2293,38 +2314,28 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Yazılım Yañartmaları" +msgid "Update Manager" +msgstr "Yañartma İdarecisi" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Yazılım Yañartmaları" +msgid "Starting Update Manager" +msgstr "Yañartma İdarecisi Başlatıla" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Üst-qademele" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "yañartmalar" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Qur" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Deñişiklikler" - -#: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Tasvir" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Yañartma tasviri" +msgid "updates" +msgstr "yañartmalar" # tüklü -#: ../data/gtkbuilder/UpdateManager.ui.h:31 +#: ../data/gtkbuilder/UpdateManager.ui.h:29 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2332,23 +2343,33 @@ "Dolaşım arqalı bağlanğansıñız ve bu yañartma tarafından tüketilgen veriler " "içün ücretlendirilebilirsiñiz." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Telsiz modem arqalı bağlanğansıñız." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "Yañartmazdan evel bilgisayarnı almaşıq aqımğa bağlamaq daha sağlamdır." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Yañartmalarnı Qur" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Deñişiklikler" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "" +msgid "Description" +msgstr "Tasvir" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Qur" +msgid "Description of update" +msgstr "Yañartma tasviri" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2373,9 +2394,8 @@ msgstr "Yañı Ubuntu'ğa üst-qademelemeni red ettiñiz" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Yañartma İdarecisi'ni açıp \"Üst-qademele\" dögmesine çerterek soñra da üst-" @@ -2390,61 +2410,61 @@ msgstr "Mevcut yañartmalarnı köster ve qur" # tr -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Sürümü göster ve çık" # tr -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Veri dosyalarını içeren dizin" # tr -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Yeni bir Ubuntu sürümü olup olmadığını denetle" # tr -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "En son geliştirme sürümüne yükseltme olasılığını denetle" # tr -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "Yayım yükselticisinde en son önerilen sürümü kullanarak yükselt" # tr -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Başlatılırken haritaya odaklanma" # tr -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Dağıtım yükseltmeyi dene" # tr -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Başlağanda yañartmalar içün teşkerme" # tr -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Yükseltmeyi, bir çalışma dizini 'aufs' yer paylaşımıyla sına" # tr -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "_Yükseltmeye başla" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" # tr -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" @@ -2452,7 +2472,7 @@ "güncellemeyi deneyin" # tr -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2463,12 +2483,12 @@ "sunucu sistemlerinin düzenli güncellemeleri için 'sunucu' desteklenmektedir." # tr -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Belirlenmiş önyüzü çalıştır" # tr -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2476,11 +2496,11 @@ "Sadece eğer yeni dağıtım güncellemesi kullanılabildiğinde kontrol et ve " "sonucu çıkış koduyla bildir." -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2489,131 +2509,150 @@ "%(url)s\n" # tr -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Yeni sürüm bulunamadı" # tr -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Yeni sürüm çıktı ('%s')." # tr -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Yükseltmek için 'do-release-upgrade' çalıştırın." # tr -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Ubuntu %(version)s Yükseltmesi Mevcut" # tr -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Ubuntu %s sürümüne yükseltmeyi reddettiniz" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + # tr -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Gerçekleştirilmemiş metot: %s" # tr -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Sürücüdeki bir dosya" # tr -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb paketi" + +# tr +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Eksik paketi yükle." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "%s paketi qurulmaq kerek." # tr -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb paketi" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" +msgstr "Durum dosyasında %i eski girdisi" # tr -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s paketi, elle yüklendi şeklinde imlenmesi gerekiyor." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "dpks durumunda eski girdiler mevcut" + +# tr +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "Eski dpkg durum girdileri" # tr -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2623,50 +2662,75 @@ "adresindeki #279621 numaralı hata kaydına bakın." # tr -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "Durum dosyasında %i eski girdisi" - -# tr -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "dpks durumunda eski girdiler mevcut" - -# tr -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "Eski dpkg durum girdileri" +msgid "%s needs to be marked as manually installed." +msgstr "%s paketi, elle yüklendi şeklinde imlenmesi gerekiyor." # tr -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Ayrıca grub yüklendikten sonra 'lilo'yu kaldır.(Ayrıntılar için #314004 " "yanlışına bakın.)" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s yañartma saylanğandır." - -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" - -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Ubuntu'ğa Hoşkeldiñiz" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Yañartma İdarecisi" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "Starting Update Manager" -#~ msgstr "Yañartma İdarecisi Başlatıla" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Telsiz modem arqalı bağlanğansıñız." +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "_Yañartmalarnı Qur" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" # tr #~ msgid "" @@ -2717,6 +2781,11 @@ #~ "almaycaqsıñız. Lütfen daa soñraki bir Ubuntu Linux sürümine üst-" #~ "qademeleñiz." +# tüklü +#~ msgid "The update has already been downloaded, but not installed" +#~ msgid_plural "The updates have already been downloaded, but not installed" +#~ msgstr[0] "Yañartma(lar) endi endirilgendir, amma qurulmağandır" + #~ msgid "There are no updates to install" #~ msgstr "Qurulacaq yañartmalar yoq" diff -Nru update-manager-17.10.11/po/csb.po update-manager-0.156.14.15/po/csb.po --- update-manager-17.10.11/po/csb.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/csb.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-11-02 10:00+0000\n" "Last-Translator: Yurek Hinz \n" "Language-Team: Kashubian \n" @@ -21,7 +22,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -29,13 +30,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Serwera dlô kraju %s" @@ -43,20 +44,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Przédnô serwera" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Jine serwerë" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Ni mòże òbrachòwac wpisënka w lopkù sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -64,11 +65,11 @@ "Ni mòże nalezc niżódnëch lopków z paczetama, mòże to nie je disk z Ubuntu " "abò lëchô architektura?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Ni mòże dodac platë CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -83,14 +84,14 @@ "Zamkłosc felë to:\n" "\"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Rëmanié lëchegò paczétu" msgstr[1] "Rëmanié lëchich paczétów" msgstr[2] "Rëmanié lëchich paczétów" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -115,15 +116,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Serwer mòże bëc przecãżony" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Paczétë są zepsëté" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -132,7 +133,7 @@ "pòprawic je brëkùjąc menadżera paczetów Synaptic abò apt-get." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -154,11 +155,11 @@ " * Brëkòwanié nieòficjalnych paczétów z bùtna repòzytorëjów Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "To są le chwilowé problemë. Proszã spróbòwac pòzdze." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -166,16 +167,16 @@ "Żlë zôdnô òptacjô nie pasëje, zgłosë ną felã z rédżi pòlétów: 'ubuntu-bug " "update-manager'" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Nié mòże przerobic aktualizacëjów" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Fela ùdowierzaniô niechtërnych paczétów" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -184,7 +185,7 @@ "Nie dało sã ùdowierzëc niejednych paczétów. Mòże to bëc czasowô fela sécë. " "Mòże spróbòwac pòzdze znowa. Niżi nachôdô sã lësta nieùdowierzónych paczétów" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -192,22 +193,22 @@ "Paczét \"%s\" je wëbróny do rëmniãcô, je òn rówank na lësce paczétów, " "chtërnych nie je nót rëmac." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Nóterny paczét \"%s\" je nacéchòwóny do rëmniãcô." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Próba instalacëji wersëji \"%s\", jakô je na czôrny lësce" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Ni mòże winstalowac '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -216,11 +217,11 @@ "rédżi pòlétów wpisëjąc: 'ubuntu-bug update-manager'" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Ni mòże òpisac meta-paczétu" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -233,15 +234,15 @@ " Proszã winstalowac jeden z tich paczétów brëkùjąc programë Synaptic abò apt-" "get nigle póńdzesz dali." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Czëtanié pòdrãcznegò bùfora" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Ni mòże dobëc blokadë na wëłãcznotã" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -249,11 +250,11 @@ "Zwëczajno òznôczô to, że jinszô aplikacëjô do sprôwianiô paczétama (jakno " "apt-get abò aptitude) je zrëszonô. Nót je wprzód zamknąc nã aplikacëjã." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Aktualizacëjô przez daleczé sparłãcznie nie je wspierónô" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -266,11 +267,11 @@ "upgrade'.\n" "Zaktualnienié òstanie przerwóné. Spróbùjë bez pòwłoczi ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Jic dali ze sparłãczeniã SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -281,11 +282,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Zrëszanié dodôwnëch ùsłëżnotów ssh" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -297,7 +298,7 @@ "niedarzënkù z aktualną sesëją ssh, wcyg mòże przëłączëc sã do dodôwny " "sesëji.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -306,31 +307,31 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Nié mòże zaktualnic" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" "Aktualizacëjô z wersëji \\\"%s\\\" do \\\"%s\\\" nie je wspierónô przez to " "nôrzãdze." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Nastôw tekstowégò tribù nie darzëł sã" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Ùsôdzanié tekstowégò òkrãżô nie bëło mòżlëwé." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Tekstowi trib" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -340,30 +341,30 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Instalacëjô python je zepsëtô. Proszã naprawic dowiązanié do \"/usr/bin/" "python\"." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Paczét \"debsig-verify\" je winstalowóny" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -371,11 +372,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Dodac nônowszé zaktualnienia z internetu?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -387,16 +388,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "wëłączony przë aktualizacëji do %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Pòprôwny szpéglowi serwer ni nalazłi" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -409,11 +410,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Wëgenerowac domëszlné zdroje?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -422,35 +423,35 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Lëchô wëdowiédzô ò repòzëtorëjach" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Zdoje samòstójnëch dostôwców òstałë włączoné" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Paczét w niezgòdnym stónie" msgstr[1] "Paczétë w niezgòdnym stónie" msgstr[2] "Paczétë w niezgòdnym stónie" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -473,23 +474,23 @@ "równak nalezc niżódnegò archiwùm nych paczétów. Proszã winstalowac paczétë " "rãczno abò rëmnąc je z systemë." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Fela òbczas aktualizacëji" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Za mało placu na diskù" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -500,32 +501,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Przerôbianié zmianów" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Chcesz zrëszëc aktualizacëjã?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Aktualizacëjô òprzestónô" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Nié mòże zladowac zaktualnieniów" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -533,33 +534,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Fela òbczas zacwierdzaniô" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Doprowôdzanié nazôd òriginalnegò stónu systemë" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Instalacëjô aktualizacëji nie darzëła sã." #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -570,26 +571,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Rëmnąc stôre paczétë?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "Ù_trzëmôj" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Rëmôj" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -597,37 +598,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Wëmôgónô zanóleżnota nie je winstalowónô." -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Wëmôgónô zanóleżnota '%s' nie je winstalowónô " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Sprôwdzanié menadżera paczétów" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Przëszëkòwanié aktualizacëjów nie darzëło sã" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Dobëcé elementów nótrnych do aktualizacëji nie darzëło sã" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -635,79 +636,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Aktualizacëjô wëdowiédzë ò respòzëtorëjach" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Lëchô wëdowiédzô ò paczétach" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Zladënk" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Zaktualnienié" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Zaktualnienié zakùńczoné" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Szëkba za stôrą softwôrą" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Zaktualnienié systemë dzrzëło sã" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Dzélowô aktualizacëjô skùńcoznô" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "EVMS w brëkùńkù" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -715,16 +716,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -737,7 +738,7 @@ "\n" "Jisc dali?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -750,11 +751,11 @@ "\n" "Jisc dali?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -762,11 +763,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Felënk procesora ARMv6" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -774,11 +775,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Felënk przëstãpù do procesu init" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -788,15 +789,15 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Testowô aktualizacëjô brëkùjąc aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Ùżëjë pòdóną stegnã do szëkbë za CD z paczétama aktualizacëji" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -804,57 +805,57 @@ "Brëkùnk graficzny nôdkładczi. Terô przëstãpné: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "Ùżëjë blós dzélowi aktualizacëji (bez nadpisaniô source.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Nastôwi stegnã do pòdôwków" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Proszã włożëc '%s' do nëkù '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Zladënk zakùńczony" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Zladënk %li lopka z %li z chùtkòscą %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Òstało kòl %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Zladënk lopka %li z %li" @@ -864,27 +865,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Zacwierdzanié zmianów" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "problemë z zanôleżnotama - òstôwioné nieskònfigùrowóné" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Nie bëło mòżno zainstalowac '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -894,7 +895,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -905,26 +906,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Pòlét 'diff' nie òstôł nalazłi" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Pòkôza sã kriticznô fela" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -932,149 +933,149 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Wcësniãto Ctrl-C" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Abë nie ùtracëc pòdôwków proszã zamknąc wszëtczé òtemkłé aplikacëje ë " "dokùmentë." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Zmiana media" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Wëskrzëni nierównoscë >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Zatacë nierównoscë" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Fela" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "Ò&przestóń" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "Z&amkni" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Wëskrzëni terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Zatacë terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Wëdowiédzô" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Drobnotë" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Rëmôj %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Rëmôj (bëło aùtomatno winstalowóné) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Instalëjë %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Aktualizëjë %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Wëmôgóne je zrëszenié kòmpùtra znowa" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Zrëszë kòpmùtr znowa, żebë zakùńczëc aktualizacëjã" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Zrëszë znowa" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1086,11 +1087,11 @@ "Systema mòże stracëc sztabilnotã jeżlë òprzestóniesz aktualizacëjã. " "Zamòdlëwô sã znowienié aktualizacëji." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Òprzestac zaktualnienié?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" @@ -1098,7 +1099,7 @@ msgstr[1] "%li dni" msgstr[2] "%li dniów" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" @@ -1106,7 +1107,7 @@ msgstr[1] "%li gòdzënë" msgstr[2] "%li gòdzën" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" @@ -1114,7 +1115,7 @@ msgstr[1] "%li minutë" msgstr[2] "%li minutów" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1131,7 +1132,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1145,14 +1146,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1162,34 +1163,32 @@ "mòdewòwégò sparłãczenia 56k." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Zladënk mòże, w przëtrôfkù negò sparłãczenia, dérowac kòl %s . " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Przërechtowanié zaktualnienia" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Zladënk nowich kanalów softwôrë" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Zladënk nowich paczétów" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Instalacëjô zaktualnieniô" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Czëszczenié" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1202,7 +1201,7 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." @@ -1210,7 +1209,7 @@ msgstr[1] "%d paczétë òstaną rëmniãte." msgstr[2] "%d paczétów òstaną rëmniãtëch." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." @@ -1218,7 +1217,7 @@ msgstr[1] "%d nowé paczétë òstaną winstalowóné." msgstr[2] "%d nowëch paczétów òstanie winstalowónëch." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." @@ -1226,7 +1225,7 @@ msgstr[1] "%d paczétë òstaną zaktualnione." msgstr[2] "%d paczétów òstanie zaktualnionëch." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1237,97 +1236,97 @@ "\n" "Mùszebny zladënk w grëpie %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "Felëjë przistãpnëch aktualizacëjów. Aktualizacëjô òstanié òprzestónô." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Wëmôgóne je zrëszenié kòmpùtra znowa" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Aktualizacëjô òsta zakùńczonô ë nót je zrëszëc kòmpùtr znowa. Zrobic to terô?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Zrëszenié nôrzãdza aktualizacëji nie darzëło sã" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Pòdpisënk nôrzãdza aktualizacëji" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Nôrzãdze aktualizacëji" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Zladënk nie darzëł sã" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "Zladënk aktualizacëji nie darzëł sã. Mòże to òznôczac problemë z sécą. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Ùdowierzanié nie darzëło sã" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1335,13 +1334,13 @@ "Ùdowierzanié aktualizacëji nie darzëło sã. Mòże je to problem z sécą abò " "serwerã. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Rozpakòwëwanié nie darzëło sã" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1349,13 +1348,13 @@ "Rozpakòwëwanié aktualizacëji nie darzëło sã. Mòże je to problem z sécą abò " "serwerã. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Werifikacëjô nie darzëła sã" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1363,27 +1362,27 @@ "Werifikacëjô aktualizacëji nie darzëła sã. Mòże je to problem z sécą abò " "serwerã. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Ni mòże nacząc aktualizacëji" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Zamkłosc wiadła felë: \\\"%s\\\"" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1391,73 +1390,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Òprzestóń" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Zdegradowóné:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Biéj dali [jN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Detale [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "j" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Rëmôj: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Instalëjë %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Aktualizëjë %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Jisc dali [Jn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1524,7 +1523,7 @@ msgstr "Aktualizacëjô distribùcëji" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1543,167 +1542,180 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Proszã żdac, to mòże kąsk dérowac." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Zaktualnienié zakùńczoné." -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "NIé mòże nalezc wëdowiédzë ò wëdôwkù" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Serwera mòże bëc przeladowóny " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Zladënk wëdowiédzë ò wëdôwkò nie darzëł sã" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Proszã sprôwdzëc sécowé nastôwë" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Aktualizëjë" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Wëdowiédzô ò wëdôwkù" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Zladënk dôdôwnych paczétów..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Lopk %s z %s z chùtkòscą %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Lopk %s z %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Òtemkni lënk w przezérnikù" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Kòpérëjë lënk do tacnika" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Ladowanié lopka %(current)li z %(total)li z chùtkòscą %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Ladowanié lopka %(current)li z %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Wëdowiedze ò aktualizacëji" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Instalëjë" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Wersëjô %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Zladënk lëstë zjinaków..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "Serwera mòże bëc przeladowóny " -msgstr[1] "Serwera mòże bëc przeladowóny " -msgstr[2] "Serwera mòże bëc przeladowóny " +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1712,34 +1724,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Witómë w Ubuntu" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1747,7 +1767,7 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1755,23 +1775,23 @@ "Kòmpùtr mùszi bëc zrëszony znowa, abë skùńczëc instalacëjã aktualizacëji. " "Proszã zapisac biéżną robòtã zaczëm póńdzesz dali." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Czëtanié wëdowiédzë ò paczétach" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Nié mòże zainicjowac wëdowiédzë ò paczétach" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1780,7 +1800,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1788,52 +1808,52 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Nowô instalacëjô)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Miara: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Z wersëji %(old_version)s do %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Wersëjô %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Zladënk nôrzãdza aktualizacëji wëdôwkù" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Przëstãpny je nowi wëdôwk Ubuntu: \"%s\"" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Spisënk softwôrë mô felã" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1843,6 +1863,17 @@ "menadżera paczétów \"Synaptic\" abò wpisac w terminalu pòlét \"sudo apt-" "get install -f\" bë naprawic nen problem." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Nowi wëdôwk '%s' je przëstãpny" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Òprzestóń" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1852,22 +1883,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Òprzestóń" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Ùsôdzanié lëstë paczétów do zaktualnieniô" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1881,20 +1908,20 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Zladënk dniownika zjinaków" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Jinszé zaktualnienia (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -1902,7 +1929,7 @@ "Nie dało sã zladowac lëstë zmianów. \n" "Proszã sprôwdzëc swòjé internetowé sparłãczenié." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1911,7 +1938,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1924,7 +1951,7 @@ "Proszã brëkòwac http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "nigle zmianë bãdą ùprzëstãpnioné abò spróbòwac znowa." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1937,50 +1964,43 @@ "Proszã brëkòwac http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "do czasu, jak zmianë bãdą ju przëstãpné, abò spróbòwac pòzdze." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Nie dało sã wëkrëc distribùcëji" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Fela \\\"%s\\\" przë sprôwdzaniu brëkòwóny systemë." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Wôżné zaktualnienia bezpiekù" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Zamòdlëwóné zaktualnienia" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Bédowóné zaktualnienia" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backpòrtë" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Zaktualnienia distribùcëji" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Jinszé zaktualnienia" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Zrëszanié menadżera aktualizacëji" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Dzélowé zaktualnienié" @@ -2043,59 +2063,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Zaktualnienia softwôrë" +msgid "Update Manager" +msgstr "Menedżera aktualizacëji" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Zaktualnienia softwôrë" +msgid "Starting Update Manager" +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Aktualizëjë" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "zaktualnienia" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Instalëjë" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Zjinaczi" +msgid "updates" +msgstr "zaktualnienia" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Òpisënk" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Òpisënk zaktualnieniów" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Winstalëjë zaktualnienia" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Zjinaczi" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "" +msgid "Description" +msgstr "Òpisënk" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Instalëjë" +msgid "Description of update" +msgstr "Òpisënk zaktualnieniów" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2119,7 +2139,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -2131,60 +2151,60 @@ msgid "Show and install available updates" msgstr "Wëskrzëni ë winstalëjë przëstãpné aktualizacëje" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Wëskrzënianié wersëji ë wińdzënk" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Katalog zamëkający lopczi pòdôwków" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Sprôwdzô, czë przëstãpny je nowi wëdôwk Ubuntu" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Sprôwdzë mòżnotã zaktualnieniô do nônowszi testowi wersëji" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Aktualizacëjô z brëkùnkã nônowszi wersëji zamòdlëwóny przez aktualizownika " "wëdôwków" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Nie kòncentrëje sã na karce przë zrëszaniu" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Spróbùjë zrëszëc zaktualnienié distribùcëji" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Testowô aktualizacëjô z nadkłôdką sandbox aufs" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Przerôbianié dzélowégò zaktualnienia" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Proszã spróbòwac zaktualnic do nônowszi wersëji brëkùjąc zaktualniający " "programë z $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2194,172 +2214,229 @@ "Terô wspieróné są tribë \"desktop\" dlô kòmpùtrów ë \"server\" dlô " "serwerowich systemów." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Zrëszë òpisóną nadkłôdkã" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Felënk nowegò wëdôwka" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Nowi wëdôwk '%s' je przëstãpny" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Zrëszë 'do-release-upgrade', abë zaktualnic." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Przëstãpnô je aktualizacëjô do Ubuntu %(version)s" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Pòcësniãto aktualizacëjã do Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Lopk na diskù" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "Paczét .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Instalacëjô felëjącegò paczétu." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Paczét %s mùszôłbë bëc winstalowóny." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "Paczét .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s musi zostać oznaczony jako zainstalowany ręcznie." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i niepòtrzébnych wpisënków w lopkù stónu" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Niepòtrzébné wpisënczi stónu w dpkg" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Niepòtrzébné wpisënczi stónu dpkg" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s musi zostać oznaczony jako zainstalowany ręcznie." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Witómë w Ubuntu" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" + +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Menedżera aktualizacëji" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "_Winstalëjë zaktualnienia" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "Checking for a new ubuntu release" #~ msgstr "Sprôwdzë przëstãpnosc nowegò wëdôwka Ubuntu" diff -Nru update-manager-17.10.11/po/cs.po update-manager-0.156.14.15/po/cs.po --- update-manager-17.10.11/po/cs.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/cs.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-21 06:14+0000\n" "Last-Translator: Vojtěch Trefný \n" "Language-Team: Czech \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -29,13 +30,13 @@ msgstr[2] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Server pro zemi „%s“" @@ -43,20 +44,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Hlavní server" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Uživatelem vybrané servery" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Nebylo možné vypočítat záznam v sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -64,11 +65,11 @@ "Nelze najít žádné soubory balíčků, pravděpodobně toto není disk Ubuntu nebo " "obsahuje nesprávnou architekturu?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Selhalo přidávání CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -84,14 +85,14 @@ "Chybová zpráva byla:\n" "„%s“" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Odstranit balíček ve špatném stavu" msgstr[1] "Odstranit balíčky ve špatném stavu" msgstr[2] "Odstranit balíčky ve špatném stavu" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -116,15 +117,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Server je možná přetížený" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Poškozené balíčky" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -134,7 +135,7 @@ "nebo apt-get." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -155,12 +156,12 @@ " * V systému jsou neoficiální softwarové balíčky neposkytované od Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Toto je pravděpodobně pouze dočasný problém, prosím zkuste to znovu později." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -168,16 +169,16 @@ "Pokud nic z toho nepomůže, nahlaste prosím tento problém pomocí příkazu " "'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Nelze vypočítat přechod na vyšší verzi" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Chyba při ověřování některých balíčků" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -187,7 +188,7 @@ "problém v síti. Zkuste to prosím později. Níže je uveden seznam postižených " "balíčků." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -195,22 +196,22 @@ "Balíček „%s“ je označen k odstranění, ale přitom je uveden v seznamu " "neodstranitelných." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Stěžejní balíček „%s“ je označen k odstranění." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Pokus o instalaci zakázané verze „%s“" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Nelze nainstalovat „%s“" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -219,11 +220,11 @@ "pomocí příkazu 'ubuntu-bug update-manager' v terminálu." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Nelze odhadnout meta-balíček" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -237,15 +238,15 @@ " Před tím, než budete pokračovat, si prosím nejprve nainstalujte jeden z " "uvedených balíčků pomocí programu synapticu nebo apt-get." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Probíhá čtení mezipaměti" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Nelze získat exkluzivní přístup" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -253,11 +254,11 @@ "Tohle obvykle znamená, že jiný správce balíčků (jako apt-get nebo aptitude) " "již běží. Nejdříve jej prosím ukončete." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Aktualizace přes vzdálené připojení není podporována" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -271,11 +272,11 @@ "\n" "Povýšení systému se nyní přeruší. Zkuste to prosím bez ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Pokračovat s během pod SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -292,11 +293,11 @@ "Pokud budete pokračovat, dodatečný ssh démon bude spuštěn na portu „%s“.\n" "Chcete pokračovat?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Spouští se dodatečné sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -307,7 +308,7 @@ "sshd. Pokud nastane nějaká chyba s běžícím ssh, můžete se stále připojit na " "ten dodatečný.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -320,29 +321,29 @@ "port můžete otevřít např. takto:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Nelze přejít na vyšší verzi" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Povýšení systému z „%s“ na „%s“ není tímto nástrojem podporované." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Selhalo nastavení zabezpečeného prostředí" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Nebylo možné vytvořit zabezpečené prostředí." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Režim zabezpečeného prostředí" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -356,18 +357,18 @@ "Žádné změny zapsané do systémového adresáře do následujícího restartu nejsou " "trvalé!" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Vaše instalace pythonu je poškozena. Prosím opravte symbolický odkaz „/usr/" "bin/python“." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Balíček „debsig-verify“ je nainstalován" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -377,12 +378,12 @@ "Nejprve prosím odstraňte balíček pomocí programu Synaptic nebo „apt-get " "remove debsig-verify“ a poté spusťte aktualizaci znovu." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Nelze zapisovat do '%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -393,11 +394,11 @@ "nemůže pokračovat.\n" "Prosím, ujistěte se, že systémový adresář je zapisovatelný." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Včetně nejnovějších aktualizací z internetu?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -417,16 +418,16 @@ "nainstalovat nejnovější aktualizace.\n" "Pokud zde odpovíte „ne“, tak nebude síť vůbec použita." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "zakázáno při povýšení na %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Nebyl nalezen platný zrcadlový server" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -446,11 +447,11 @@ "Pokud zvolíte „Ne“, povýšení se zruší." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Vygenerovat výchozí zdroje?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -464,11 +465,11 @@ "Mají být přidány výchozí položky pro „%s“? Pokud zvolíte „Ne“, přechod na " "vyšší verzi bude zrušen." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Neplatná informace o repozitáři" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -476,11 +477,11 @@ "Povýšení informace o repozitáři vyústilo v neplatný soubor, zahajuje se " "proces hlášení chyby." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Zdroje třetích stran zakázány" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -490,14 +491,14 @@ "Můžete je znovu povolit po aktualizaci nástrojem „software-properties“ nebo " "svým správcem balíčků." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Balíček je v nekonzistentním stavu" msgstr[1] "Balíčky jsou v nekonzistentním stavu" msgstr[2] "Balíčky jsou v nekonzistentním stavu" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -520,11 +521,11 @@ "nebyl pro ně nalezen žádný archiv. Přeinstalujte prosím balíčky ručně nebo " "je odeberte ze systému." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Chyba během aktualizace" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -533,13 +534,13 @@ "síťového připojení. Zkontrolujte prosím své připojení k síti a zkuste to " "znovu." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Nedostatek volného místa na disku" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -554,21 +555,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Propočítávají se změny" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Chcete spustit aktualizaci?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Přechod na vyšší verzi zrušen" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -576,12 +577,12 @@ "Přechod na vyšší verzi bude nyní zrušen a dojde k obnovení systému do " "původního stavu. Pokračovat v přechodu na vyšší verzi můžete později." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Nepodařilo se stáhnout novější vydání" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -592,27 +593,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Chyba při potvrzování" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Obnovuje se původní stav systému" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Nepodařilo se nainstalovat aktualizace" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -620,7 +621,7 @@ "Přechod na novější vydání byl přerušen. Váš systém by mohl být v " "nepoužitelném stavu. Nyní bude spuštěna obnova (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -637,7 +638,7 @@ "adresáře /var/log/dist-upgrade/.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -645,20 +646,20 @@ "Přechod na novější vydání byl přerušen. Zkontrolujte prosím své internetové " "připojení nebo instalační média a zkuste to znovu. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Odstranit zastaralé balíčky?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Ponechat" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "Odst_ranit" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -668,37 +669,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Požadované závislosti nejsou nainstalovány" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Požadovaná závislost „%s“ není nainstalována. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Kontroluje se správce balíčků" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Příprava přechodu na vyšší verzi selhala" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "Příprava systému na povýšení selhala, proces hlášení chyby zahájen." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Získání potřebných prostředků pro povýšení systému selhalo" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -710,69 +711,69 @@ "\n" "Navíc byl zahájen proces hlášení chyby." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Aktualizují se informace o repozitářích" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Nepodařilo se přidat cdrom" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Promiňte, přidání cdrom nebylo úspěšné." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Neplatná informace o balíčku" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Získává se" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Probíhá přechod na vyšší verzi" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Povýšení systému hotovo" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "Přechod na vyšší verzi byl dokončen, ale během povyšování nastaly chyby." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Vyhledává se zastaralý software" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Přechod na vyšší verzi systému je dokončen." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Částečné povýšení systému bylo dokončeno." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "používán evms" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -782,11 +783,11 @@ "„evms“ již není nadále podporován, vypněte jej prosím, a poté spusťte " "aktualizaci znovu." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "Vaše grafická karta nemusí být v Ubuntu 12.04 LTS plně podporována." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -798,9 +799,9 @@ "wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx Přejete si pokračovat v " "přechodu na novější vydání?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -808,8 +809,8 @@ "Povýšení může omezit grafické efekty prostředí a snížit výkon ve hrách a " "jiných graficky náročných aplikacích." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -823,7 +824,7 @@ "\n" "Přejete si pokračovat?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -837,11 +838,11 @@ "\n" "Přejete si pokračovat?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Nenalezeno CPU i686" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -852,11 +853,11 @@ "balíky byly sestaveny s optimalizací vyžadující minimální architekturu i686. " "S tímto hardwarem není možné povýšit váš systém na nové vydání Ubuntu." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Nemáte procesor ARMv6" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -868,11 +869,11 @@ "požadujícími minimálně architekturu ARMv6. S tímto hardwarem není možné " "povýšit váš systém na nové vydání Ubuntu." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Není k dispozici žádný démon init" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -888,15 +889,15 @@ "\n" "Opravdu chcete pokračovat?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Aktualizace v chráněném prostředí za pomoci aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Použij danou cestu k vyhledání cdrom s aktualizovatelnými balíčky" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -904,57 +905,57 @@ "Používat nadstavbu. Aktuálně dostupné :\n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*ZASTARALÉ* tato volba bude ignorována" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "Provést pouze částečné povýšení (bez přepisování sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Zakázat podporu GNU screen" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Nastavit datadir" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Vložte prosím „%s“ do mechaniky „%s“" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Stahování je dokončeno" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Stahování souboru %li z %li při %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Zbývá zhruba %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Stahování souboru %li z %li" @@ -964,27 +965,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Provádějí se změny" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "problém se závislostmi - ponecháno nenastavené" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Nelze nainstalovat „%s“" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -996,7 +997,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1007,7 +1008,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1015,20 +1016,20 @@ "Pokud zvolíte nahrazení novější verzí, ztratíte veškeré lokální změny tohoto " "konfiguračního souboru." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Příkaz „diff“ nebyl nalezen" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Došlo ke kritické chybě" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1041,13 +1042,13 @@ "Váš původní soubor sources.list byl uložen do /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Stisknuto Ctrl-c" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1056,136 +1057,136 @@ "že to chcete provést?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "Pro zamezení ztráty dat uzavřete všechny aplikace a dokumenty." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Již není podporováno společností Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Přejít na nižší verzi (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Odstranit (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Již není potřeba (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Nainstalovat (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Přejít na vyšší verzi (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Změna média" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Zobrazit rozdíl >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Skrýt rozdíl" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Chyba" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Zrušit" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Zavřít" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Zobrazit terminál >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Skrýt terminál" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Informace" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Podrobnosti" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Již není podporováno %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Odstranit %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Odstranit (byl automaticky nainstalován) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Nainstalovat %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Aktualizovat %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Je nutný restart" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" "Pro dokončení přechodu na vyšší verzi systému restartujte počítač" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Restartovat nyní" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1197,11 +1198,11 @@ "Zrušení povýšení může systém uvést do nepoužitelného stavu. Důrazně " "doporučujeme v povýšení pokračovat." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Zrušit povyšování systému?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" @@ -1209,7 +1210,7 @@ msgstr[1] "%li dny" msgstr[2] "%li dní" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" @@ -1217,7 +1218,7 @@ msgstr[1] "%li hodiny" msgstr[2] "%li hodin" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" @@ -1225,7 +1226,7 @@ msgstr[1] "%li minuty" msgstr[2] "%li minut" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1242,7 +1243,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1256,14 +1257,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1273,34 +1274,32 @@ "modemem." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Stahování bude s vaším připojením trvat cca %s. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Připravuje se povýšení systému" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Získávají se nové softwarové kanály" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Získávají se nové balíčky" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Instalují se aktualizace" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Probíhá úklid" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1320,7 +1319,7 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." @@ -1328,7 +1327,7 @@ msgstr[1] "%d balíčky budou odstraněny." msgstr[2] "%d balíčků bude odstraněno." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." @@ -1336,7 +1335,7 @@ msgstr[1] "%d nové balíčky budou nainstalovány." msgstr[2] "%d nových balíčků bude nainstalováno." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." @@ -1344,7 +1343,7 @@ msgstr[1] "%d balíčky budou nahrazeny vyšší verzí." msgstr[2] "%d balíčků bude nahrazeno vyšší verzí." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1355,7 +1354,7 @@ "\n" "Bude staženo celkem %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1363,7 +1362,7 @@ "Instalace aktualizací může zabrat až několik hodin. Jakmile bude dokončeno " "stahování, nelze proces ukončit." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1371,16 +1370,16 @@ "Stažení a instalace aktualizací může zabrat až několik hodin. Jakmile bude " "dokončeno stahování, nelze proces ukončit." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Mazání balíků může trvat několik hodin. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Software v tomto počítači je aktuální" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1388,38 +1387,38 @@ "Pro váš systém nejsou k dispozici žádné aktualizace. Přechod na vyšší verzi " "bude nyní zrušen." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Je nutné restartovat počítač" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Přechod na vyšší verzi byl dokončen a nyní je nutné restartovat počítač. " "Chcete jej restartovat nyní?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "ověřit '%(file)s' proti '%(signature)s' " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "rozbaluje se '%s'" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Nelze spustit nástroj pro aktualizaci" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1427,33 +1426,33 @@ "S největší pravděpodobností se jedná o chybu v nástroji pro přechod. " "Nahlaste to prosím jako chybu pomocí příkazu 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Podpis aktualizačního nástroje" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Aktualizační nástroj" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Stahování selhalo" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Stažení aktualizace selhalo. Pravděpodobně je problém se sítí. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Selhalo ověření pravosti" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1461,41 +1460,41 @@ "Ověření pravosti aktualizace selhalo. Může jít o problém se sítí nebo se " "serverem. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Rozbalení selhalo" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" "Rozbalení aktualizace selhalo. Může být problém se sítí nebo se serverem. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Ověření selhalo" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" "Ověření aktualizace selhalo. Může jít o problém se sítí nebo se serverem. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Nelze spustit povýšení systému" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1503,13 +1502,13 @@ "Toto se obvykle stává v pokud je /tmp připojen jako noexec. Prosím připojte /" "tmp bez noexec a spusťte upgrade znovu." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Chybová zpráva zní „%s“." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1522,73 +1521,73 @@ "Váš původní soubor sources.list byl uložen do /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Přerušuje se" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Odrazováno:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Chcete-li pokračovat, stiskněte prosím [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Pokračovat [aN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Podrobnosti [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "a" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Již není podporováno: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Odstranit: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Nainstalovat: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Aktualizovat: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Pokračovat [An] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1655,9 +1654,8 @@ msgstr "Přechod na vyšší verzi distribuce" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Probíhá povýšení Ubuntu na verzi 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Aktualizace Ubuntu na verzi 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1675,84 +1673,85 @@ msgid "Terminal" msgstr "Terminál" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Čekejte prosím, může to chvíli trvat." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Aktualizace je dokončena" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Nebyly nalezeny poznámky k vydání" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Server může být přetížen. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Nelze stáhnout poznámky k vydání" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Zkontrolujte prosím své připojení k internetu." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Přejít na vyšší verzi" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Poznámky k vydání" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Stahují se dodatečné balíčky…" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Soubor %s z %s při %s B/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Soubor %s z %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Otevřít odkaz v prohlížeči" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Kopírovat odkaz do schránky" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Stahuje se %(current)li. souboru z %(total)li rychlostí %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Stahuje se %(current)li. souboru z %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Vaše vydání Ubuntu již není podporováno." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1760,53 +1759,60 @@ "Nebudete dostávat žádné kritické aktualizace ani bezpečnostní záplaty. " "Prosím přejděte na novější verzi Ubuntu." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Informace o přechodu na vyšší verzi" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Nainstalovat" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Název" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Verze %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Nebylo rozpoznáno žádné připojení k síti, tudíž nemůžete stáhnout seznam " "změn." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Stahuje se seznam změn…" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "O_dznačit vše" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "V_ybrat vše" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "Byla vybrána %(count)s aktualizace." +msgstr[1] "Byly vybrány %(count)s aktualizace." +msgstr[2] "Bylo vybráno %(count)s aktualizací." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "Bude staženo %s." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "Aktualizace byla již stažena, ovšem není nainstalována." msgstr[1] "Aktualizace byly již staženy, avšak nejsou nainstalovány." msgstr[2] "Aktualizace byly již staženy, avšak nejsou nainstalovány." @@ -1815,11 +1821,18 @@ msgid "There are no updates to install." msgstr "Nejsou žádné aktualizace k instalaci" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Neznámá velikost stahování." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1827,7 +1840,7 @@ "Není známo kdy byly informace o balíčcích naposledy obnoveny. Klikněte " "prosím na tlačítko 'Zkontrolovat' pro aktualizaci informací." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1837,7 +1850,7 @@ "Klikněte níže na tlačítko „Zkontrolovat“, abyste zkontrolovali nové " "aktualizace softwaru." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1848,7 +1861,7 @@ msgstr[2] "" "Informace o balíčcích byly naposledy aktualizovány před %(days_ago)s dny." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1864,34 +1877,44 @@ "hodinami." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Informace o balících byly naposledy aktualizovány před %s minutami." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Informace o balících byly právě aktualizovány." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Aktualizace softwaru opravují chyby, odstraňují slabá místa v zabezpečení a " +"přinášejí nové funkce." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Mohou být dostupné aktualizace softwaru pro váš počítač." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Vítejte v Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" -msgstr "" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "Tyto aktualizace byly vydány od doby vydání této verze Ubuntu." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Pro tento počítač jsou dostupné aktualizace." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1902,7 +1925,7 @@ "prosím alespoň %s dodatečného místa na „%s“. Vyprázdněte koš a smažte " "dočasné balíčky dřívějších instalací použitím „sudo apt-get clean“." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1910,24 +1933,24 @@ "K dokončení instalace aktualizací je třeba restartovat počítač. Před " "pokračováním si prosím uložte svou práci." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Čtou se informace o balíčcích" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Připojování..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Možná nebudete moci zkontrolovat aktualizace nebo stahovat nové aktualizace." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Nelze zjistit informace o balíčku" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1940,7 +1963,7 @@ "Nahlaste prosím tento problém vůči balíčku „update-manager“ a přiložte " "následující chybovou hlášku:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1952,31 +1975,31 @@ "Nahlaste prosím tuto chybu vůči balíčku „update-manager“ a přiložte " "následující chybovou zprávu:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Nová instalace)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Velikost: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Z verze %(old_version)s na verzi %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Verze %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Přechod na novější vydání není v tuto chvíli možný" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1985,21 +2008,21 @@ "Povýšení na novější vydání nemůže být v současné době provedeno. Zkuste to " "prosím později znovu. Server oznámil: „%s“" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Stahuje se nástroj pro přechod na novější vydání" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Je k dispozici nové vydání Ubuntu „%s“" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Seznam softwaru je poškozen" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -2009,6 +2032,17 @@ "„Synaptic“ nebo nejdříve spusťte v terminálu „sudo apt-get install -f“ pro " "nápravu tohoto problému." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Dostupné nové vydání „%s“." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Zrušit" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Zkontrolovat aktualizace" @@ -2018,22 +2052,18 @@ msgstr "Nainstalovat všechny dostupné aktualizace" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Zrušit" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Seznam změn" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Aktualizace" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Vytváří se seznam aktualizací" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2057,20 +2087,20 @@ " * Neoficiální softwarové balíčky neposkytované od Ubuntu\n" " * Normální změny v předprodukční verzi Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Stahuje se seznam změn" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Ostatní aktualizace (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "Tato aktualizace pochází ze zdroje, který nepodporuje zobrazení změn." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2078,7 +2108,7 @@ "Stažení seznamu změn selhalo. \n" "Zkontrolujte prosím své internetové připojení." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2091,7 +2121,7 @@ "Dostupná verze: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2104,7 +2134,7 @@ "Použijte prosím http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "než budou změny dostupné nebo opakujte akci později." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2117,52 +2147,43 @@ "Použijte prosím http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "dokud nebudou změny dostupné, nebo to zkuste znovu později." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Detekce distribuce selhala" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Během zjišťování, jaký systém používáte, došlo k chybě „%s“." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Důležité bezpečnostní aktualizace" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Doporučené aktualizace" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Navržené aktualizace" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Aktualizace přenesené z novějších verzí distribuce" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Aktualizace distribuce" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Ostatní aktualizace" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Spouští se Správce aktualizací" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Aktualizace softwaru opravují chyby, odstraňují slabá místa v zabezpečení a " -"přinášejí nové funkce." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "Čá_stečné povýšení" @@ -2233,37 +2254,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Aktualizace softwaru" +msgid "Update Manager" +msgstr "Správce aktualizací" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Aktualizace softwaru" +msgid "Starting Update Manager" +msgstr "Spouští se Správce aktualizací" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Přejít na vyšší verzi" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "aktualizace" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Nainstalovat" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Změny" +msgid "updates" +msgstr "aktualizace" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Popis" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Popis aktualizace" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2271,25 +2282,35 @@ "Jste připojeni přes roaming a mohou vám být účtovány poplatky za data " "stažená během této aktualizace." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Jste připojeni přes bezdrátový modem." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Před spuštěním aktualizace je bezpečnější připojit počítač k síťovému " "napájení." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "Na_instalovat aktualizace" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Změny" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Nastavení..." +msgid "Description" +msgstr "Popis" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Nainstalovat" +msgid "Description of update" +msgstr "Popis aktualizace" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Nastavení..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2313,9 +2334,8 @@ msgstr "Odmítli jste přechod na nové Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Přejít na novější vydání můžete později spuštěním Správce aktualizací a " @@ -2329,60 +2349,60 @@ msgid "Show and install available updates" msgstr "Zobrazit a nainstalovat dostupné aktualizace" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Zobrazit verzi a skončit" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Složka, která obsahuje datové soubory" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Zkontrolovat, zda není k dispozici nové vydání Ubuntu" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "Zkontrolovat, zda je možné povýšit systém na nejnovější vývojové vydání" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Povýšit systém za použití poslední navržené verze aktualizačního nástroje" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Při startu nezaměřovat na mapu" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Pokusit se povýšit systém" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Nekontrolovat aktualizace při spouštění" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Otestovat aktualizaci se zabezpečeným prostředím aufs" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Probíhá částečné povýšení systému" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Ukázat popis balíku namísto seznamu změn" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Zkuste povýšit na poslední vydání pomocí aktualizačního systému z $distro-" "proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2392,11 +2412,11 @@ "V současné době je podporováno „desktop“ pro systémy na osobních počítačích " "a „server“ pro systémy na serverech." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Spustit určenou nádstavbu" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2404,11 +2424,11 @@ "Zkontrolovat, jen pokud je k dispozici nové vydání distribuce a výsledek " "oznámit přes kód ukončení" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Probíhá pokus o nalezení nové verze Ubuntu" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2416,68 +2436,68 @@ "Pro informace o přechodu na vyšší verzi prosím navštivte:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Nenalezeno žádné nové vydání" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Dostupné nové vydání „%s“." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Spusťte „do-release-upgrade“ pro povýšení systému na toto vydání." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Přechod na Ubuntu %(version)s k dispozici" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Odmítli jste přechod na Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Přidat ladící výstup" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Ukázat balíky nepodporované na tomto stroji" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Ukázat balíky podporované na tomto stroji" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Ukázat všechny balíky s jejich stavy" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Ukázat všechny balíky v seznamu" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Souhrn stavu podpory '%s':" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "Máte %(num)s balíků (%(percent).1f%%) podporovaných do %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "Máte %(num)s balíků (%(percent).1f%%), které již nelze stahovat." -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "Máte %(num)s balíků (%(percent).1f%%), které jsou nepodporované" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2485,54 +2505,71 @@ "Spusťte s parametry --show-unsupported, --show-supported nebo --show-all " "pro více detailů" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Již nelze stáhnout:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Nepodporováno: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Podporováno do %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Nepodporováno" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Neimplementovaná metoda: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "soubor na disku" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "balíček .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Nainstalovat chybějící balíček." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Balíček %s by měl být nainstalován." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "balíček .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s musí být označeno jako ručně nainstalované." +msgid "%i obsolete entries in the status file" +msgstr "%i zastaralých položek ve stavovém souboru" + +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "Zastaralé záznamy v dpkg status" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "Zastaralé záznamy v dpkg status" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2541,67 +2578,81 @@ "doinstalovat kdelibs5-dev. Více podrobností zjistíte na bugs.launchpad.net, " "chyba #279621" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "%i zastaralých položek ve stavovém souboru" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "Zastaralé záznamy v dpkg status" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "Zastaralé záznamy v dpkg status" +msgid "%s needs to be marked as manually installed." +msgstr "%s musí být označeno jako ručně nainstalované." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Odstranit lilo, neboť grub je taktéž nainstalován. (Více informací v chybě " "#314004.)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Poté co byly aktualizovány informace o balíku, nezbytný balík '%s' nemůže " -#~ "být nalezen, proces hlášení chyby zahájen." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Aktualizace Ubuntu na verzi 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "Byla vybrána %(count)s aktualizace." -#~ msgstr[1] "Byly vybrány %(count)s aktualizace." -#~ msgstr[2] "Bylo vybráno %(count)s aktualizací." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Vítejte v Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." -#~ msgstr "Tyto aktualizace byly vydány od doby vydání této verze Ubuntu." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Pro tento počítač jsou dostupné aktualizace." - -#~ msgid "Update Manager" -#~ msgstr "Správce aktualizací" - -#~ msgid "Starting Update Manager" -#~ msgstr "Spouští se Správce aktualizací" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Jste připojeni přes bezdrátový modem." - -#~ msgid "_Install Updates" -#~ msgstr "Na_instalovat aktualizace" +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." +#~ msgstr "" +#~ "Poté co byly aktualizovány informace o balíku, nezbytný balík '%s' nemůže " +#~ "být nalezen, proces hlášení chyby zahájen." #~ msgid "Your system is up-to-date" #~ msgstr "Váš systém je plně aktualizovaný" @@ -2707,6 +2758,9 @@ #~ "příkazu 'ubuntu-bug update-manager' v terminálu a přiložte soubory z /var/" #~ "log/dist-upgrade/ do chybového hlášení." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Probíhá povýšení Ubuntu na verzi 11.10" + #~ msgid "" #~ "Upgrading the repository information resulted in a invalid file. Please " #~ "report this as a bug using the command 'ubuntu-bug update-manager' in a " diff -Nru update-manager-17.10.11/po/cv.po update-manager-0.156.14.15/po/cv.po --- update-manager-17.10.11/po/cv.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/cv.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2009. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2010-09-27 23:33+0000\n" "Last-Translator: Michael Vogt \n" "Language-Team: Chuvash \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MP" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "" @@ -42,30 +43,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -75,13 +76,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -96,22 +97,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -124,65 +125,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "'%s' lartajmarămăr" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -191,25 +192,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -218,11 +219,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -233,11 +234,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -245,7 +246,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -254,29 +255,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Şĕnetejmerĕmĕr" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -286,28 +287,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -315,11 +316,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -331,16 +332,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -353,11 +354,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -366,34 +367,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -406,23 +407,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -433,32 +434,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -466,33 +467,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -503,26 +504,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Kălar" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -530,37 +531,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -568,79 +569,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -648,16 +649,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -666,7 +667,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -675,11 +676,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -687,11 +688,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -699,11 +700,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -713,71 +714,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -787,27 +788,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "'%s' lartajmarămăr" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -817,7 +818,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -826,26 +827,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -853,147 +854,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Jănăš" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Părahăşla" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Hup" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Tĕplĕnreh" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "%s kălar" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "%s lart" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1001,32 +1002,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1042,7 +1043,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1056,14 +1057,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1071,34 +1072,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1111,28 +1110,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1140,145 +1139,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1286,73 +1285,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Tĕplĕnreh [t]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "ş" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "t" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1410,7 +1409,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1429,164 +1428,180 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Lart" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "%s verssĕ: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1595,34 +1610,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1630,29 +1653,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1661,7 +1684,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1669,58 +1692,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Părahăşla" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1730,22 +1763,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Părahăşla" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1759,26 +1788,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1787,7 +1816,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1796,7 +1825,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1805,47 +1834,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Ytti şĕnetüsem" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1906,57 +1929,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Şĕnet" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "şĕnetüsem" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Lart" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "" +msgid "updates" +msgstr "şĕnetüsem" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Tĕplĕnreh [t]" +msgid "You are connected via a wireless modem." +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +msgid "_Install Updates" +msgstr "_Şĕnetüne lart" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Lart" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -1980,7 +2005,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1992,219 +2017,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "\".deb\" pakkecĕ" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "\".deb\" pakkecĕ" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." +msgid "%i obsolete entries in the status file" +msgstr "" + +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "_Şĕnetüne lart" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" diff -Nru update-manager-17.10.11/po/cy.po update-manager-0.156.14.15/po/cy.po --- update-manager-17.10.11/po/cy.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/cy.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2009. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-12-06 06:42+0000\n" "Last-Translator: Owen Llywelyn \n" "Language-Team: Welsh \n" @@ -21,7 +22,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -29,13 +30,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Gweinydd ar gyfer %s" @@ -43,20 +44,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Prif weinydd" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Gweinyddion addasiedig" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Methu cyfrifo cofnod sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -64,11 +65,11 @@ "Methu cael hyd i ffeiliau pecynnau, efallai mai nid disg Ubuntu yw hwn, " "neu'r math o adeiladaeth anghywir?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Methu ychwanegu'r CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -83,7 +84,7 @@ "Y neges gwall oedd:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Tynnu pecyn mewn cyflwr gwael" @@ -91,7 +92,7 @@ msgstr[2] "Tynnu pecynnau mewn cyflwr gwael" msgstr[3] "Tynnu pecynnau mewn cyflwr gwael" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -119,15 +120,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Efallai bod gormod o lwyth ar y gweinydd" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -136,7 +137,7 @@ "hwn. Trwsia nhw'n gyntaf drwy ddefnyddio synaptic neu apt-get cyn parhau." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -157,27 +158,27 @@ " * Pecynnau meddalwedd answyddogol sydd ddim yn cael eu darparu gan Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Mwy na thebyg mai problem dros dro yw hon, rho gynnig arall arni'n hwyrach." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Methu cyfrifo'r uwchraddiad" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Gwall wrth ddilysu rhai pecynnau" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -187,7 +188,7 @@ "dros dro yw hon. Rho gynnig arni wedyn. Gweler isod am restr o becynnau sydd " "heb eu dilysu." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -195,33 +196,33 @@ "Marciwyd pecyn '%s' ar gyfer ei dynnu ond mae yn rhestr ddu pecynnau i'w " "tynnu." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Marciwyd y pecyn hanfodol '%s' i'w dynnu." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Ceisio gosod fersiwn rhestr ddu '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Methu gosod '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Methu dyfalu pecyn-meta" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -234,15 +235,15 @@ "Ubuntu rwyt ti'n ei rhedeg.\n" " Gosoda un o'r pecynnau uchod yn gyntaf drwy synaptic neu apt-get cyn parhau." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Yn darllen storfa" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Methu cael clo unigryw" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -250,11 +251,11 @@ "Mae hyn fel arfer yn golygu bod rhaglen rheoli pecynnau arall (fel apt-get " "neu aptitude) eisoes yn rhedeg. Mae angen cau'r rhaglen honno'n gyntaf." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Nid yw uwchraddio dros gysylltiad o bell yn cael ei gefnogi" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -268,11 +269,11 @@ "\n" "Bydd yr uwchraddiad yn dod i ben nawr. Tria heb ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Parhau i redeg dan SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -288,11 +289,11 @@ "Os wnei di barhau, bydd daemon ssh yn cychwyn ar borth '%s'.\n" "Wyt ti eisiau parhau?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Cychwyn sshd ychwanegol" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -303,7 +304,7 @@ "borth '%s'. Os fydd rhywbeth yn mynd o'i le wrth redeg ssh bydd modd i ti " "gysylltu drwy'r un ychwanegol.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -312,29 +313,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Methu uwchraddio" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Nid yw uwchraddio o '%s' i '%s' yn cael ei gefnogi gan y rhaglen hon." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Methwyd creu blwch tywod" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Doedd hi ddim yn bosib creu amgylchedd blwch tywod" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Modd blwch tywod" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -344,18 +345,18 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Mae dy osodiad o python wedi llygru. Trwsia'r ddolen symbolig '/usr/bin/" "python' ." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Mae pecyn 'debsig-verify' wedi ei osod" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -365,12 +366,12 @@ "Tynna hwn drwy synaptic neu 'apt-get remove debsig-verify' yn gyntaf a " "rhedeg yr uwchraddiad eto." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -378,11 +379,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Cynnwys diweddariadau mwyaf newydd o'r Rhyngrwyd?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -403,16 +404,16 @@ "Os wyt ti'n ateb 'na' fan hyn, fydd y rhwydwaith ddim yn cael ei ddefnyddio " "o gwbl." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "analluogwyd wrth uwchraddio i %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Heb ganfod drych dilys" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -432,11 +433,11 @@ "Os wnei di ddewis 'Na' bydd yr uwchraddiad yn terfynu." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Creu cronfeydd diofyn" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -449,21 +450,21 @@ "A ddylid ychwanegu cofnod '%s' diofyn? Os wnei di ddewis 'Na' bydd yr " "uwchraddiad yn terfynu." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Gwybodaeth cronfeydd annilys" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Cronfeydd trydydd plaid wedi'u hanalluogi" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -473,7 +474,7 @@ "galluogi eto wedi'r uwchraddiad gyda'r teclyn 'priodweddau-meddalwedd' yn dy " "reolwr pecynnau." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Pecyn mewn cyflwr anghyson" @@ -481,7 +482,7 @@ msgstr[2] "Pecynnau mewn cyflwr anghyson" msgstr[3] "Pecynnau mewn cyflwr anghyson" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -508,11 +509,11 @@ "canfod archif ar eu cyfer. Ailosoda'r pecynnau eto gyda llaw neu eu tynnu " "o'r system." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Gwall wrth ddiweddaru" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -520,13 +521,13 @@ "Digwyddodd gwall wrth ddiweddaru. Problem rhwydwaith sy'n achosi hyn fel " "arfer. Gwiria dy gysylltiad rhwydwaith a cheisio eto." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Dim digon o le disg rhydd" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -540,32 +541,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Cyfrifo'r newidiadau" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Wyt ti eisiau dechrau uwchraddio?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Terfynwyd yr uwchraddiad" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Methu lawrthwytho'r uwchraddiad" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -573,27 +574,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Gwall wrth gyflwyno" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Adfer cyflwr gwreiddiol y system" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Methu gosod yr uwchraddiad" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -601,7 +602,7 @@ "Mae'r uwchraddiad wedi terfynu. Efallai fod cyflwr nad oes modd ei " "ddefnyddio ar dy system. Bydd adferiad yn rhedeg nawr (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -612,7 +613,7 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -620,20 +621,20 @@ "Mae'r uwchraddiad wedi terfynu. Gwiria dy gysylltiad rhyngrwyd neu gyfrwng " "gosod a thrio eto. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Tynnu pecynnau darfodedig?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Cadw" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Tynnu" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -642,37 +643,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Dyw'r dibyniaeth angenrheidiol '%s' ddim wedi ei osod. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Gwirio rheolwr pecynnau" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Methwyd paratoi'r uwchraddiad" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Methwyd paratoi rhagblaen ar gyfer uwchraddio" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -680,68 +681,68 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Diweddaru gwybodaeth cronfeydd" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Gwybodaeth pecyn annilys" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Cyrchu" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Uwchraddio" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Uwchraddiad wedi cwblhau" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "Mae'r uwchraddiad wedi cwblhau ond roedd gwallau yn ystod y broses." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Chwilio am feddalwedd darfodedig" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Uwchraddio'r sytem wedi cwblhau." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Uwchraddiad rhannol wedi cwblhau." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms yn cael ei ddefnyddio" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -751,11 +752,11 @@ "meddalwedd 'evms' yn derbyn cefnogaeth bellach. Diffodda hwn a rhedeg yr " "uwchraddiad eto wedyn." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -763,9 +764,9 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -773,8 +774,8 @@ "Gall uwchraddio leihau effeithiau penbwrdd a pherfformiad gyda gêmau a " "rhaglenni eraill sy'n drwm ar graffeg." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -788,7 +789,7 @@ "\n" "Wyt ti eisiau parhau?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -802,11 +803,11 @@ "\n" "Wyt ti eisiau parhau?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Dim CPU i686" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -818,11 +819,11 @@ "Nid yw'n bosib uwchraddio dy system i fersiwn newydd o Ubuntu gyda'r " "caledwedd hwn." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Dim CPU ARMv6" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -834,11 +835,11 @@ "bod yn gweithio. Nid yw'n bosib uwchraddio dy system i fersiwn newydd o " "Ubuntu gyda'r caledwedd hwn." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Dim init ar gael" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -853,16 +854,16 @@ "\n" "Wyt ti'n siwr dy fod eisiau parhau?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Uwchraddiad bocs tywod yn defnyddio aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Defnyddia'r llwybr roddwyd i chwilio am cdrom gyda phecynnau uwchraddio" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -870,58 +871,58 @@ "Defnyddio blaen. Ar gael ar hyn o bryd: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Perfformio uwchraddiad rhannol yn unig (dim ailysgrifennu sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Analluogi cefnogaeth sgrin GNU" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Gosod datadir" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Rho '%s' mewn i yrriant '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Wedi gorffen cyrchu" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Yn cyrchu ffeil %li o %li ar %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Tua %s yn weddill" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Yn cyrchu ffeil %li o %li" @@ -931,27 +932,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Yn gweithredu newidiadau" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "problemau dibyniaeth - yn gadael heb ei gyflunio" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Methu gosod '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -963,7 +964,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -974,7 +975,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -982,20 +983,20 @@ "Fe fyddi di'n colli unrhyw newidiadau wnaed i'r ffeil cyfluniad yma os wyt " "ti'n ei amnewid am fersiwn mwy newydd." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Methwyd canfod gorchymyn 'diff'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Digwyddodd gwall marwol" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1007,13 +1008,13 @@ "dy adroddiad. Mae'r uwchraddiad wedi terfynu.\n" "Cadwyd dy sources.list gwreiddiol yn /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Gwasgwyd Ctrl-c" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1022,134 +1023,134 @@ "ti'n siwr dy fod eisiau gwneud hyn?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "Cau pob rhaglen a dogfen i osgoi colli data." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Ddim yn derbyn cefnogaeth Canonical bellach (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Israddio (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Tynnu (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Dim angen rhagor (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Gosod (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Uwchraddio (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Newid Cyfrwng" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Dangos Gwahaniaeth >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Cuddio Gwahaniaeth" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Gwall" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Canslo" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Cau" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Dangos Terfynell >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Cuddio Terfynell" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Gwybodaeth" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Manylion" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Ddim bellach yn cefnogi %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Tynnu %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Tynnu (wedi ei osod yn awtomatig) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Gosod %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Uwchraddio %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Angen ailgychwyn" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Ailgychwyn y system i gwblhau'r uwchraddiad" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Ailgychwyn Nawr" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1161,11 +1162,11 @@ "Efallai na fydd modd defnyddio'r system os wnei di ganslo'r uwchraddiad. " "Cynghorir ti yn gryf i ailgychwyn yr uwchraddiad." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Canslo Uwchraddiad?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" @@ -1174,7 +1175,7 @@ msgstr[2] "%li diwrnod" msgstr[3] "%li diwrnod" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" @@ -1183,7 +1184,7 @@ msgstr[2] "%li awr" msgstr[3] "%li awr" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" @@ -1192,7 +1193,7 @@ msgstr[2] "%li munud" msgstr[3] "%li munud" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1210,7 +1211,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1224,14 +1225,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1241,34 +1242,32 @@ "modem 56k." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Bydd lawrlwytho yn cymrud tua %s gyda dy gysylltiad di. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Paratoi i uwchraddio" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Cyrchu sianeli meddalwedd newydd" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Cyrchu pecynnau newydd" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Gosod yr uwchraddiad" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Yn glanhau" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1291,7 +1290,7 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." @@ -1300,7 +1299,7 @@ msgstr[2] "Mae %d o becynnau yn mynd i gael eu tynnu." msgstr[3] "Mae %d o becynnau yn mynd i gael eu tynnu." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." @@ -1309,7 +1308,7 @@ msgstr[2] "Bydd %d o becynnau newydd yn cael eu gosod." msgstr[3] "Bydd %d o becynnau newydd yn cael eu gosod." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." @@ -1318,7 +1317,7 @@ msgstr[2] "Bydd %d o becynnau yn cael eu huwchraddio." msgstr[3] "Bydd %d o becynnau yn cael eu huwchraddio." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1329,28 +1328,28 @@ "\n" "Rwyt ti wedi lawrlwytho cyfanswm o %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1358,70 +1357,70 @@ "Does dim uwchraddiad ar gael ar gyfer dy system. Bydd yr uwchraddiad yn cael " "ei ganslo." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Angen ailgychwyn" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Mae'r uwchraddiad wedi gorffen ac mae angen ailgychwyn. Wyt ti eisiau gwneud " "hyn nawr?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Methu rhedeg y teclyn uwchraddio" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Llofnod teclyn uwchraddio" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Teclyn uwchraddio" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Methwyd cyrchu" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Methwyd cyrchu'r uwchraddiad. Efallai bod problem rhwydwaith. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Methwyd dilysu" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1429,13 +1428,13 @@ "Methwyd cadarnhau dilysrwydd yr uwchraddiad. Efallai bod problem gyda'r " "rhwydwaith neu'r gweinydd. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Methwyd echdynnu" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1443,13 +1442,13 @@ "Methwyd echdynnu'r uwchraddiad. Efallai bod problem gyda'r rhwydwaith neu'r " "gweinydd. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Methwyd dilysu" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1457,27 +1456,27 @@ "Methwyd dilysu'r uwchraddiad. Efallai bod problem gyda'r rhwydwaith neu'r " "gweinydd. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Methu rhedeg yr uwchraddiad" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Y neges gwall yw '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1488,73 +1487,73 @@ "a /var/log/dist-upgrade/apt.log yn dy adroddiad. Terfynwyd yr uwchraddiad.\n" "Cadwyd y ffeil sources.list gwreiddiol yn /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Yn terfynu" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Diraddiwyd:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Parhau [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Manylion [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "i" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "m" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Ddim yn derbyn cefnogaeth bellach: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Tynnu: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Gosod: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Uwchraddio: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Parhau [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1621,7 +1620,7 @@ msgstr "Uwchraddio Dosbarthiad" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1640,154 +1639,168 @@ msgid "Terminal" msgstr "Terfynell" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Bydd yn amyneddgar, gall hyn gymryd amser." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Uwchraddiad wedi cwblhau" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Methu canfod nodiadau rhyddhau" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Gall fod pwysau ar y gweinydd. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Methu lawrlwytho'r nodiadau rhyddhau" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Gwiria dy gysylltiad rhyngrwyd." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Uwchraddio" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Nodiadau Ryddhau" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Lawrlwytho ffeiliau pecynnau ychwanegol..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Ffeil %s o %s ar %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Ffeil %s o %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Agor Dolen Mewn Porwr" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Copio Dolen i'r Clipfwrdd" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Lawrlwytho ffeil %(current)li o %(total)li gyda %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Lawrlwytho ffeil %(current)li o %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Nid yw dy fersiwn o Ubuntu'n derbyn cefnogaeth bellach." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Gwybodaeth diweddaru" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Gosod" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Fersiwn %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Lawrlwytho rhestr o newidiadau..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s diweddariad wedi ei ddewis." +msgstr[1] "%(count)s diweddariad wedi eu dewis." +msgstr[2] "%(count)s diweddariad wedi eu dewis." +msgstr[3] "%(count)s diweddariad wedi eu dewis." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "Bydd %s yn cael ei lawrlwytho." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "Mae'r diweddariad wedi cael ei lawrlwytho, ond heb gael ei osod." -msgstr[1] "Mae'r diweddariadau wedi cael eu lawrlwytho, ond heb gael eu gosod." -msgstr[2] "Mae'r diweddariadau wedi cael eu lawrlwytho, ond heb gael eu gosod." -msgstr[3] "Mae'r diweddariadau wedi cael eu lawrlwytho, ond heb gael eu gosod." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Maint lawrlwythiad anhysbys." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1796,7 +1809,7 @@ "Diweddarwyd gwybodaeth am y pecynnau %(days_ago)s dydd yn ôl.\n" "Clicia botwm 'Gwirio' isod i wirio am ddiweddariadau meddalwedd newydd." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1805,7 +1818,7 @@ msgstr[2] "Diweddarwyd gwybodaeth am y pecynnau %(days_ago)s dydd yn ôl." msgstr[3] "Diweddarwyd gwybodaeth am y pecynnau %(days_ago)s dydd l.yn ô" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1816,34 +1829,44 @@ msgstr[3] "Diweddarwyd gwybodaeth am y pecynnau %(hours_ago)s awr yn ôl." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Mae diweddariadau meddalwedd yn trwsio gwallau, cael gwared ar fylchau " +"diogelwch, ac yn cynnig nodweddion newydd." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Efallai bod diweddariadau meddalwedd ar gael ar gyfer dy gyfrifiadur." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Croeso i Ubuntu" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1854,7 +1877,7 @@ "Bydd angen rhyddhau %s o le ar ddisg '%s'. Gwagia'r sbwriel, a thynnu " "pecynnau dros dro fersiynau blaenorol drwy ddefnyddio 'sudo apt-get clean'." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1862,23 +1885,23 @@ "Mae angen ailgychwyn y cyfrifiadur i orffen gosod diweddariadau. Cofia gadw " "dy waith cyn parhau." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Darllen gwybodaeth pecynnau" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Cysylltu ..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "Efallai na fydd modd i ti wirio am ddiweddariadau na'u lawrlwytho." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Methu cychwyn y gwybodaeth pecynnau" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1892,7 +1915,7 @@ "Adrodda hwn fel chwilen yn erbyn pecyn 'update-manager' a chynnwys y neges " "gwall canlynol:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1904,31 +1927,31 @@ "Adrodda hwn fel chwilen yn erbyn pecyn 'update-manager' a chynnwys y neges " "gwall canlynol:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Gosod o'r newydd)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Maint: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "O fersiwn %(old_version)s i %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Fersiwn %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Uwchraddiad fersiwn ddim yn bosib ar hyn o bryd" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1937,21 +1960,21 @@ "Nid yw'n bosib uwchraddio'r fersiwn ar hyn o bryd, tria eto yn nes ymlaen. " "Adroddodd y gweinydd: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Lawrlwytho'r teclyn uwchraddio fersiwn" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Mae fersiwn newydd '%s' o Ubuntu ar gael" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Mynegai meddalwedd wedi torri" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1961,6 +1984,17 @@ "\"Synaptic\" neu redeg \"sudo apt-get install -f\" mewn terfynell i drwsio'r " "broblem." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Fersiwn newydd '%s' ar gael." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Canslo" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1970,22 +2004,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Canslo" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Creu Rhestr Diweddariadau" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2009,20 +2039,20 @@ " * Pecynnau meddalwedd answyddogol sydd ddim yn cael eu darparu gan Ubuntu\n" " * Newidiadau normal o fersiwn cyn rhyddhau o Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Lawrlwytho log newid" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Diweddariadau eraill (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2030,7 +2060,7 @@ "Methwyd lawrlwytho rhestr newidiadau. \n" "Gwiria dy gysylltiad rhyngrwyd." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2039,7 +2069,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2052,7 +2082,7 @@ "Defnyddia http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "tan fod y newidiadau ar gael neu tria eto yn nes ymlaen." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2065,52 +2095,43 @@ "Defnyddia http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "tan ei fod ar gael neu tria eto yn nes ymlaen." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Methwyd canfod fersiwn" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Digwyddodd gwall '%s' wrth wirio pa system rwyt ti'n defnyddio." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Diweddariadau diogelwch pwysig" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Diweddariadau sy'n cael eu hargymell" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Diweddariadau a gynigir" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Ol ddiweddariadau" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Diweddariadau fersiwn" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Diweddariadau eraill" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Cychwyn Rheolwr Diweddariadau" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Mae diweddariadau meddalwedd yn trwsio gwallau, cael gwared ar fylchau " -"diogelwch, ac yn cynnig nodweddion newydd." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Uwchraddiad Rhannol" @@ -2181,59 +2202,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Diweddariadau Meddalwedd" +msgid "Update Manager" +msgstr "Rheolwr Diweddariadau" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Diweddariadau Meddalwedd" +msgid "Starting Update Manager" +msgstr "Cychwyn Rheolwr Diweddariadau" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "Uwchraddio" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "diweddariadau" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Gosod" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Newidiadau" +msgid "updates" +msgstr "diweddariadau" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Disgrifiad" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Disgrifiad o'r diweddariad" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "Mae'n fwy diogel cysylltu'r cyfrifiadur i bwer AC cyn diweddaru." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Gosod diweddariadau" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Newidiadau" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "" +msgid "Description" +msgstr "Disgrifiad" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Gosod" +msgid "Description of update" +msgstr "Disgrifiad o'r diweddariad" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2256,9 +2277,8 @@ msgstr "Rwyt ti wedi penderfynu peidio uwchraddio i'r Ubuntu newydd" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Galli di uwchraddio rhywbryd eto drwy agor y Rheolwr Diweddariadau a chlicio " @@ -2272,58 +2292,58 @@ msgid "Show and install available updates" msgstr "Dangos a gosod diweddariadau sydd ar gael" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Dangos fersiwn a gadael" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Cyfeiriadur sy'n cynnwys y ffeiliau data" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Gwirio i weld os oes fersiwn newydd o Ubuntu ar gael" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "Gwirio i weld os yw'n bosib uwchraddio i'r fersiwn datblygol diweddaraf" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Uwchraddio drwy ddefnyddio'r fersiwn diweddaraf o'r uwchraddiwr fersiwn" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Peidio canolbwyntio ar map wrth gychwyn" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Ceisio rhedeg dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Profi uwchraddiad gyda throshaeniad blwch tywod aufs" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Yn rhedeg uwchraddiad rhannol" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "Ceisio uwchraddio i'r fersiwn diweddaraf o $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2333,11 +2353,11 @@ "Ar hyn o bryd mae 'desktop' ar gyfer uwchraddio system penbwrdd arferol a " "'server' ar gyfer systemau gweinydd yn cael eu cefnogi." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2345,11 +2365,11 @@ "Gwirio dim ond os oes fersiwn newydd ar gael ac adrodd y canlyniad drwy'r " "cod gadael" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2357,165 +2377,209 @@ "Am wybodaeth am uwchraddio, cer i:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Dim fersiwn newydd wedi ei ganfod" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Fersiwn newydd '%s' ar gael." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Rheda 'do-release-upgrade' i uwchraddio i hwn." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Uwchraddiad i Ubuntu %(version)s Ar Gael" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Rwyt ti wedi penderfynu peidio uwchraddio i Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Dull heb ei weithredu: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Ffeil ar ddisg" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "pecyn .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Gosod pecyn sydd ar goll." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "pecyn .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s diweddariad wedi ei ddewis." -#~ msgstr[1] "%(count)s diweddariad wedi eu dewis." -#~ msgstr[2] "%(count)s diweddariad wedi eu dewis." -#~ msgstr[3] "%(count)s diweddariad wedi eu dewis." - -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" - -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Croeso i Ubuntu" - -#~ msgid "Update Manager" -#~ msgstr "Rheolwr Diweddariadau" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "Starting Update Manager" -#~ msgstr "Cychwyn Rheolwr Diweddariadau" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "_Gosod diweddariadau" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" #~ "This upgrade is running in sandbox (test) mode. All changes are written " @@ -2549,6 +2613,16 @@ #~ msgid "There are no updates to install" #~ msgstr "Does dim diweddariadau i'w gosod" +#~ msgid "The update has already been downloaded, but not installed" +#~ msgid_plural "The updates have already been downloaded, but not installed" +#~ msgstr[0] "Mae'r diweddariad wedi cael ei lawrlwytho, ond heb gael ei osod." +#~ msgstr[1] "" +#~ "Mae'r diweddariadau wedi cael eu lawrlwytho, ond heb gael eu gosod." +#~ msgstr[2] "" +#~ "Mae'r diweddariadau wedi cael eu lawrlwytho, ond heb gael eu gosod." +#~ msgstr[3] "" +#~ "Mae'r diweddariadau wedi cael eu lawrlwytho, ond heb gael eu gosod." + #~ msgid "Software updates are available for this computer" #~ msgstr "Mae diweddariadau meddalwedd ar gael ar gyfer y cyfrifiadur hwn." diff -Nru update-manager-17.10.11/po/da.po update-manager-0.156.14.15/po/da.po --- update-manager-17.10.11/po/da.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/da.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # Anders Jenbo , 2009. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-04-13 00:54+0000\n" "Last-Translator: Anders Feder \n" "Language-Team: Danish \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Server for %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Hovedserver" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Brugerdefinerede servere" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Kunne ikke beregne sources.list-linje" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Kunne ikke finde nogen pakkefiler, måske er dette ikke en Ubuntu-disk eller " "også er det en forkert arkitektur?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Kunne ikke tilføje cd" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,13 +83,13 @@ "Fejlmeddelelsen var:\n" "\"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Fjern pakke som er i en dårlig tilstand" msgstr[1] "Fjern pakker som er i en dårlig tilstand" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -107,15 +108,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Serveren er muligvis overbelastet" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Ødelagte pakker" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -124,7 +125,7 @@ "program. Reparér dem venligst med synaptic eller apt-get før du fortsætter." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -145,11 +146,11 @@ " * Bruger uofficielle software-pakker, der ikke leveres af Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Dette er højst sandsynligt et forbigående problem, prøv igen senere." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -157,16 +158,16 @@ "Hvis intet af dette passer, så indrapporter venligst denne fejl. Dette kan " "gøres ved at køre kommandoen \"ubuntu-bug update-manager\" i en terminal." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Kunne ikke beregne opgraderingen" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Fejl ved godkendelse af nogle pakker" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -176,7 +177,7 @@ "med netværket. Det anbefales, at du prøver igen senere. Se længere nede " "listen over pakker som ikke kunne godkendes." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -184,22 +185,22 @@ "Pakken \"%s\" er markeret til fjernelse, men den er i listen over pakker, " "der ikke må fjernes." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Den nødvendige pakke \"%s\" er markeret til fjernelse." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Forsøger at installere sortlistet version \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Kan ikke installere \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -208,11 +209,11 @@ "fejl ved hjælp af \"ubuntu-bug update-manager\" i en terminal." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Kan ikke gætte meta-pakke" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -227,15 +228,15 @@ "Installér venligst en af ovenfor nævnte pakker ved hjælp af synaptic eller " "apt-get, før du fortsætter." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Læser cache" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Kan ikke opnå eksklusiv lås" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -243,11 +244,11 @@ "Det skyldes sandsynligvis, at et andet pakkehåndterings-program (såsom apt-" "get eller aptitude) allerede kører. Luk venligst det program først." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Opgradering over fjernforbindelse er ikke understøttet" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -261,11 +262,11 @@ "\n" "Opgraderingen vil afbryde nu. Prøv uden ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Forsæt med at køre over SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -282,11 +283,11 @@ "\"\n" "Vil du fortsætte?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Starter ekstra sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -297,7 +298,7 @@ "blive startet på port \"%s\". Hvis noget går galt med den kørende ssh, kan " "du stadig forbinde til den ekstra.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -310,30 +311,30 @@ "blive gjort automatisk. Du kan åbne porten med f.eks.:\n" "\"%s\"" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Kan ikke opgradere" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" "En opgradering fra \"%s\" til \"%s\" er ikke understøttet med dette værktøj." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Testopsætning mislykkedes" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Det var ikke muligt at oprette testmiljøet." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Testtilstand" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -348,18 +349,18 @@ "*Ingen* ændringer, der skrives til et systemkatalog fra nu af og indtil " "næste genstart, er permanente." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Din python-installation er beskadiget. Ret venligst det symbolske link i \"/" "usr/bin/python\"." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Pakken \"debsig-verify\" er installeret" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -369,12 +370,12 @@ "Fjern den først med synaptic eller \"apt-get remove debsig-verify\" og kør " "så opgraderingen igen." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Kan ikke skrive til \"%s\"" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -385,11 +386,11 @@ "Opgraderingen kan ikke fortsætte.\n" "Kontrollér venligst der kan skrives til systemkataloget." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Inkludér de seneste opdateringer fra internettet?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -409,16 +410,16 @@ "de nyeste opdateringer snarest efter opgradering.\n" "Hvis du svarer \"nej\" her, benyttes netværket slet ikke." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "slået fra under opgradering til %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Ingen gyldige kilder fundet" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -438,11 +439,11 @@ "Hvis du vælger \"Nej\" annulleres opgraderingen." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Generér standardkilder?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -456,11 +457,11 @@ "Skal standardværdier for \"%s\" tilføjes? Hvis du vælger \"Nej\", annulleres " "opgraderingen." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Arkivinformation ugyldig" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -468,11 +469,11 @@ "Opgradering af arkivinformationerne resulterede i en ugyldig fil, så der " "startes nu en fejlrapporteringsproces." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Trediepartskilder er fravalgt" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -482,13 +483,13 @@ "genaktivere dem efter opgraderingen med værktøjet \"Softwarekilder\" eller " "med pakkehåndtering." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Pakke i inkonsistent tilstand" msgstr[1] "Pakker i inkonsistent tilstand" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -507,11 +508,11 @@ "fundet et tilhørende arkiv. Geninstallér venligst pakkerne manuelt eller " "fjern dem fra systemet." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Fejl under opdatering" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -519,13 +520,13 @@ "En fejl forekom under opdateringen. Dette skyldes som regel et " "netværksproblem, kontrollér venligst din netværksforbindelse og prøv igen." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Der er ikke nok fri diskplads" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -540,21 +541,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Udregner ændringerne" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Vil du starte opgraderingen?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Opgradering annulleret" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -563,12 +564,12 @@ "systemet vil blive gendannet. Du kan genoptage opgraderingen på et senere " "tidspunkt." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Kunne ikke hente opgraderingerne" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -579,27 +580,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Fejl under gennemførelse" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Genskaber oprindelig systemtilstand" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Kunne ikke installere opgraderingerne" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -607,7 +608,7 @@ "Opgraderingen er blevet afbrudt. Dit system kan være ude af stand til at " "starte. Der vil nu blive kørt en genoprettelse (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -624,7 +625,7 @@ "upgrade/ til rapporten.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -632,20 +633,20 @@ "Opgraderingen er blevet afbrudt. Kontroller venligst din internetforbindelse " "og installationsmedie og prøv igen. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Fjern forældede pakker?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Behold" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Fjern" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -655,27 +656,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Påkrævede afhængigheder er ikke installeret" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Den påkrævede afhængighed \"%s\" er ikke installeret. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Kontrollerer pakkehåndtering" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Klargøring af opgraderingen fejlede" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -683,11 +684,11 @@ "Forberedelse af systemet til opgradering mislykkedes, så der startes nu en " "fejlrapporteringsproces." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Hentning af opgraderingsforudsætninger fejlede" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -699,69 +700,69 @@ "\n" "Der ud over startes en fejlrapporteringsproces." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Opdaterer arkivinformation" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Fejl under tilføjelse af cd-rom" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Beklager, tilføjelse af cd-rom'en mislykkedes." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Ugyldig pakkeinformation" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Henter" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Opgraderer" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Opgradering gennemført" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "Opgraderingen er afsluttet, men der opstod fejl under opgraderingsprocessen." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Søger efter forældet software" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Systemopgradering er fuldført." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Den delvise opgradering er færdig." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms er i brug" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -771,12 +772,12 @@ "softwaren understøttes ikke længere. Slå den venligst fra og kør " "opgraderingen igen, når dette er gjort." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "Din grafikhardware understøttes muligvis ikke fuldt ud i Ubuntu 12.04 LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -788,9 +789,9 @@ "findes på https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx . Vil " "du fortsætte med opgraderingen?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -798,8 +799,8 @@ "Opgradering kan reducere skrivebordseffekter, ydelse i spil og " "grafikintensive programmer." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -813,7 +814,7 @@ "\n" "Vil du fortsætte?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -827,11 +828,11 @@ "\n" "Vil du fortsætte?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Ikke en i686 cpu" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -843,11 +844,11 @@ "Det er ikke muligt at opgradere dit system til en nyere udgave af Ubuntu med " "denne hardware." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Ingen ARMv6 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -859,11 +860,11 @@ "minimale arkitektur. Det er ikke muligt at opgradere dit system til en ny " "Ubuntu-udgave med denne hardware." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Ingen tilgængelig init" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -878,16 +879,16 @@ "\n" "Er du sikker på at du vil fortsætte?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Kør opgraderingen i et lukket miljø via aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Brug den angivne sti til at søge efter en cdrom med pakker der kan opgraderes" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -895,57 +896,57 @@ "Brug brugerinterface. Tilgængelige i øjeblikket: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*UDFASET* dette valg vil blive ignoreret" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "Udfør kun en delvis opgradering (ingen genskrivning af sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Slå understøttelse af GNU screen fra." -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Indstil datamappe" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Indsæt venligst \"%s\" i drevet \"%s\"" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Hentning er gennemført" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Henter fil %li ud af %li ved %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Omkring %s tilbage" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Henter fil %li af %li" @@ -955,27 +956,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Udfører ændringer" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "afhængighedsproblemer - forlader ukonfigureret" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Kunne ikke installere \"%s\"" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -987,7 +988,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -998,7 +999,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1006,20 +1007,20 @@ "Du mister alle ændringer, du har lavet til denne konfigurationsfil, hvis du " "vælger at erstatte den med en nyere udgave." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Kommandoen \"diff\" blev ikke fundet" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "En alvorlig fejl opstod" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1031,13 +1032,13 @@ "apt.log i din rapport. Opgraderingen er blevet afbrudt.\n" "Din originale sources.list blev gemt i /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c trykket" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1046,134 +1047,134 @@ "tilstand. Er du sikker på at du vil gøre det?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "Luk alle åbne programmer og dokumenter for at undgå tab af data." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Ikke længere understøttet af Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Nedgrader (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Fjern (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Ikke længere nødvendig (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Installér (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Opgrader (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Medieskift" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Vis forskel >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Skjul forskel" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Fejl" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Annullér" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Luk" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Vis terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Skjul terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Oplysninger" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Detaljer" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Ikke længere understøttet %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Fjern %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Fjern (var installeret automatisk) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Installér %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Opgradér %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Genstart påkrævet" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Genstart systemet for at fuldføre opgraderingen" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Genstart nu" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1185,32 +1186,32 @@ "Systemet kan ende i en ubrugelig tilstand, hvis du annullerer opgraderingen. " "Du opfordres kraftigt til at genoptage opgraderingen." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Afbryd Opgradering?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li dag" msgstr[1] "%li dage" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li time" msgstr[1] "%li timer" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minut" msgstr[1] "%li minutter" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1226,7 +1227,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1240,14 +1241,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1257,34 +1258,32 @@ "%s med et 56k modem." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Denne overførsel vil tage omkring %s med din forbindelse. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Gør klar til opgradering" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Indhenter nye softwarekanaler" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Henter nye pakker" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Installerer opgraderingerne" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Rydder op" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1301,28 +1300,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d pakke vil blive fjernet." msgstr[1] "%d pakker vil blive fjernet." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d ny pakke vil blive installeret." msgstr[1] "%d nye pakker vil blive installeret." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d pakke vil blive opgraderet." msgstr[1] "%d pakker vil blive opgraderet." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1333,7 +1332,7 @@ "\n" "Du skal i alt hente %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1341,7 +1340,7 @@ "Det kan tage flere timer at installere opgraderingen. Når først filerne er " "hentet, kan processen ikke afbrydes." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1349,16 +1348,16 @@ "Det kan tage flere timer at hente og installere opgraderingen. Når først " "filerne er hentet, kan processen ikke afbrydes." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Det kan tage flere timer at fjerne pakkerne. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Softwaren på denne computer er fuldt opdateret." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1366,38 +1365,38 @@ "Der er ingen opgraderinger tilgængelige for dit system. Opgraderingen vil nu " "blive afbrudt." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Genstart af maskinen er påkrævet" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Opgraderingen er afsluttet og et genstart af maskinen er påkrævet. Vil du " "gøre dette nu?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "godkend '%(file)s' mod '%(signature)s' " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "pakker \"%s\" ud" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Kunne ikke køre opgraderingsværktøjet" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1405,34 +1404,34 @@ "Dette er højst sandsynligt en fejl i opgraderingsværktøjet. Rapportér den " "venligst som en fejl med kommandoen 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Opgradér værkstøjets signatur" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Opgraderingsværktøj" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Fejl ved hentning" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "Hentning af opgraderingen fejlede. Dette kan skyldes et netværksproblem. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Godkendelse mislykkedes" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1440,13 +1439,13 @@ "Godkendelse af opgraderingen fejlede. Der er muligvis et problem med " "netværket eller med serveren. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Fejl ved udpakning" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1454,13 +1453,13 @@ "Udpakning af opgraderingen fejlede. Dette kan skyldes et problem med " "netværket eller med serveren. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Verifikation mislykkedes" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1468,15 +1467,15 @@ "Efterprøvning af opgraderingen fejlede. Det skyldes muligvis et problem med " "netværket eller serveren. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Kan ikke køre opgraderingen" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1484,13 +1483,13 @@ "Dette er normalt forårsaget af et system hvor /tmp er monteret noexec. " "Montér venligst uden noexec og kør opgraderingen igen." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Fejlmeddelelsen er \"%s\"." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1502,73 +1501,73 @@ "Opgraderingen er blevet afbrudt.\n" "Din originale sources.list blev gemt i /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Afbryder" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Nedgraderede:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Tryk [ENTER] for at fortsætte" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Fortsæt [jN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Detaljer [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "j" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Ikke længere understøttet %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Fjern: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Installér: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Opgradér: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Fortsæt [Jn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1635,9 +1634,8 @@ msgstr "Distributionsopgradering" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Opgraderer Ubuntu til version 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Opgraderer Ubuntu til version 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1655,84 +1653,85 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Vent venligst, dette kan tage et stykke tid." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Opdatering fuldført" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Kunne ikke finde udgivelsesnoterne" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Serveren kan være overbelastet. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Kunne ikke hente udgivelsesnoterne" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Kontrollér venligst din internetforbindelse." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Opgradér" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Udgivelsesnoter" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Henter yderligere pakkefiler..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Fil %s ud af %s ved %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Fil %s ud af %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Åbn henvisning i browser" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Kopiér henvisning til udklipsholder" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Henter fil %(current)li af %(total)li med %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Henter fil %(current)li af %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Din Ubuntu-udgave understøttes ikke længere." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1740,52 +1739,58 @@ "Du vil ikke modtage nogen yderligere sikkerheds- eller kritiske " "opdateringer. Opgradér venligst til en nyere udgave af Ubuntu." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Opgraderingsinformation" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Installér" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Navn" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Udgave %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Ingen netværksforbindelse fundet. Du kan ikke hente information om ændringer." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Henter listen med ændringer..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Afmarkér alle" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Markér _alt" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s opdatering er blevet valgt." +msgstr[1] "%(count)s opdateringer er blevet valgt." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s vil blive hentet." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "Opdateringen er allerede blevet hentet, men ikke installeret." msgstr[1] "Opdateringerne er allerede blevet hentet, men ikke installeret." @@ -1793,11 +1798,18 @@ msgid "There are no updates to install." msgstr "Der er ingen opdateringer at installere." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Ukendt downloadstørrelse." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1805,7 +1817,7 @@ "Det er uvist hvornår pakkeinformationerne sidst blev opdateret. Klik på " "knappen \"Kontroller\" for at opdatere oplysningerne." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1815,7 +1827,7 @@ "Tryk på knappen \"Kontrollér\" nedenfor, for at søge efter nye " "softwareopdateringer." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1823,7 +1835,7 @@ msgstr[1] "" "Pakkeinformationen blev sidst opdateret for %(days_ago)s dage siden." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1834,34 +1846,45 @@ "Pakkeinformationer blev sidst opdateret for %(hours_ago)s timer siden." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Pakkeinformationerne blev seneste opdateret for ca. %s minutter siden." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Pakkeinformationerne er netop blevet opdateret." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Softwareopdateringer retter fejl, lukker sikkerhedshuller og gør nye " +"funktioner tilgængelige." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Der er muligvis tilgængelige softwareopdateringer til denne computer." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Velkommen til Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Disse softwareopdateringer er blevet udgivet efter denne version af Ubuntu." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Der er softwareopdateringer til denne computer." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1872,7 +1895,7 @@ "plads på \"%s\". Tøm papirkurven og fjern midlertidige pakker fra tidligere " "installationer ved at bruge \"sudo apt-get clean\"." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1880,25 +1903,25 @@ "Computeren kræver en genstart for at færdiggøre installationen af " "opdateringer. Gem venligst dit arbejde før du fortsætter." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Læser pakkeinformation" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Forbinder..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Du vil muligvis ikke kunne søge efter opdateringer eller hente nye " "opdateringer." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Kunne ikke initialisere pakkeinformationen" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1912,7 +1935,7 @@ "Rapportér venligst denne fejl til \"update-manager\"-pakken og inkludér " "følgende fejlmeddelelse:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1925,31 +1948,31 @@ "Rapportér venligst denne fejl til \"update-manager\"-pakken og inkludér " "følgende fejlmeddelelse:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Ny installation)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Størrelse: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Fra udgave %(old_version)s til %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Udgave %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Udgivelsesopgradering er ikke mulig i øjeblikket" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1958,21 +1981,21 @@ "Opgraderingen af udgivelsen kan ikke udføres i øjeblikket. Prøv venligst " "igen senere. Serveren svarede: \"%s\"" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Hent værktøjet til udgivelsesopgraderingen" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Ny Ubuntu-version \"%s\" er tilgængelig" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Softwareindeks er i stykker" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1982,6 +2005,17 @@ "pakkehåndteringsprogrammet \"Synaptic\" eller kør \"sudo apt-get install -f" "\" i en terminal for at ordne dette problem først." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Ny udgivelse \"%s\" tilgængelig." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Annullér" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Søg efter opdateringer" @@ -1991,22 +2025,18 @@ msgstr "Installér alle tilgængelige opdateringer" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Annullér" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Ændringslog" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Opdateringer" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Opbygger opdateringsliste" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2030,21 +2060,21 @@ " * Uofficielle softwarepakker, der ikke leveres af Ubuntu\n" " * Normale ændringer i en udviklingsudgave af Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Henter listen med ændringer" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Andre opdateringer (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" "Denne opdatering kommer ikke fra en kilde, der understøtter ændringslogge." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2052,7 +2082,7 @@ "Fejl ved hentning af ændringslisten.\n" "Kontrollér venligst din internetforbindelse." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2065,7 +2095,7 @@ "Tilgængelige version: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2078,7 +2108,7 @@ "Benyt venligst http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "indtil ændringerne bliver tilgængelige eller prøv igen senere." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2091,53 +2121,44 @@ "Brug http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "indtil ændringerne bliver tilgængelige eller prøv igen senere." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Kunne ikke fastslå distribution" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" "Der opstod en fejl \"%s\", mens det blev undersøgt, hvilket system du bruger." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Vigtige sikkerhedsopdateringer" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Anbefalede opdateringer" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Foreslåede opdateringer" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Tilbageporteringer" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Distributionsopdateringer" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Andre opdateringer" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Starter opdateringshåndtering" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Softwareopdateringer retter fejl, lukker sikkerhedshuller og gør nye " -"funktioner tilgængelige." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Delvis opgradering" @@ -2208,37 +2229,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Softwareopdateringer" +msgid "Update Manager" +msgstr "Opdateringshåndtering" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Softwareopdateringer" +msgid "Starting Update Manager" +msgstr "Starter opdateringshåndtering" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Opgradér" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "opdateringer" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Installér" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Ændringer" +msgid "updates" +msgstr "opdateringer" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Beskrivelse" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Beskrivelse af opdatering" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2246,25 +2257,35 @@ "Du er forbundet via roaming og kan blive takseret for dataforbruget ved " "denne opdatering." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Du er forbundet via et trådløst modem." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Det er sikrere at tilslutte computeren ekstern strømforsyning før " "opdateringen." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Installér opdateringer" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Ændringer" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Opsætning..." +msgid "Description" +msgstr "Beskrivelse" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Installér" +msgid "Description of update" +msgstr "Beskrivelse af opdatering" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Opsætning..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2287,9 +2308,8 @@ msgstr "Du har afslået at opgradere til den nye Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Du kan opgradere på ethvert senere tidspunkt ved at åbne " @@ -2303,60 +2323,60 @@ msgid "Show and install available updates" msgstr "Vis og installér tilgængelige opdateringer" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Vis version og afslut" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Mappe, der indeholder datafilerne" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Kontroller, om der er en ny Ubuntu-udgave tilgængelig" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "Undersøg om det er muligt at opgradere til den seneste udviklerudgivelse" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Opgradér ved brug af den seneste foreslåede udgave af udgivelsesopgradering" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Fokusér ikke på kortet under opstarten" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Forsøg at udføre en distributionsopgradering (dist-upgrade)" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Søg ikke efter opdateringer ved opstart" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Udfør en testopgradering med et aufs-testtilstandslag" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Udfører delvis opgradering" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Vis pakkebeskrivelse frem for ændringslog" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Prøv at opgradere til den seneste udgivelse ved hjælp af " "opgraderingsprogrammet fra $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2366,11 +2386,11 @@ "I øjeblikket understøttes \"desktop\" til almindelig opgradering af en " "hjemmecomputer og \"server\" til servere." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Kør den specificerede brugergrænseflade" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2378,11 +2398,11 @@ "Kontrollér kun om en ny distributionsudgave er tilgængelig, og rapportér " "resultatet via afslutningskoden" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Kontrollerer for ny udgave af Ubuntu" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2390,69 +2410,69 @@ "Se venligst følgende link for opgraderingsinformation:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Ingen ny udgave fundet" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Ny udgivelse \"%s\" tilgængelig." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Kør \"do-release-upgrade\" for at opgradere til den." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Opgradering til Ubuntu %(version)s er tilgængelig" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Du har afslået at opgradere til Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Tilføj fejlsøgningsuddata" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Vis pakker som ikke understøttes på denne maskine" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Vis understøttede pakker på denne maskine" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Vis alle pakker med deres status" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Vis alle pakker som en liste" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Oversigt for understøttelsesstatus for \"%s\":" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" "Du har %(num)s pakker (%(percent).1f%%) som understøttes indtil %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "Du har %(num)s pakker (%(percent).1f%%) som ikke (længere) kan hentes" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "Du har %(num)s pakker (%(percent).1f%%) som ikke understøttes" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2460,123 +2480,153 @@ "Kør med --show-unsupported, --show-supported eller --show-all for at se " "yderligere detaljer" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Kan ikke længere hentes:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Understøttes ikke: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Understøttes indtil %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Understøttes ikke" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Ikke-implementeret handling: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "En fil på disken" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb-pakke" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Installér manglende pakke." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Pakke %s bør installeres." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb-pakke" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s skal være markeret som manuelt installeret." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"Hvis kdelibs4-dev er installeret når der opgraderes, skal kdelibs5-dev " -"installeres. Se bugs.launchpad.net, fejl #279.621 for yderligere oplysninger." - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i forældede emner i statusfilen" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Forældede emner i dpkg-status" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Forældede dpkg-statuslinjer" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"Hvis kdelibs4-dev er installeret når der opgraderes, skal kdelibs5-dev " +"installeres. Se bugs.launchpad.net, fejl #279.621 for yderligere oplysninger." + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s skal være markeret som manuelt installeret." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Fjern lilo, da grub også er installeret. (Se fejl #314004 for yderligere " "oplysninger.)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Efter opdatering af din pakkeinformation kunne den essentielle pakke \"%s" -#~ "\" ikke findes længere. Derfor startes en fejlrapporteringsproces." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Opgraderer Ubuntu til version 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s opdatering er blevet valgt." -#~ msgstr[1] "%(count)s opdateringer er blevet valgt." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Velkommen til Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Disse softwareopdateringer er blevet udgivet efter denne version af " -#~ "Ubuntu." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Der er softwareopdateringer til denne computer." - -#~ msgid "Update Manager" -#~ msgstr "Opdateringshåndtering" - -#~ msgid "Starting Update Manager" -#~ msgstr "Starter opdateringshåndtering" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Du er forbundet via et trådløst modem." - -#~ msgid "_Install Updates" -#~ msgstr "_Installér opdateringer" +#~ "Efter opdatering af din pakkeinformation kunne den essentielle pakke \"%s" +#~ "\" ikke findes længere. Derfor startes en fejlrapporteringsproces." #~ msgid "Checking for a new ubuntu release" #~ msgstr "Undersøg om der er nye Ubuntu-udgivelser" @@ -2641,6 +2691,9 @@ #~ msgid "Your graphics hardware may not be fully supported in Ubuntu 11.04." #~ msgstr "Dit grafikkort er muligvis ikke fuldt understøttet i Ubuntu 11.04." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Opgraderer Ubuntu til version 11.10" + #~ msgid "" #~ "\n" #~ "\n" diff -Nru update-manager-17.10.11/po/de.po update-manager-0.156.14.15/po/de.po --- update-manager-17.10.11/po/de.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/de.po 2017-12-23 05:00:38.000000000 +0000 @@ -5,11 +5,12 @@ # Frank Arnold , 2005. # # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-21 04:49+0000\n" "Last-Translator: Dennis Baudys \n" "Language-Team: German GNOME Translations \n" @@ -22,7 +23,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -30,13 +31,13 @@ msgstr[1] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Server für %s" @@ -44,20 +45,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Hauptserver" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Benutzerdefinierte Server" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Eintrag für sources.list konnte nicht erstellt werden" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -65,11 +66,11 @@ "Es konnten keine Paketdateien gefunden werden, möglicherweise ist dies keine " "Ubuntu-CD oder die falsche Architektur?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Hinzufügen der CD gescheitert" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -85,13 +86,13 @@ "Die Fehlermeldung war:\n" "%s" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Defektes Paket entfernen" msgstr[1] "Defekte Pakete entfernen" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -112,15 +113,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Der Server ist möglicherweise überlastet" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Defekte Pakete" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -130,7 +131,7 @@ "Pakete, bevor Sie fortfahren." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -152,13 +153,13 @@ "Quelle stammen\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Dies ist wahrscheinlich ein vorübergehendes Problem.\n" "Bitte versuchen Sie es zu einem späteren Zeitpunkt erneut." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -166,18 +167,18 @@ "Wenn nichts von dem zutrifft, melden Sie bitte diesen Fehler, indem Sie den " "Befehl »ubuntu-bug update-manager« in ein Terminal eingeben." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" "Es konnte nicht ermittelt werden, welche Systemaktualisierungen verfügbar " "sind" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Fehler bei der Echtheitsprüfung einiger Pakete" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -188,7 +189,7 @@ "späteren Zeitpunkt noch einmal. Unten stehend sehen Sie eine Liste " "derjenigen Pakete, deren Echtheit nicht bestätigt werden konnte." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -196,24 +197,24 @@ "Das Paket »%s« ist zum Löschen vorgesehen, wurde aber durch das System " "gesperrt." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Das unbedingt notwendige Paket »%s« ist zum Löschen vorgesehen." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" "Es wird versucht, die auf der schwarzen Liste stehende Version »%s« zu " "installieren" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "»%s« kann nicht installiert werden" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -223,11 +224,11 @@ "eingeben." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Metapaket konnte nicht bestimmt werden" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -241,15 +242,15 @@ " Bitte installieren Sie eines der oben genannten Pakete über Synaptic oder " "apt-get bevor Sie fortfahren." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Zwischenspeicher wird gelesen" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Kein exklusiver Zugriff möglich" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -258,13 +259,13 @@ "andere Paketverwaltung, wie z.B. Synaptic, apt-get oder aptitude, bereits " "läuft. Bitte beenden Sie zuerst die laufende Anwendung." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" "Die Systemaktualisierung über eine entfernte Verbindung wird nicht " "unterstützt" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -279,11 +280,11 @@ "\n" "Die Systemaktualisierung wird nun beendet. Bitte versuchen Sie es ohne ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Soll die Sitzung über SSH fortgesetzt werden?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -301,11 +302,11 @@ "gestartet.\n" "Sind Sie sicher, dass Sie fortfahren möchten?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Zusätzlicher SSH-Server wird gestartet" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -317,7 +318,7 @@ "dem aktuellen sshd Prozess gibt, können Sie sich mit dem zusätzlichen " "Prozess verbinden.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -330,31 +331,31 @@ "automatisch gemacht. Sie können den Port z.B. so öffnen:\n" "»%s«" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Systemaktualisierung kann nicht durchgeführt werden" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" "Eine Systemaktualisierung von »%s« auf »%s« wird von diesem Werkzeug nicht " "unterstützt." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Einrichten der Sandbox gescheitert" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Die Sandbox-Umgebung konnte nicht erstellt werden." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Sandbox-Modus" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -369,18 +370,18 @@ "*Alle* von jetzt an bis zum nächsten Neustart gemachten Änderungen in System-" "Verzeichnissen – *sind nicht permanent*." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Ihre Python-Installation ist beschädigt. Bitte korrigieren Sie die " "Verknüpfung »/usr/bin/python«." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Das Paket »debsig-verify« ist installiert" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -391,12 +392,12 @@ "Bitte entfernen Sie es zunächst mit Synaptic oder »apt-get remove debsig-" "verify« und starten Sie danach die Systemaktualisierung neu." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Auf »%s« kann nicht geschrieben werden." -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -407,11 +408,11 @@ "ist, in das System-Verzeichnis »%s« zu schreiben.\n" "Stellen Sie bitte sicher, dass das System-Verzeichnis beschreibbar ist." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Die neuesten Aktualisierungen aus dem Internet mit einbeziehen?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -434,16 +435,16 @@ "Falls Sie sich für »Nein« entscheiden, wird auf das Netzwerk nicht " "zugegriffen." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "Bei Aktualisierung zu %s deaktiviert" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Es wurde kein gültiger Spiegelserver gefunden" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -464,11 +465,11 @@ "Wählen Sie hingegen »Nein«, wird die Systemaktualisierung abgebrochen." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Sollen die Standardeinträge für Paketquellen eingetragen werden?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -481,11 +482,11 @@ "Sollen Standardeinträge für »%s« hinzugefügt werden? Wenn Sie »Nein« wählen, " "wird die Systemaktualisierung abgebrochen." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Die Informationen über verfügbare Paketquellen sind ungültig" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -493,11 +494,11 @@ "Das Aktualisieren der Paketquellen-Informationen ließ eine ungültige Datei " "entstehen, weshalb der Fehlermeldevorgang gestartet wird." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Paketquellen von Drittanbietern deaktiviert" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -507,13 +508,13 @@ "nach der Systemaktualisierung mit dem Programm »Software-Paketquellen« oder " "mit Synaptic wieder aktivieren." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Paket in inkonsistentem Zustand" msgstr[1] "Pakete in inkonsistentem Zustand" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -532,11 +533,11 @@ "installiert werden, aber es wurden keine Archive dafür gefunden. Bitte " "installieren Sie die Pakete erneut manuell oder entfernen Sie sie vom System." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Fehler während der Aktualisierung" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -545,13 +546,13 @@ "Netzwerkprobleme zurückzuführen. Bitte überprüfen Sie Ihre " "Netzwerkverbindung und versuchen Sie es erneut." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Nicht genug freier Festplattenspeicher verfügbar" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -567,21 +568,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Änderungen werden berechnet" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Möchten Sie die Systemaktualisierung starten?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Systemaktualisierung abgebrochen" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -590,12 +591,12 @@ "Zustand des Systems wiederhergestellt. Sie können die Systemaktualisierung " "später fortsetzen." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Die Aktualisierungen konnten nicht heruntergeladen werden" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -606,27 +607,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Fehler beim Anwenden" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Ursprünglicher Systemzustand wird wieder hergestellt" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Die Aktualisierungen konnten nicht installiert werden" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -635,7 +636,7 @@ "nicht verwendbaren Zustand befinden. Eine Wiederherstellung wird gestartet " "(dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -652,7 +653,7 @@ "dist-upgrade/ dem Fehlerbericht hinzu.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -660,20 +661,20 @@ "Die Systemaktualisierung wurde abgebrochen. Bitte prüfen Sie Ihre " "Internetverbindung oder Ihr Installationsmedium und versuchen Sie es erneut. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Veraltete Pakete entfernen?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Beibehalten" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Entfernen" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -683,12 +684,12 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" "Die aufgrund von Abhängigkeiten notwendigen Pakete sind nicht installiert." -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" @@ -697,16 +698,16 @@ #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Paketverwaltung wird überprüft" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Vorbereitung der Systemaktualisierung gescheitert" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -714,11 +715,11 @@ "Die Vorbereitung des Systems zur Aktualisierung ist fehlgeschlagen, die " "Fehlerberichterstattung wurde somit gestartet." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Beziehen der Erfordernisse für die Systemaktualisierung gescheitert" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -731,70 +732,70 @@ "\n" "Außerdem wird der Fehlermeldevorgang gestartet." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Informationen zu Paketquellen werden aktualisiert" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "CD-ROM konnte nicht hinzugefügt werden" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Entschuldigung, das Hinzufügen der CD-ROM ist fehlgeschlagen." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Ungültige Paketinformationen" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Herunterladen" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Systemaktualisierung wird durchgeführt" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Systemaktualisierung wurde abgeschlossen" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "Die Systemaktualisierung wurde vollständig abgeschlossen, jedoch traten " "während der Systemaktualisierung Fehler auf." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Es wird nach veralteter Software gesucht" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Die Systemaktualisierung ist abgeschlossen." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Teilweise Systemaktualisierung abgeschlossen." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms ist in Verwendung" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -804,13 +805,13 @@ "Anwendung »evms« wird nicht mehr unterstützt. Bitte schalten Sie »emvs« ab " "und starten Sie die Systemaktualisierung danach erneut." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "Ihre Grafik-Hardware wird möglicherweise nicht vollständig von Ubuntu 12.04 " "LTS unterstützt." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -823,9 +824,9 @@ "X/Bugs/UpdateManagerWarningForI8xx Möchten Sie die Systemaktualisierung " "fortsetzen?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -834,8 +835,8 @@ "und die Geschwindigkeit in Spielen und anderen Grafik-intensiven Anwendungen " "herabsetzen." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -849,7 +850,7 @@ "\n" "Möchten Sie fortfahren?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -863,11 +864,11 @@ "\n" "Möchten Sie fortfahren?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Kein i686-Prozessor vorhanden" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -880,11 +881,11 @@ "Hardware nicht möglich, Ihren Rechner auf eine neue Ubuntu-Version zu " "aktualisieren." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Kein ARMv6-Prozessor" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -896,11 +897,11 @@ "als minimale Architektur erfordern. Es ist nicht möglich, mit dieser " "Hardware Ihr System auf eine neue Ubuntu-Version zu aktualisieren." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Kein init verfügbar" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -916,17 +917,17 @@ "\n" "Sind Sie sicher, dass Sie fortfahren möchten?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Sandbox-Systemaktualisierung mit aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Den angegebenen Pfad benutzen, um nach einer CD-ROM mit aktualisierbaren " "Paketen zu suchen." -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -934,59 +935,59 @@ "Grafische Benutzeroberfläche verwenden. Momentan verfügbar: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*VERALTET* diese Option wird ignoriert" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Nur teilweise Systemaktualisierung durchführen (ohne sources.list erneut zu " "schreiben)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "GNU-Bildschirmunterstützung deaktivieren" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Datenverzeichnis festlegen" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Bitte legen Sie »%s« in das Laufwerk »%s« ein" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Dateien wurden vollständig heruntergeladen" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Datei %li von %li wird mit %sB/s heruntergeladen" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Es verbleiben ungefähr %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Datei %li von %li wird heruntergeladen" @@ -996,27 +997,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Änderungen werden übernommen" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "Abhängigkeitsprobleme - beende unkonfiguriert" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "»%s« konnte nicht installiert werden" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -1029,7 +1030,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1040,7 +1041,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1048,20 +1049,20 @@ "Alle Änderungen an dieser Konfigurationsdatei gehen verloren, wenn Sie diese " "durch eine neuere Version ersetzen." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Das Programm »diff« konnte nicht gefunden werden" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Ein schwerwiegender Fehler ist aufgetreten" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1074,13 +1075,13 @@ "ursprüngliche sources.list wurde unter /etc/apt/sources.list.distUpgrade " "gespeichert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Strg-C wurde gedrückt" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1089,138 +1090,138 @@ "System. Sind Sie sicher, dass Sie das tun möchten?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Schließen Sie bitte alle offenen Anwendungen und Dokumente, um Datenverluste " "zu vermeiden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Nicht mehr von Canonical unterstützt (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Mit älterer Version ersetzen (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Entfernen (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Nicht mehr benötigt (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Installieren (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Aktualisieren (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Medienwechsel" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Unterschiede anzeigen >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Unterschiede ausblenden" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Fehler" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Abbrechen" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Schließen" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Terminal anzeigen >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Terminal ausblenden" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Information" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Details" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Nicht mehr unterstützt (%s)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Entferne %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Entferne (wurde automatisch installiert): %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Installiere %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Aktualisiere %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Neustart erforderlich" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" "Das System zum Abschluss der Systemaktualisierung neu starten" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "Jetzt _neu starten" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1233,32 +1234,32 @@ "Aktualisierung abbrechen. Es wird dringend empfohlen, die " "Systemaktualisierung fortzusetzen." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Systemaktualisierung abbrechen?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li Tag" msgstr[1] "%li Tage" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li Stunde" msgstr[1] "%li Stunden" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li Minute" msgstr[1] "%li Minuten" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1274,7 +1275,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1288,14 +1289,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1305,34 +1306,32 @@ "ungefähr %s mit einem 56K-Modem." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Das Herunterladen wird bei Ihrer Netzwerkverbindung etwa %s dauern. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Systemaktualisierung wird vorbereitet" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Neue Paketquellen werden abgefragt" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Aktualisierungen werden heruntergeladen" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Aktualisierungen werden installiert" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Aufräumen" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1349,28 +1348,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d Paket wird entfernt." msgstr[1] "%d Pakete werden entfernt." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d neues Paket wird installiert." msgstr[1] "%d neue Pakete werden installiert." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d Paket wird aktualisiert." msgstr[1] "%d Pakete werden aktualisiert." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1381,7 +1380,7 @@ "\n" "Insgesamt müssen %s heruntergeladen werden. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1390,7 +1389,7 @@ "Sobald das Herunterladen abgeschlossen wurde, kann der Vorgang nicht " "abgebrochen werden." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1399,16 +1398,16 @@ "Stunden dauern. Sobald das Herunterladen abgeschlossen ist, kann der Vorgang " "nicht mehr abgebrochen werden." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Das Entfernen der Pakete kann mehrere Stunden dauern. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Die Anwendungen auf diesem Rechner sind aktuell." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1416,38 +1415,38 @@ "Es sind keine Aktualisierungen für das System verfügbar. Der Vorgang wird " "nun beendet." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Neustart erforderlich" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Die Systemaktualisierung ist abgeschlossen und ein Neustart ist " "erforderlich. Möchten Sie den Computer jetzt neu starten?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "»%(file)s« wird gegenüber »%(signature)s« legitimiert " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "»%s« wird entpackt" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Die Aktualisierungsanwendung konnte nicht gestartet werden" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1456,35 +1455,35 @@ "Sie dies als Fehler, indem Sie »ubuntu-bug update-manager« in ein Terminal " "eingeben." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Signatur der Aktualisierungsanwendung" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Aktualisierungsanwendung" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Herunterladen gescheitert" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "Das Herunterladen der Systemaktualisierung ist gescheitert. Möglicherweise " "gibt es ein Netzwerkproblem. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Legitimierung gescheitert" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1492,13 +1491,13 @@ "Die Systemaktualisierung konnten nicht auf ihre Echtheit überprüft werden. " "Möglicherweise gibt es Probleme mit dem Netzwerk oder mit dem Server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Entpacken gescheitert" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1506,13 +1505,13 @@ "Die Systemaktualisierung konnte nicht entpackt werden. Möglicherweise gibt " "es ein Problem mit dem Netzwerk oder mit dem Server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Überprüfung gescheitert" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1520,15 +1519,15 @@ "Die Überprüfung der Systemaktualisierung ist gescheitert. Möglicherweise " "gibt es ein Problem mit dem Netzwerk oder mit dem Server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Systemaktualisierung kann nicht durchgeführt werden" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1537,13 +1536,13 @@ "eingehängt ist. Bitte hängen Sie /tmp ohne noexec ein und führen Sie die " "Aktualisierung erneut aus." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Die Fehlermeldung lautet »%s«." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1556,73 +1555,73 @@ "Ihre ursprüngliche sources.list wurde in /etc/apt/sources.list.distUpgrade " "gesichert." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Wird abgebrochen" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Zurückgesetzt:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Um fortzufahren, drücken Sie [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Fortsetzen [j/N] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Details [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "j" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Nicht mehr unterstützt: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "»%s« wird entfernt\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "»%s« wird installiert\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "»%s« wird aktualisiert\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Fortsetzen [J/n] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1691,9 +1690,8 @@ msgstr "Systemaktualisierung" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Aktualisierung von Ubuntu auf Version 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Ubuntu auf Version 12.04 aktualisieren" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1711,84 +1709,85 @@ msgid "Terminal" msgstr "Befehlsfenster" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Bitte warten Sie, dieser Vorgang kann etwas Zeit in Anspruch nehmen." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Die Aktualisierung ist abgeschlossen" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Versionshinweise konnten nicht gefunden werden" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Der Server ist möglicherweise überlastet. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Versionshinweise konnten nicht heruntergeladen werden" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Bitte überprüfen Sie Ihre Internetverbindung." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Systemaktualisierung" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Veröffentlichungshinweise" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Zusätzliche Pakete werden heruntergeladen …" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Datei %s von %s mit %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Datei %s von %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Verweis im Browser öffnen" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Verweis in die Zwischenablage kopieren" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Datei %(current)li von %(total)li wird mit %(speed)s/s heruntergeladen" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Datei %(current)li von %(total)li wird heruntergeladen" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Ihre Ubuntu-Version wird nicht länger unterstützt." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1797,53 +1796,59 @@ "Aktualisierungen mehr bereitgestellt. Bitte steigen Sie auf eine neuere " "Ubuntu-Version um." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Systemaktualisierungsinformationen" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Installieren" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Name" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Es wurde keine Netzwerkverbindung erkannt, Sie können keine " "Änderungsprotokolle herunterladen." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Liste der Änderungen wird heruntergeladen …" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "Auswahl au_fheben" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "_Alles auswählen" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s Aktualisierung ausgewählt." +msgstr[1] "%(count)s Aktualisierungen ausgewählt." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s werden heruntergeladen" #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" "Die Aktualisierung wurde bereits heruntergeladen, aber noch nicht " "installiert." @@ -1856,20 +1861,27 @@ msgstr "" "Es sind keine Aktualisierungen vorhanden, die installiert werden könnten." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Unbekannte Download-Größe" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" "Es ist nicht bekannt, wann die Paketinformationen zuletzt aktualisiert " -"wurden. Bitte klicken Sie auf den Knopf »Prüfen«, um die Informationen " +"wurden. Bitte klicken sie auf den Knopf »Überprüfen«, um die Informationen " "zu aktualisieren." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1879,7 +1891,7 @@ "Klicken Sie unten auf den Knopf »Prüfen«, um nach neuen Aktualisierungen zu " "suchen." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1890,7 +1902,7 @@ "Die Paketinformationen wurden zum letzten Mal vor %(days_ago)s Tagen " "aktualisiert." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1903,34 +1915,46 @@ "aktualisiert." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Die Paketinformationen wurden zuletzt vor %s Minuten aktualisiert." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Die Paketinformationen wurden gerade aktualisiert." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Aktualisierungen beheben Fehler, schließen Sicherheitslücken und stellen " +"neue Funktionen bereit." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Aktualisierungen könnten für Ihren Rechner verfügbar sein." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Willkommen bei Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Diese Aktualisierungen wurden seit Veröffentlichung dieser Ubuntu-Version " +"ausgegeben." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Für diesen Rechner sind Aktualisierungen verfügbar." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1943,7 +1967,7 @@ "beispielsweise den Müll und löschen Sie temporäre Pakete aus früheren " "Installationen mit dem Befehl »sudo apt-get clean«." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1952,25 +1976,25 @@ "Aktualisierungen abzuschließen. Bitte sichern Sie Ihre Arbeiten, bevor Sie " "fortfahren." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Paketinformationen werden gelesen" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Verbindungsaufbau …" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Sie können möglicherweise nicht nach neuen Aktualisierungen suchen oder " "Aktualisierungen herunterladen." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Paketinformationen konnten nicht initialisiert werden" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1984,7 +2008,7 @@ "Bitte melden Sie einen Fehler im Paket »update-manager« und fügen Sie die " "folgende Fehlermeldung an den Fehlerbericht an:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1997,31 +2021,31 @@ "Melden Sie eine Fehler im »update-manager« und fügen Sie die folgende " "Fehlermeldung an den Fehlerbericht an:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Neuinstallation)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Größe: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Von Version: %(old_version)s auf %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Version %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Eine Systemaktualisierung ist momentan nicht möglich" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -2030,21 +2054,21 @@ "Die Systemaktualisierung kann im Moment nicht durchgeführt werden, bitte " "versuchen Sie es später erneut. Server-Meldung: »%s«" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Das Freigabeaktualisierungswerkzeug wird heruntergeladen" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Neue Ubuntu-Version »%s« ist verfügbar" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Das Softwareverzeichnis ist beschädigt" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -2054,6 +2078,17 @@ "Bitte verwenden Sie die Synaptic Paketverwaltung oder führen Sie »sudo apt-" "get install -f« in einer Befehlszeile aus, um dieses Problem zu beheben." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Neue Freigabe »%s« verfügbar." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Abbrechen" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Auf Aktualisierungen prüfen" @@ -2063,22 +2098,18 @@ msgstr "Alle verfügbaren Aktualisierungen installieren" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Abbrechen" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Änderungsprotokoll" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Aktualisierungen" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Aktualisierungsliste wird aufgebaut" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2103,22 +2134,22 @@ " * Inoffizielle Pakete, die nicht von Ubuntu bereitgestellt wurden\n" " * Änderungen in einer Vorabversion von Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Änderungsprotokoll wird heruntergeladen" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Weitere Aktualisierungen (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" "Diese Aktualisierung stammt nicht aus einer Quelle, die Änderungsprotokolle " "unterstützt." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2126,7 +2157,7 @@ "Die Liste der Änderungen konnte nicht heruntergeladen werden. \n" "Bitte überprüfen Sie Ihre Internetverbindung." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2139,7 +2170,7 @@ "Verfügbare Version: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2152,7 +2183,7 @@ "Bitte besuchen Sie http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "bis die Änderungen verfügbar sind oder versuchen Sie es später erneut." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2165,53 +2196,44 @@ "Bitte nutzen Sie http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "bis die Änderungen verfügbar werden oder versuchen Sie es später erneut." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Ermitteln des Systems gescheitert" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" "Ein Fehler »%s« trat bei der Prüfung auf, welches System Sie verwenden." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Wichtige Sicherheitsaktualisierungen" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Empfohlene Aktualisierungen" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Vorgeschlagene Aktualisierungen" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Zurückportierte Aktualisierungen" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Systemaktualisierungen" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Andere Aktualisierungen" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Aktualisierungsverwaltung wird gestartet" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Aktualisierungen beheben Fehler, schließen Sicherheitslücken und stellen " -"neue Funktionen bereit." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "Teilweise Systemaktualisierung _durchführen" @@ -2286,37 +2308,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Aktualisierungen" +msgid "Update Manager" +msgstr "Aktualisierungsverwaltung" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Aktualisierungen" +msgid "Starting Update Manager" +msgstr "Aktualisierungsverwaltung wird gestartet" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Aktualisieren" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "Aktualisierungen" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Installieren" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Änderungen" +msgid "updates" +msgstr "Aktualisierungen" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Beschreibung" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Beschreibung der Aktualisierung" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2324,25 +2336,35 @@ "Sie sind per Roaming verbunden und es werden Ihnen möglicherweise Kosten für " "die Datenübertragung dieser Aktualisierung in Rechnung gestellt." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Sie sind über ein Funkmodem (mobiles Breitband) verbunden." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Es ist sicherer, den Rechner vor der Aktualisierung ans Stromnetz " "anzuschließen." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "Aktualisierungen _installieren" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Änderungen" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Einstellungen …" +msgid "Description" +msgstr "Beschreibung" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Installieren" +msgid "Description of update" +msgstr "Beschreibung der Aktualisierung" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Einstellungen …" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2368,9 +2390,8 @@ "Sie haben die Systemaktualisierung auf eine neue Ubuntu-Veresion abgelehnt" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Sie können die Systemaktualisierung zu einem späteren Zeitpunkt durchführen, " @@ -2385,61 +2406,61 @@ msgid "Show and install available updates" msgstr "Verfügbare Aktualisierungen anzeigen und installieren" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Version anzeigen und Programm schließen" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Verzeichnis, das die Datendateien enthält" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Auf Verfügbarkeit einer neuen Ubuntu-Version prüfen" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "Möglichkeit einer Aktualisierung auf die aktuelle Entwicklungsversion prüfen" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Systemaktualisierung unter Verwendung der letzten vorgeschlagenen Version " "der Aktualisierungsverwaltung" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Beim Starten die Karte nicht fokussieren" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Systemaktualisierung durchführen" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Beim Starten nicht auf Aktualisierungen prüfen" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Testen der Systemaktualisierung mit einem Sandbox-aufs-Overlay" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Teilweise Systemaktualisierung wird durchgeführt" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Statt der Beschreibung des Pakets das Änderungsprotokoll anzeigen" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Versuchen Sie, mit der Aktualisierungsverwaltung von $distro-proposed auf " "die neueste Version zu aktualisieren." -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2449,22 +2470,22 @@ "Aktuell werden die Modi »desktop« für die allgemeine Systemaktualisierung " "von Desktop-Systemen und »server« für Server-Systeme unterstützt." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Angegebene Oberfläche verwenden" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" "Nur auf neue Systemfreigabe prüfen und das Ergebnis im Exit-Code angebe" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Neue Veröffentlichungen von Ubuntu werden gesucht" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2473,62 +2494,62 @@ "Systemaktualisierung zu erhalten:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Keine neue Freigabe gefunden" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Neue Freigabe »%s« verfügbar." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" "Führen Sie den Befehl »do-release-upgrade« aus, um auf die neue Ubuntu-" "Freigabe zu aktualisieren." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Ubuntu %(version)s-Systemaktualisierung verfügbar" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Sie haben die Systemaktualisierung auf Ubuntu %s abgelehnt" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Fehlerdiagnoseausgabe hinzufügen" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Nicht unterstützte Pakete auf diesem Rechner anzeigen" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Unterstützte Pakete auf diesem Rechner anzeigen" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Alle Pakete mit ihrem Status anzeigen" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Alle Pakete auflisten" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Zusammenfassung der Unterstützung für '%s':" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" "Sie haben %(num)s Pakete (%(percent).1f%%), die bis %(time)s unterstützt " "werden" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" @@ -2536,11 +2557,11 @@ "Sie haben %(num)s Pakete (%(percent).1f%%), die nicht/nicht mehr " "heruntergeladen werden können" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "Sie haben %(num)s nicht unterstützte Pakete (%(percent).1f%%)" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2548,54 +2569,71 @@ "Für weitere Informationen mit --show-unsupported, --show-supported oder --" "show-all ausführen" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Nicht mehr herunterzuladen:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Nicht unterstützt: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Unterstützt bis %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Nicht unterstützt" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Nicht implementierte Methode: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Datei auf der Festplatte" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb-Paket" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Fehlendes Paket installieren." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Das Paket %s sollte installiert sein." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb-Paket" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s muss als manuell installiert markiert sein." +msgid "%i obsolete entries in the status file" +msgstr "%i unnötige Einträge in der Statusdatei" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "Unnötige Einträge im dpkg-Status" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "Unnötige dpkg-Statuseinträge" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2604,69 +2642,95 @@ "kdelibs5-dev installiert werden. Sehen Sie auf der Webseite bugs.launchpad." "net nach dem Fehler #279621, um weitere Informationen zu erhalten." -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "%i unnötige Einträge in der Statusdatei" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "Unnötige Einträge im dpkg-Status" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "Unnötige dpkg-Statuseinträge" +msgid "%s needs to be marked as manually installed." +msgstr "%s muss als manuell installiert markiert sein." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "LILO entfernen, da auch GRUB installiert ist (weitere Einzelheiten siehe Bug " "#314004)." -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Nach dem Aktualisieren Ihrer Paketinformationen wurde das erforderliche " -#~ "Paket »%s« nicht mehr gefunden, weshalb der Fehlermeldevorgang gestartet " -#~ "wird." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Ubuntu auf Version 12.04 aktualisieren" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s Aktualisierung ausgewählt." -#~ msgstr[1] "%(count)s Aktualisierungen ausgewählt." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" +"\n" +"Ihr derzeitiger Hardware Enablement Stack (HWE) wird ab dem\n" +"%s nicht mehr unterstützt. Nach disem Datum sind kritische Updates\n" +"(Kernel und Grafikunterstützung) nicht mehr verfügbar.\n" +"\n" +"Für mehr Informationen, lesen Sie bitte:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Willkommen bei Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, fuzzy, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" +"Ihr derzeitiger Hardware Enablement Stack (HWE) wird seid dem\n" +"%s nicht mehr unterstützt. Kritische Updates\n" +"(Kernel und Grafikunterstützung) sind mehr verfügbar.\n" +"\n" +"Für mehr Informationen, lesen Sie bitte:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Diese Aktualisierungen wurden seit Veröffentlichung dieser Ubuntu-Version " -#~ "ausgegeben." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Für diesen Rechner sind Aktualisierungen verfügbar." - -#~ msgid "Update Manager" -#~ msgstr "Aktualisierungsverwaltung" - -#~ msgid "Starting Update Manager" -#~ msgstr "Aktualisierungsverwaltung wird gestartet" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Sie sind über ein Funkmodem (mobiles Breitband) verbunden." - -#~ msgid "_Install Updates" -#~ msgstr "Aktualisierungen _installieren" +#~ "Nach dem Aktualisieren Ihrer Paketinformationen wurde das erforderliche " +#~ "Paket »%s« nicht mehr gefunden, weshalb der Fehlermeldevorgang gestartet " +#~ "wird." #~ msgid "Your system is up-to-date" #~ msgstr "Ihr System ist auf dem aktuellen Stand" @@ -2797,6 +2861,9 @@ #~ "Bitte melden Sie dies als Fehler, indem Sie »ubuntu-bug update-manager« " #~ "in ein Terminal eingeben." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Aktualisierung von Ubuntu auf Version 11.10" + #~ msgid "%.0f kB" #~ msgstr "%.0f kB" diff -Nru update-manager-17.10.11/po/dv.po update-manager-0.156.14.15/po/dv.po --- update-manager-17.10.11/po/dv.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/dv.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2009. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2010-05-25 10:37+0000\n" "Last-Translator: Huxain \n" "Language-Team: Divehi \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s ގެ ސަރވަރ" @@ -42,30 +43,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "މައި ސަރވަރ" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "އެހެނިހެން ސަރވަރތައް" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "އެއްވެސް ސޯރސް ލިސްޓް އެންޓްރީއެއް ނުފެނުނު" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "އެއްވެސް ޕެކޭޖެއް ނުފެނުނު، މިއީ އުބުންޓުގެ ނިސްކެއް ނޫން ނުވަތަ މި ޑިސްކް އެލުލަވާލެވިފައިވަނީ ރަނގަޅަކަށް ނޫން" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "ސީޑީ އެއް ނުކުރެވި ފޭލްވެއްޖެ" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -75,13 +76,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -96,22 +97,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -124,65 +125,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "'%s' އިންސްޓޯލެއް ނުކުރެވުނު" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -191,25 +192,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -218,11 +219,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -233,11 +234,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -245,7 +246,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -254,29 +255,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "އަޕްގްރޭޑް ނުކުރެވުނު" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -286,28 +287,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -315,11 +316,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -331,16 +332,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -353,11 +354,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -366,34 +367,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -406,23 +407,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -433,32 +434,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -466,33 +467,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -503,26 +504,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_ބަހައްޓާ" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "އުނިކު_ރޭ" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -530,37 +531,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -568,79 +569,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -648,16 +649,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -666,7 +667,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -675,11 +676,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -687,11 +688,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -699,11 +700,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -713,71 +714,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -787,27 +788,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "ބަދަލުތައް ހުށައަޅަނީ" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -817,7 +818,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -826,26 +827,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -853,147 +854,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "މައްސަލަ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "މަޢުލޫމާތު" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "ތަފްޞީލްތައް" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1001,32 +1002,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1042,7 +1043,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1056,14 +1057,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1071,34 +1072,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1111,28 +1110,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1140,145 +1139,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1286,73 +1285,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "އ" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "ނ" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "ތ" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1410,7 +1409,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1429,164 +1428,180 @@ msgid "Terminal" msgstr "ޓާރމިނަލް" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "އަޕްގްރޭޑް" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "ރިލީސް ނޯޓު" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "އިންސްޓޯލް" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1595,34 +1610,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1630,29 +1653,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1661,7 +1684,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1669,58 +1692,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Size: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Version %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "ކެންސަލް" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1730,22 +1763,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "ކެންސަލް" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1759,26 +1788,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1787,7 +1816,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1796,7 +1825,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1805,47 +1834,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1906,56 +1929,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "އިންސްޓޯލް" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "ބަދަލުތައް" +msgid "updates" +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "ތަފްސީލް" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +msgid "_Install Updates" +msgstr "_އަޕްޑޭޓްސް އިންސްޓޯލްކުރޭ" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." -msgstr "" +msgid "Changes" +msgstr "ބަދަލުތައް" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "" +msgid "Description" +msgstr "ތަފްސީލް" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "އިންސްޓޯލް" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -1979,7 +2005,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1991,219 +2017,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "_އަޕްޑޭޓްސް އިންސްޓޯލްކުރޭ" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" diff -Nru update-manager-17.10.11/po/el.po update-manager-0.156.14.15/po/el.po --- update-manager-17.10.11/po/el.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/el.po 2017-12-23 05:00:38.000000000 +0000 @@ -4,11 +4,12 @@ # # Kostas Papadimas , 2005, 2006. # Fotis Tsamis , 2010. +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-21 17:32+0000\n" "Last-Translator: George Christofis \n" "Language-Team: Greek \n" @@ -21,7 +22,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -29,13 +30,13 @@ msgstr[1] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Εξυπηρετητής για %s" @@ -43,20 +44,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Κύριος εξυπηρετητής" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Προσαρμοσμένοι εξυπηρετητές" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Δεν μπορεί να υπολογιστεί η εισαγωγή του sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -64,11 +65,11 @@ "Αδυναμία εύρεσης πακέτων. Ενδεχομένως αυτός δεν είναι ένας δίσκος Ubuntu ή η " "αρχιτεκτονική είναι λανθασμένη;" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Αποτυχία προσθήκης του CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -83,13 +84,13 @@ "Το μήνυμα σφάλματος ήταν:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Απομάκρυνση πακέτου που βρίσκεται σε κακή κατάσταση" msgstr[1] "Απομάκρυνση πακέτων που βρίσκονται σε κακή κατάσταση" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -110,15 +111,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "διακομιστής μπορεί να είναι υπερφορτωμένος" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Κατεστραμμένα πακέτα" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -128,7 +129,7 @@ "get για να συνεχίσετε." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -150,13 +151,13 @@ "* Ανεπίσημα πακέτα λογισμικού που δεν παρέχονται από το Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη.\n" "Προσπαθήστε ξανά αργότερα." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -164,16 +165,16 @@ "Αν τίποτα από αυτά δε λειτουργεί, παρακαλώ αναφέρετε το πρόβλημα αυτό " "πληκτρολογώντας «ubuntu-bug update-manager» σε ένα τερματικό." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Αδυναμία υπολογισμού της αναβάθμισης" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Σφάλμα πιστοποίησης κάποιων πακέτων" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -183,7 +184,7 @@ "σε ένα πρόβλημα δικτύου. Προσπαθήστε αργότερα. Δείτε παρακάτω τη λίστα των " "μη πιστοποιημένων πακέτων." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -191,22 +192,22 @@ "Το πακέτο '%s' σημειώθηκε για απομάκρυνση αλλά είναι στη μαύρη λίστα " "απομάκρυνσης." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Το απαραίτητο πακέτο '%s' έχει σημειωθεί για απομάκρυνση." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Προσπάθεια εγκατάστασης έκδοσης '%s' καταχωρημένης σε μαύρη λίστα" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Αδυναμία εγκατάστασης '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -216,11 +217,11 @@ "τερματικό." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Αδυναμία εύρεσης μετα-πακέτου" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -235,15 +236,15 @@ " Εγκαταστήστε ένα από αυτά τα πακέτα πρώτα μέσω synaptic ή apt-get πριν να " "συνεχίσετε." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Ανάγνωση λανθάνουσας μνήμης" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Αδυναμία λήψης αποκλειστικού κλειδώματος" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -252,11 +253,11 @@ "πακέτων (όπως το apt-get ή το aptitude). Παρακαλώ κλείστε πρώτα αυτή την " "εφαρμογή." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Η αναβάθμιση μέσω απομακρυσμένης σύνδεσης δεν υποστηρίζεται." -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -270,11 +271,11 @@ "\n" "Η αναβάθμιση τώρα θα ματαιωθεί. Παρακαλώ δοκιμάστε χωρίς ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Συνέχεια εκτέλεσης μέσω SSH;" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -291,11 +292,11 @@ "Αν συνεχίσετε θα ξεκινήσει μια επιπλέον υπηρεσία ssh στη θύρα «%s».\n" "Θέλετε να συνεχίσετε;" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Εκκίνηση πρόσθετου sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -307,7 +308,7 @@ "πρόβλημα στην υπάρχουσα υπηρεσία ssh μπορείτε να χρησιμοποιήσετε την " "επιπρόσθετη.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -320,31 +321,31 @@ "αυτόματα. Μπορείτε να ανοίξετε τη θύρα με π.χ.:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Δεν είναι δυνατή η αναβάθμιση" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" "Η αναβάθμιση από το '%s' στο '%s' δεν υποστηρίζεται με αυτό το εργαλείο." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Η ρύθμιση της δοκιμαστικής κατάστασης (sandbox) απέτυχε." -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" "Δεν ήταν δυνατή η δημιουργία περιβάλλοντος δοκιμαστικής κατάστασης (sandbox)." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Δοκιμαστική κατάσταση (sandbox)" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -359,18 +360,18 @@ "*Καμία* αλλαγή που θα γραφτεί σε κατάλογο συστήματος από τώρα μέχρι την " "επόμενη επανεκκίνηση δε θα είναι μόνιμη." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Η εγκατάστασταση του python είναι κατεστραμένη. Παρακαλώ διορθώστε το " "symlink '/usr/bin/python'." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Το πακέτο 'debsig-verify' εγκαταστάθηκε" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -380,12 +381,12 @@ "Παρακαλούμε απεγκαταστήστε το με τον Synaptic ή με την εντολή 'apt-get " "remove debsig-verify' και μετά εκκινήστε την αναβάθμιση ξανά." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Δεν είναι δυνατή η εγγραφή στο '%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -396,11 +397,11 @@ "σας. Η αναβάθμιση δε μπορεί να συνεχιστεί.\n" "Παρακαλώ σιγουρευτείτε ότι ο κατάλογος του συστήματος είναι εγγράψιμος" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Να συμπεριληφθούν οι τελευταίες ενημερώσεις από το δίκτυο;" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -421,16 +422,16 @@ "αναβάθμιση.\n" "Αν απαντήσετε 'Όχι' εδώ, το δίκτυο δεν θα χρησιμοποιηθεί καθόλου." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "απενεργοποιημένο κατά την αναβάθμιση σε %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Δεν βρέθηκε έγκυρη εναλλακτική τοποθεσία αρχείων" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -450,11 +451,11 @@ "Αν επιλέξετε 'Οχι' η αναβάθμιση θα ακυρωθεί." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Δημιουργία προεπιλεγμένων πηγών;" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -468,11 +469,11 @@ "Θέλετε να προστεθούν οι προεπιλεγμένες καταχωρήσεις για '%s'; Αν επιλέξετε " "«Όχι», η αναβάθμιση θα ακυρωθεί." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Μη έγκυρες πληροφορίες αποθετηρίου" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -480,11 +481,11 @@ "Η αναβάθμιση των πληροφοριών αποθετηρίου είχε ως αποτέλεσμα ένα μη έγκυρο " "αρχείο, έτσι μια διαδικασία αναφοράς σφαλμάτων τίθεται σε λειτουργία." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Απενεργοποιήθηκαν πηγές τρίτων" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -494,13 +495,13 @@ "Μπορείτε να τις ενεργοποιήσετε μετά την αναβάθμιση με το εργαλείο 'software-" "properties' ή με τον διαχειριστή πακέτων σας." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Το πακέτο βρίσκεται σε αντιφατική κατάσταση" msgstr[1] "Τα πακέτα βρίσκονται σε αντιφατική κατάσταση" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -520,11 +521,11 @@ "Παρακαλούμε να επανεγκαταστήσετε τα πακέτα χειροκίνητα ή να τα απομακρύνετε " "από το σύστημα." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Σφάλμα κατά την ενημέρωση" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -533,13 +534,13 @@ "πρόβλημα δικτύου. Παρακαλώ ελέγξτε τη σύνδεση δικτύου σας και προσπαθήστε " "ξανά." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Δεν υπάρχει αρκετός χώρος στο δίσκο" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -554,21 +555,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Έλεγχος των αλλαγών" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Θέλετε να ξεκινήσετε την αναβάθμιση;" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Η αναβάθμιση ακυρώθηκε" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -576,12 +577,12 @@ "Η αναβάθμιση θα ακυρωθεί τώρα και θα αποκατασταθεί το σύστημα στην αρχική " "κατάσταση. Μπορείτε να συνεχίσετε την αναβάθμιση αργότερα." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Αδυναμία λήψης των αναβαθμίσεων" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -592,27 +593,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Σφάλμα κατά την υποβολή" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Γίνεται επαναφορά αρχικής κατάστασης συστήματος" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Αδυναμία εγκατάστασης των αναβαθμίσεων" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -620,7 +621,7 @@ "Εγκατάλειψη αναβάθμισης. Είναι πιθανόν να έχει αχρηστευθεί το σύστημά σας. " "Θα εκτελεστεί η εφαρμογή ανάκτησης (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -637,7 +638,7 @@ "αρχεία στο /var/log/dist-upgrade/ για την αναφορά σφάλματος.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -645,20 +646,20 @@ "Εγκατάλειψη αναβάθμισης. Παρακαλώ ελέγξτε την σύνδεσή σας στο διαδίκτυο ή το " "μέσο εγκατάστασης και δοκιμάστε ξανά. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Αφαίρεση παρωχημένων πακέτων;" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Διατήρηση" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Απομάκρυνση" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -668,27 +669,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Οι απαιτούμενες εξαρτήσεις δεν έχουν εγκατασταθεί" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Η απαιτούμενη εξάρτηση '%s' δεν έχει εγκατασταθεί. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Έλεγχος διαχειριστή πακέτων" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Απέτυχε η προετοιμασία της αναβάθμισης" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -696,11 +697,11 @@ "Η προετοιμασία του συστήματος για αναβάθμιση απέτυχε οπότε εκκινείται η " "διαδικασία αναφοράς σφάλματος." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Απέτυχε η λήψη των προαπαιτούμενων για την αναβάθμιση" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -713,70 +714,70 @@ "\n" "Επιπροσθέτως, έχει ξεκινήσει η διαδικασία αναφορά του σφάλματος." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Ενημέρωση πληροφοριών αποθετηρίου" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Αποτυχία προσθήκης του CD-ROM" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Λυπούμαστε , η προσθήκη του CD-ROM δεν ήταν επιτυχής." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Μη έγκυρες πληροφορίες πακέτου" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Γίνεται λήψη" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Γίνεται αναβάθμιση" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Η αναβάθμιση ολοκληρώθηκε" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "Η αναβάθμιση έχει ολοκληρωθεί αλλά υπήρξαν σφάλματα κατά τη διαδικασία της " "αναβάθμισης." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Γίνεται αναζήτηση για παρωχημένο λογισμικό" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Η αναβάθμιση συστήματος ολοκληρώθηκε." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Η μερική αναβάθμιση ολοκληρώθηκε." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms σε χρήση" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -786,12 +787,12 @@ "proc/mounts. Το 'evms' λογισμικό πλέον δεν υποστηρίζεται, παρακαλούμε " "απενεργοποιήστε το και τρέξτε την αναβάθμιση ξανά όταν απενεργοποιηθεί." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "Η κάρτα γραφικών σας ίσως να μην υποστηρίζεται πλήρως στο Ubuntu 12.04 LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -803,9 +804,9 @@ "περισσότερες πληροφορίες δείτε στο σύνδεσμο https://wiki.ubuntu.com/X/Bugs/" "UpdateManagerWarningForI8xx Θέλετε να συνεχίσετε την αναβάθμιση;" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -813,8 +814,8 @@ "Η αναβάθμιση μπορεί να μειώσει την απόδοση των εφέ, των παιχνιδιών και άλλων " "απαιτητικών προγραμμάτων." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -828,7 +829,7 @@ "\n" "Θέλετε να συνεχίσετε;" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -842,11 +843,11 @@ "\n" "Θέλετε να συνεχίσετε;" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Όχι i686 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -858,11 +859,11 @@ "ελάχιστη αρχιτεκτονική. Δεν είναι δυνατόν να αναβαθμίσετε το σύστημά σας σε " "μια νέα έκδοση του Ubuntu με αυτό το υλικό." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Δεν υπάρχει ARMv6 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -875,11 +876,11 @@ "δυνατή η αναβάθμιση του συστήματός σας στη νέα Ubuntu διανομή με αυτό το " "υλικό." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Αρχικοποίηση μη διαθέσιμη" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -895,15 +896,15 @@ "\n" "Θέλετε σίγουρα να συνεχίσετε;" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Δοκιμαστική αναβάθμιση (sandbox) με χρήση aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Χρήση της διαδρομής για αναζήτηση ενός cdrom με πακέτα για αναβάθμιση" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -911,58 +912,58 @@ "Χρήση περιβάλλοντος διασύνδεσης. Διαθέσιμα μέχρι στιγμής:\n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*ΔΕΝ ΠΡΟΤΕΙΝΕΤΑΙ ΠΙΑ* αυτή η επιλογή θα αγνοηθεί" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Εκτέλεση μιας μερικής αναβάθμιση (δεν θα αλλαχθεί το αρχείο sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Απενεργοποίηση οθόνης υποστήριξης GNU" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Ρύθμιση του datadir" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Παρακαλώ εισάγετε τον δίσκο '%s' στον οδηγό '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Η λήψη ολοκληρώθηκε" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Λήψη αρχείου %li από %li με %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Απομένουν περίπου %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Λήψη αρχείου %li από %li" @@ -972,27 +973,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Γίνεται εφαρμογή αλλαγών" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "προβλήματα εξαρτήσεων - αφήνεται μη ρυθμισμένο" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Αδυναμία εγκατάστασης '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -1005,7 +1006,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1016,7 +1017,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1024,20 +1025,20 @@ "Οι αλλαγές που έχετε κάνει σε αυτό το αρχείο ρυθμίσεων θα χαθούν αν " "επιλέξετε να το αντικαταστήσετε με μια νεότερη έκδοση." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Η εντολή 'diff' δεν βρέθηκε" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Προέκυψε μοιραίο σφάλμα" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1048,13 +1049,13 @@ "συμπεριλάβετε τα αρχεία /var/log/dist-upgrade/main.log και /var/log/dist-" "upgrade/apt.log στην αναφορά σας. Εγκατάλειψη αναβάθμισης." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Πατήθηκε το Ctrl-c" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1063,137 +1064,137 @@ "σύστημα. Είστε βέβαιοι για την επιλογή αυτή;" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Για να αποφύγετε απώλεια δεδομένων, κλείστε όλες τις ανοικτές εφαρμογές και " "έγγραφα." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Δεν υποστηρίζεται πλέον από την Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Υποβάθμιση (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Αφαίρεση (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Δεν χρειάζεται πλέον (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Εγκατάσταση (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Αναβάθμιση (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Αλλαγή μέσου" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Εμφάνιση διαφορών >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Απόκρυψη διαφορών" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Σφάλμα" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Ακύρωση" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Κλείσιμο" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Εμφάνιση τερματικού >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Απόκρυψη τερματικού" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Πληροφορίες" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Λεπτομέρειες" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Δεν υποστηρίζεται πλέον (%s)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Απομάκρυνση %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Αφαίρεση (ήταν εγκατεστημένο αυτόματα) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Εγκατάσταση %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Αναβάθμιση %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Απαιτείται επανεκκίνηση" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" "Επανεκκινήστε το σύστημα για να ολοκληρωθεί η αναβάθμιση" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "Επανε_κκίνηση τώρα" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1205,32 +1206,32 @@ "Το σύστημα μπορεί να μην είναι χρησιμοποιήσιμο, αν ακυρώσετε την αναβάθμιση. " "Προτείνεται οπωσδήποτε να την συνεχίσετε." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Ακύρωση αναβάθμισης;" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li ημέρα" msgstr[1] "%li ημέρες" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li ώρα" msgstr[1] "%li ώρες" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li λεπτό" msgstr[1] "%li λεπτά" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1246,7 +1247,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1260,14 +1261,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1277,34 +1278,32 @@ "περίπου %s με ένα 56k μόντεμ." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Αυτή η λήψη θα διαρκέσει περίπου %s με την σύνδεση σας. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Γίνεται προετοιμασία της αναβάθμισης" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Απόκτηση νέων καναλιών λογισμικού" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Γίνεται λήψη νέων πακέτων" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Γίνεται εγκατάσταση των αναβαθμίσεων" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Εκκαθάριση" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1321,28 +1320,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d πακέτο πρόκειται να απομακρυνθεί." msgstr[1] "%d πακέτα πρόκειται να απομακρυνθούν." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d νέο πακέτο πρόκειται να εγκατασταθεί." msgstr[1] "%d νέα πακέτα πρόκειται να εγκατασταθούν." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d πακέτο πρόκειται να αναβαθμιστεί." msgstr[1] "%d πακέτα πρόκειται να αναβαθμιστούν." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1353,7 +1352,7 @@ "\n" "Θα πρέπει να κάνετε συνολική λήψη %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1361,7 +1360,7 @@ "Η εγκατάσταση της αναβάθμισης ενδέχεται να διαρκέσει αρκετές ώρες. Από τη " "στιγμή που θα ολοκληρωθεί η λήψη, η διαδικασία δε γίνεται να ματαιωθεί." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1370,16 +1369,16 @@ "Από τη στιγμή που θα ολοκληρωθεί η λήψη, η διαδικασία της αναβάθμισης δε " "μπορεί να διακοπεί." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Η απομάκρυνση των πακέτων ενδέχεται να διαρκέσει αρκετές ώρες. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Το λογισμικό σε αυτό τον υπολογιστή είναι ενημερωμένο." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1387,38 +1386,38 @@ "Δεν υπάρχουν διαθέσιμες αναβαθμίσεις για το σύστημα σας. Η αναβάθμιση θα " "ακυρωθεί." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Απαιτείται επανεκκίνηση" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Η αναβάθμιση ολοκληρώθηκε και απαιτείται επανεκκίνηση. Θέλετε να γίνει " "επανεκκίνηση τώρα;" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "ταυτοποίηση «%(file)s» έναντι «%(signature)s» " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "αποσυμπίεση '%s'" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Αδυναμία εκτέλεσης του εργαλείου αναβαθμίσεων" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1427,33 +1426,33 @@ "αναφέρετέ το ως σφάλμα, χρησιμοποιώντας την εντολή «ubuntu-bug update-" "manager»." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Υπογραφή εργαλείου αναβάθμισης" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Εργαλείο αναβάθμισης" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Αποτυχία λήψης" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Η λήψη της αναβάθμισης απέτυχε. Πιθανόν να υπάρχει πρόβλημα δικτύου. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Η πιστοποίηση απέτυχε" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1461,13 +1460,13 @@ "Η πιστοποίηση της αναβάθμισης απέτυχε. Πιθανόν να υπάρχει πρόβλημα δικτύου ή " "εξυπηρετητή. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Αποτυχία αποσυμπίεσης" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1475,13 +1474,13 @@ "Η αποσυμπίεση της αναβάθμισης απέτυχε. Πιθανόν να υπάρχει πρόβλημα δικτύου ή " "εξυπηρετητή. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Η επαλήθευση απέτυχε" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1489,15 +1488,15 @@ "Η επαλήθευση της αναβάθμισης απέτυχε. Πιθανόν να υπάρχει πρόβλημα δικτύου ή " "εξυπηρετητή. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Δεν μπορεί να εκτελεστεί η αναβάθμιση" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1506,13 +1505,13 @@ "noexec (μη εκτελέση). Παρακαλώ προσαρτήστε ξανά δίχως τη σημαία noexec και " "εκτελέστε πάλι τη διαδικασία αναβάθμισης." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Το μύνημα λάθους είναι '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1525,73 +1524,73 @@ "Το αρχικό sources.list σας αποθηκεύτηκε στο /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Εγκατάλειψη" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Υποβαθμίστηκε:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Για να συνεχίσετε πιέστε [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Συνέχεια [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Λεπτομέρειες [λ]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "ν" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "ο" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "λ" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Δεν υποστηρίζεται πλέον: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Απομάκρυνση: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Εγκατάσταση: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Αναβάθμιση: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Συνέχεια [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1658,8 +1657,7 @@ msgstr "Αναβάθμιση διανομής" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "Αναβάθμιση Ubuntu στην έκδοση 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1678,84 +1676,85 @@ msgid "Terminal" msgstr "Τερματικό" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Παρακαλώ περιμένετε, αυτό μπορεί να διαρκέσει λίγο χρόνο." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Η ενημέρωση ολοκληρώθηκε" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Αδυναμία εύρεσης σημειώσεων έκδοσης" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Ο εξυπηρετητής μπορεί να είναι υπερφορτωμέμος " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Αδυναμία λήψης των σημειώσεων έκδοσης" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Παρακαλώ ελέγξτε τη σύνδεση σας με το διαδίκτυο." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Αναβάθμιση" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Σημειώσεις έκδοσης" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Μεταφόρτωση πρόσθετων πακέτων αρχείων..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Αρχείο %s από %s στα %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Αρχείο %s από %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Άνοιγμα συνδέσμου στο πρόγραμμα περιήγησης" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Αντιγραφή συνδέσμου στο πρόχειρο" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Λήψη αρχείου %(current)li από %(total)li με %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Λήψη αρχείου %(current)li από %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Η έκδοσή σας του Ubuntu δεν υποστηρίζεται πλέον." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1763,53 +1762,59 @@ "Δεν θα λάβετε άλλες διορθώσεις ασφαλείας ή κρίσιμες ενημερώσεις. Παρακαλώ " "αναβαθμίστε σε μεταγενέστερη έκδοση του Ubuntu." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Πληροφορίες αναβάθμισης" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Εγκατάσταση" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Όνομα" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Έκδοση %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Δεν ανιχνεύθηκε σύνδεση δικτύου, δεν μπορείτε να λάβετε πληροφορίες " "καταγραφής αλλαγών." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Γίνεται λήψη της λίστας των αλλαγών..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Αποεπιλογή όλων" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Επιλ_ογή Όλων" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s αναβάθμιση έχει επιλεγεί." +msgstr[1] "%(count)s αναβαθμίσεις έχουν επιλεγεί." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s θα μεταφορτωθούν." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "Η ενημέρωση έχει ήδη μεταφορτωθεί, αλλά δεν εγκαταστάθηκε." msgstr[1] "Οι ενημερώσεις έχουν ήδη μεταφορτωθεί, αλλά δεν εγκαταστάθηκαν." @@ -1817,11 +1822,18 @@ msgid "There are no updates to install." msgstr "Δεν υπάρχουν ενημερώσεις για εγκατάσταση." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Άγνωστο μέγεθος λήψης." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1829,7 +1841,7 @@ "Είναι άγνωστο το πότε ενημερώθηκαν τελευταία φορά οι πληροφορίες του " "πακέτου. Παρακαλώ πατήστε το πλήκτρο «Check» για την ενημέρωσή τους." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1839,7 +1851,7 @@ "Πατήστε το κουμπί 'Έλεγχος' παρακάτω για να ελέγξετε για νέες ενημερώσεις " "λογισμικού." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1848,7 +1860,7 @@ msgstr[1] "" "Οι πληροφορίες των πακέτων ενημερώθηκαν πριν από %(days_ago)s ημέρες." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1857,36 +1869,48 @@ msgstr[1] "Οι πληροφορίες των πακέτων ενημερώθηκαν πριν %(hours_ago)s ώρες." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" "Οι πληροφορίες του πακέτου ενημερώθηκαν τελευταία περίπου %s λεπτά πριν." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Οι πληροφορίες του πακέτου μόλις ενημερώθηκαν." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Οι ενημερώσεις λογισμικού μπορούν να διορθώνουν σφάλματα, κενά ασφαλείας και " +"να παρέχουν νέες λειτουργίες." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" "Ενημερώσεις λογισμικού μπορεί να είναι διαθέσιμες για τον υπολογιστή σας." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Καλώς ορίσατε στο Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Αυτές οι αναβαθμίσεις λογισμικού έχουν εκδοθεί έπειτα από την κυκλοφορία " +"αυτής της έκδοσης του Ubuntu." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Υπάρχουν διαθέσιμες ενημερώσεις λογισμικού γι αυτόν τον υπολογιστή." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1898,7 +1922,7 @@ "απορρίμματα και απομακρύνετε προσωρινά πακέτα από προηγούμενες εγκαταστάσεις " "χρησιμοποιώντας την εντολή 'sudo apt-get clean'." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1906,25 +1930,25 @@ "Χρειάζεται επανεκκίνηση για να ολοκληρωθεί η εγκατάσταση των ενημερώσεων. " "Παρακαλούμε αποθηκεύστε την εργασία σας πριν συνεχίσετε." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Ανάγνωση πληροφοριών πακέτου" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Σύνδεση..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Υπάρχει πιθανότητα να μην μπορείτε να ελέγξετε για ενημερώσεις ή να τις " "μεταφορτώσετε." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Δεν είναι δυνατή η αρχικοποίηση των πληροφοριών του πακέτου" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1938,7 +1962,7 @@ "Παρακαλούμε αναφέρετε το σφάλμα αυτό για το πακέτο 'update-manager' και " "συμπεριλάβετε και το παρακάτω μήνυμα σφάλματος:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1950,31 +1974,31 @@ "Παρακαλούμε αναφέρετε το σφάλμα αυτό για το πακέτο 'update-manager' και " "συμπεριλάβετε και το παρακάτω μήνυμα σφάλματος:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Νέα εγκατάσταση)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Μέγεθος: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Από έκδοση: %(old_version)s σε %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Έκδοση %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Η αναβάθμιση της διανομής δεν είναι δυνατή αυτήν την στιγμή." -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1983,21 +2007,21 @@ "Η αναβάθμιση της διανομής δεν είναι δυνατή αυτήν την στιγμή, παρακαλώ " "δοκιμάστε αργότερα. Ο εξυπηρετητής ανέφερε: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Λήψη του εργαλείου αναβάθμισης έκδοσης" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Νέα διανομή Ubuntu '%s' είναι διαθέσιμη" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Ο κατάλογος λογισμικού είναι κατεστραμμένος" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -2007,6 +2031,17 @@ "το διαχειριστή πακέτων \"Synaptic\" η εκτελέστε την εντολή \"sudo apt-get " "install -f\" σε ένα τερματικό για να διορθώσετε το πρόβλημα πρώτα." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Μια νέα έκδοση '%s' είναι διαθέσιμη." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Ακύρωση" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "'Ελεγχος για ενημερώσεις" @@ -2016,22 +2051,18 @@ msgstr "Εγκατάσταση όλων των διαθέσιμων ενημερώσεων" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Ακύρωση" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Καταγραφή αλλαγών (Changelog)" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Ενημερώσεις" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Δημιουργία λίστας" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2056,22 +2087,22 @@ "* Ανεπίσημα πακέτα λογισμικού που δεν παρέχονται από το Ubuntu\n" "* Κανονικές αλλαγές σε προεκδόσεις του Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Μεταφόρτωση του αρχείου αλλαγών (changelog)" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Άλλες αναβαθμίσεις (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" "Αυτή η ενημέρωση δεν προέρχεται από πηγή η οποία υποστηρίζει καταγραφές " "αλλαγών (changelogs)." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2079,7 +2110,7 @@ "Αποτυχία λήψης της λίστας των αλλαγών.\n" "Παρακαλώ ελέγξτε τη σύνδεση σας στο διαδίκτυο." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2092,7 +2123,7 @@ "Διαθέσιμη έκδοση: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2106,7 +2137,7 @@ "+changelog\n" "μέχρι οι αλλαγές να γίνουν διαθέσιμες ή δοκιμάστε ξανά αργότερα." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2120,54 +2151,45 @@ "+changelog\n" "μέχρι οι αλλαγές να γίνουν διαθέσιμες ή προσπαθήστε αργότερα." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Αδυναμία εντοπισμού διανομής" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" "Ένα σφάλμα '%s' συνέβη κατά την διάρκεια ελέγχου του συστήματος που " "χρησιμοποιείτε." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Σημαντικές ενημερώσεις ασφαλείας" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Συνιστώμενες ενημερώσεις" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Προτεινόμενες ενημερώσεις" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backports" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Αναβαθμίσεις διανομής" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Άλλες ενημερώσεις" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Εκκίνηση του Διαχειριστή ενημερώσεων" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Οι ενημερώσεις λογισμικού μπορούν να διορθώνουν σφάλματα, κενά ασφαλείας και " -"να παρέχουν νέες λειτουργίες." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Μερική αναβάθμιση" @@ -2240,37 +2262,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Αναβαθμίσεις λογισμικού" +msgid "Update Manager" +msgstr "Διαχειριστής Ενημερώσεων" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Αναβαθμίσεις λογισμικού" +msgid "Starting Update Manager" +msgstr "Εκκίνηση διαχείρισης ενημερώσεων." #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "Ανα_βάθμιση" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "ενημερώσεις" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Εγκατάσταση" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Αλλαγές" +msgid "updates" +msgstr "ενημερώσεις" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Περιγραφή" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Περιγραφή της ενημέρωσης" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2278,24 +2290,34 @@ "Είστε σε σύνδεση μέσω περιαγωγής και μπορεί να χρεωθείτε για τα δεδομένα που " "θα απαιτηθούν γι' αυτή την ενημέρωση." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Είστε σε σύνδεση μέσω ασύρματου modem." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Είναι ασφαλέστερο να συνδέσετε τον υπολογιστή στο ρεύμα πριν την ενημέρωση." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "Ε_γκατάσταση ενημερώσεων" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Αλλαγές" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Ρυθμίσεις..." +msgid "Description" +msgstr "Περιγραφή" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Εγκατάσταση" +msgid "Description of update" +msgstr "Περιγραφή της ενημέρωσης" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Ρυθμίσεις..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2320,9 +2342,8 @@ msgstr "Αρνηθήκατε να αναβαθμίσετε στο νέο Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Μπορείτε να αναβαθμίσετε το σύστημα σας αργότερα, ανοίγοντας την Διαχείριση " @@ -2336,61 +2357,61 @@ msgid "Show and install available updates" msgstr "Προβολή και εγκατάσταση διαθέσιμων ενημερώσεων" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Εμφάνιση έκδοσης και έξοδος" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Κατάλογος που περιέχει αρχεία δεδομένων" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Έλεγχος για διαθεσιμότητα νέας διανομής Ubuntu" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Έλεγχος για την δυνατότητα αναβάθμισης στην τελευταία έκδοση ανάπτυξης" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Αναβάθμιση χρησιμοποιώντας την τελευταία έκδοση του προγράμματος αναβάθμισης" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Μην κάνετε ζουμ στον χάρτη κατά την έναρξη" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Δοκιμάστε να τρέξετε το dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Να μην πραγματοποιείται έλεγχος για ενημερώσεις κατά την εκκίνηση" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Δοκιμαστική αναβάθμιση με χρήση sandbox aufs overlay" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Γίνεται εκτέλεση της μερικής αναβάθμισης" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" "Εμφάνιση της περιγραφής του πακέτου αντί για την καταγραφή αλλαγών του " "(changelog)" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Δοκιμάστε να κάνετε αναβάθμιση στην τελευταία έκδοση χρησιμοποιώντας τον " "αναβαθμιστή από το $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2400,11 +2421,11 @@ "Υποστηρίζεται μέχρι στιγμής το 'desktop' για συνηθισμένη αναβάθμιση ενός " "υπολογιστή γραφείου και 'server' για εξυπηρετητές." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Τρέξε το συγκεκριμένο κέλυφος" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2412,11 +2433,11 @@ "Έλεγξε μόνο αν μια νέα έκδοση της διανομής είναι διαθέσιμη και ανέφερε τα " "αποτελέσματα μέσω του κωδικού εξόδου" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Γίνεται έλεγχος για νέα έκδοση του Ubuntu" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2424,70 +2445,70 @@ "Για πληροφορίες αναβάθμισης, παρακαλούμε επισκεφθείτε:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Δε βρέθηκε καμία νέα έκδοση" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Μια νέα έκδοση '%s' είναι διαθέσιμη." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" "Εκτελέστε την εντολή 'do-release-upgrade' για να αναβαθμίσετε σε αυτήν." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Η αναβάθμιση του Ubuntu %(version)s είναι διαθέσιμη" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Αρνηθήκατε τη αναβάθμιση σε Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Προσθήκη εξόδου εκσφλαμάτωσης" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Εμφάνιση μη υποστηριζόμενων πακέτων σε αυτό τον υπολογιστή" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Εμφάνιση υποστηριζόμενων πακέτων σε αυτό τον υπολογιστή" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Εμφάνιση όλων των πακέτων μαζί με την κατάσταση στην οποία βρίσκονται" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Εμφάνιση όλων των πακέτων σε μία λίστα" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Περίληψη της κατάστασης υποστήριξης του '%s':" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" "Έχετε %(num)s πακέτα (%(percent).1f%%) που υποστηρίζονται μέχρι %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "Έχετε %(num)s πακέτα (%(percent).1f%%) που δε μπορούν πια να ληφθούν" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "Έχετε %(num)s πακέτα (%(percent).1f%%) που δεν υποστηρίζονται πια" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2495,54 +2516,71 @@ "Εκτελέστε με --show-unsupported, --show-supported ή --show-all για να δείτε " "περισσότερες λεπτομέρειες" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Δεν είναι δυνατή πλέον η λήψη:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Μη υποστηριζόμενα: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Υποστηρίζεται έως %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Μη υποστηριζόμενο" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Μη υλοποιημένη μέθοδος: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Ένα αρχείο στο δίσκο" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "πακέτο .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Εγκαταστήστε το πακέτο που λείπει." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Το πακέτο %s πρέπει να εγκατασταθεί." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "πακέτο .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "Το %s πρέπει να σημειωθεί για χειροκίνητη εγκατάσταση." +msgid "%i obsolete entries in the status file" +msgstr "%i απαρχαιωμένες καταχωρήσεις στο αρχείο κατάστασης" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "Απαρχαιωμένες καταχωρήσεις στην κατάσταση του dpkg" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "Απαρχαιωμένες καταχωρήσεις κατάστασης του dpkg" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2551,26 +2589,75 @@ "dev χρειάζεται να εγκατασταθεί. Δείτε στο bugs.launchpad.net, σφάλμα #279621 " "για πληροφορίες." -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "%i απαρχαιωμένες καταχωρήσεις στο αρχείο κατάστασης" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "Απαρχαιωμένες καταχωρήσεις στην κατάσταση του dpkg" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "Απαρχαιωμένες καταχωρήσεις κατάστασης του dpkg" +msgid "%s needs to be marked as manually installed." +msgstr "Το %s πρέπει να σημειωθεί για χειροκίνητη εγκατάσταση." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Απομακρύνετε το lilo εφόσον το grub είναι ήδη εγκατεστημένο. Δείτε στο " "σφάλμα #314004 για λεπτομέρειες." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" + +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + #~ msgid "" #~ "After your package information was updated the essential package '%s' can " #~ "not be found anymore so a bug reporting process is being started." @@ -2579,39 +2666,6 @@ #~ "δεν ήταν δυνατό να βρεθεί πλέον, έτσι μια διαδικασία αναφοράς σφαλμάτων " #~ "τίθεται σε λειτουργία." -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s αναβάθμιση έχει επιλεγεί." -#~ msgstr[1] "%(count)s αναβαθμίσεις έχουν επιλεγεί." - -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" - -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Καλώς ορίσατε στο Ubuntu" - -#~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." -#~ msgstr "" -#~ "Αυτές οι αναβαθμίσεις λογισμικού έχουν εκδοθεί έπειτα από την κυκλοφορία " -#~ "αυτής της έκδοσης του Ubuntu." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Υπάρχουν διαθέσιμες ενημερώσεις λογισμικού γι αυτόν τον υπολογιστή." - -#~ msgid "Update Manager" -#~ msgstr "Διαχειριστής Ενημερώσεων" - -#~ msgid "Starting Update Manager" -#~ msgstr "Εκκίνηση διαχείρισης ενημερώσεων." - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Είστε σε σύνδεση μέσω ασύρματου modem." - -#~ msgid "_Install Updates" -#~ msgstr "Ε_γκατάσταση ενημερώσεων" - #~ msgid "Checking for a new ubuntu release" #~ msgstr "Γίνεται έλεγχος για νέα έκδοση του ubuntu" diff -Nru update-manager-17.10.11/po/en_AU.po update-manager-0.156.14.15/po/en_AU.po --- update-manager-17.10.11/po/en_AU.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/en_AU.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # David Symons , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-22 13:03+0000\n" "Last-Translator: Joel Addison \n" "Language-Team: English (Australia) \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Server for %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Main server" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Custom servers" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Could not calculate sources.list entry" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Unable to locate any package files, perhaps this is not an Ubuntu Disc or " "the wrong architecture?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Failed to add the CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,13 +83,13 @@ "The error message was:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Remove package in bad state" msgstr[1] "Remove packages in bad state" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -109,15 +110,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "The server may be overloaded" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Broken packages" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -126,7 +127,7 @@ "software. Please fix them first using synaptic or apt-get before proceeding." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -147,11 +148,11 @@ " * Unofficial software packages not provided by Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "This is most likely a transient problem, please try again later." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -159,16 +160,16 @@ "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Could not calculate the upgrade" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Error authenticating some packages" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -178,29 +179,29 @@ "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" "The package '%s' is marked for removal but it is in the removal blacklist." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "The essential package '%s' is marked for removal." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Trying to install blacklisted version '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Can't install '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -209,11 +210,11 @@ "using 'ubuntu-bug update-manager' in a terminal." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Can't guess meta-packag" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -227,15 +228,15 @@ " Please install one of the packages above first using synaptic or apt-get " "before proceeding." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Reading cache" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Unable to get exclusive lock" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -243,11 +244,11 @@ "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Upgrading over remote connection not supported" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -261,11 +262,11 @@ "\n" "The upgrade will abort now. Please try without ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Continue running under SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -282,11 +283,11 @@ "If you continue, an additional ssh daemon will be started at port '%s'.\n" "Do you want to continue?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Starting additional sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -297,7 +298,7 @@ "started on port '%s'. If anything goes wrong with the running ssh you can " "still connect to the additional one.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -310,29 +311,29 @@ "with e.g.:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Cannot upgrade" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "An upgrade from '%s' to '%s' is not supported with this tool." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Sandbox setup failed" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "It was not possible to create the sandbox environment." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Sandbox mode" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -347,17 +348,17 @@ "*No* changes written to a system directory from now until the next reboot " "are permanent." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Package 'debsig-verify' is installed" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -367,12 +368,12 @@ "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Can not write to '%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -383,11 +384,11 @@ "upgrade can not continue.\n" "Please make sure that the system directory is writeable." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Include latest updates from the Internet?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -407,16 +408,16 @@ "latest updates soon after upgrading.\n" "If you answer 'no' here, the network is not used at all." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "disabled on upgrade to %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "No valid mirror found" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -436,11 +437,11 @@ "If you select 'No' the upgrade will cancel." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Generate default sources?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -453,11 +454,11 @@ "Should default entries for '%s' be added? If you select 'No', the upgrade " "will cancel." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Repository information invalid" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -465,11 +466,11 @@ "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Third party sources disabled" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -479,13 +480,13 @@ "enable them after the upgrade with the 'software-properties' tool or your " "package manager." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Package in inconsistent state" msgstr[1] "Packages in inconsistent state" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -504,11 +505,11 @@ "but no archive can be found for them. Please reinstall the packages manually " "or remove them from the system." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Error during update" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -516,13 +517,13 @@ "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Not enough free disk space" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -537,21 +538,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Calculating the changes" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Do you want to start the upgrade?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Upgrade cancelled" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -559,12 +560,12 @@ "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Could not download the upgrades" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -574,27 +575,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Error during commit" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Restoring original system state" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Could not install the upgrades" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -602,7 +603,7 @@ "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -619,7 +620,7 @@ "upgrade/ to the bug report.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -627,20 +628,20 @@ "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Remove obsolete packages?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Keep" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Remove" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -650,27 +651,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Required depends is not installed" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "The required dependency '%s' is not installed. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Checking package manager" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Preparing the upgrade failed" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -678,11 +679,11 @@ "Preparing the system for the upgrade failed so a bug reporting process is " "being started." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Getting upgrade prerequisites failed" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -694,69 +695,69 @@ "\n" "Additionally, a bug reporting process is being started." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Updating repository information" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Failed to add the cdrom" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Sorry, adding the cdrom was not successful." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Invalid package information" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Fetching" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Upgrading" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Upgrade complete" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "The upgrade has completed but there were errors during the upgrade process." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Searching for obsolete software" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "System upgrade is complete." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "The partial upgrade has completed." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms in use" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -766,11 +767,11 @@ "software is no longer supported, please switch it off and run the upgrade " "again when this is done." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -782,9 +783,9 @@ "https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx Do you want to " "continue with the upgrade?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -792,8 +793,8 @@ "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -805,7 +806,7 @@ "version of this driver is available that works with your video card in " "Ubuntu 10.04 LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -817,11 +818,11 @@ "of this driver is available that works with your hardware in Ubuntu 10.04 " "LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "No i686 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -833,11 +834,11 @@ "minimal architecture. It is not possible to upgrade your system to a new " "Ubuntu release with this hardware." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "No ARMv6 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -849,11 +850,11 @@ "minimal architecture. It is not possible to upgrade your system to a new " "Ubuntu release with this hardware." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "No init available" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -870,15 +871,15 @@ "\n" "Are you sure you wish to continue?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Sandbox upgrade using aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Use the given path to search for a cdrom with upgradable packages" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -886,57 +887,57 @@ "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*DEPRECATED* this option will be ignored" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "Perform a partial upgrade only (no sources.list rewriting)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Disable GNU screen support" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Set datadir" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Please insert '%s' into the drive '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Fetching is complete" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Fetching file %li of %li at %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "About %s remaining" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Fetching file %li of %li" @@ -946,27 +947,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Applying changes" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "dependency problems - leaving unconfigured" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Could not install '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -978,7 +979,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -989,7 +990,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -997,20 +998,20 @@ "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "The 'diff' command was not found" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "A fatal error occurred" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1022,13 +1023,13 @@ "report. The upgrade has aborted.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c pressed" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1037,134 +1038,134 @@ "Are you sure you want to do this?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "To prevent data loss close all open applications and documents." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "No longer supported by Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Downgrade (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Remove (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "No longer needed (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Install (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Upgrade (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Media Change" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Show Difference >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Hide Difference" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Error" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Cancel" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Close" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Show Terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Hide Terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Information" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Details" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "No longer supported %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Remove %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Remove (was auto installed) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Install %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Upgrade %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Restart required" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Restart the system to complete the upgrade" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Restart Now" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1176,32 +1177,32 @@ "The system could be in an unusable state if you cancel the upgrade. You are " "strongly advised to resume the upgrade." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Cancel Upgrade?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li day" msgstr[1] "%li days" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li hour" msgstr[1] "%li hours" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minute" msgstr[1] "%li minutes" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1217,7 +1218,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1231,14 +1232,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1248,34 +1249,32 @@ "with a 56k modem." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "This download will take about %s with your connection. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Preparing to upgrade" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Getting new software channels" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Getting new packages" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Installing the upgrades" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Cleaning up" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1292,28 +1291,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d package is going to be removed." msgstr[1] "%d packages are going to be removed." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d new package is going to be installed." msgstr[1] "%d new packages are going to be installed." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d package is going to be upgraded." msgstr[1] "%d packages are going to be upgraded." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1324,7 +1323,7 @@ "\n" "You have to download a total of %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1332,7 +1331,7 @@ "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be cancelled." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1340,16 +1339,16 @@ "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be cancelled." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Removing the packages can take several hours. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "The software on this computer is up to date." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1357,38 +1356,38 @@ "There are no upgrades available for your system. The upgrade will now be " "cancelled." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Reboot required" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "The upgrade is finished and a restart is required. Do you want to do this " "now?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "authenticate '%(file)s' against '%(signature)s' " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "extracting '%s'" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Could not run the upgrade tool" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1396,33 +1395,33 @@ "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Upgrade tool signature" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Upgrade tool" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Failed to fetch" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Fetching the upgrade failed. There may be a network problem. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Authentication failed" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1430,13 +1429,13 @@ "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Failed to extract" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1444,13 +1443,13 @@ "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Verification Failed" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1458,15 +1457,15 @@ "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Cannot run the upgrade" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1474,13 +1473,13 @@ "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "The error message is '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1492,73 +1491,73 @@ "aborted.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Aborting" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Demoted:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "To continue please press [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Continue [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Details [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "No longer supported: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Remove: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Install: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Upgrade: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Continue [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1625,9 +1624,8 @@ msgstr "Distribution Upgrade" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Upgrading Ubuntu to version 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Upgrading Ubuntu to version 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1645,84 +1643,85 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Please wait, this can take some time." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Update is complete" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Could not find the release notes" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "The server may be overloaded. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Could not download the release notes" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Please check your internet connection." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Upgrade" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Release Notes" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Downloading additional package files..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "File %s of %s at %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "File %s of %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Open Link in Browser" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Copy Link to Clipboard" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Downloading file %(current)li of %(total)li with %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Downloading file %(current)li of %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Your Ubuntu release is not supported anymore." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1730,52 +1729,58 @@ "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Upgrade information" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Install" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Name" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "No network connection detected, you can not download changelog information." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Downloading list of changes..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Deselect All" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Select _All" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s update has been selected." +msgstr[1] "%(count)s updates have been selected." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s will be downloaded." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "The update has already been downloaded, but not installed." msgstr[1] "The updates have already been downloaded, but not installed." @@ -1783,11 +1788,18 @@ msgid "There are no updates to install." msgstr "There are no updates to install." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Unknown download size." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1795,7 +1807,7 @@ "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1804,14 +1816,14 @@ "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "The package information was last updated %(days_ago)s day ago." msgstr[1] "The package information was last updated %(days_ago)s days ago." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1820,34 +1832,46 @@ msgstr[1] "The package information was last updated %(hours_ago)s hours ago." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "The package information was last updated about %s minutes ago." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "The package information was just updated." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Software updates may be available for your computer." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Welcome to Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"These software updates have been issued since this version of Ubuntu was " +"released." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Software updates are available for this computer." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1858,7 +1882,7 @@ "least an additional %s of disk space on '%s'. Empty your trash and remove " "temporary packages of former installations using 'sudo apt-get clean'." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1866,23 +1890,23 @@ "The computer needs to restart to finish installing updates. Please save your " "work before continuing." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Reading package information" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Connecting..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "You may not be able to check for updates or download new updates." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Could not initialize the package information" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1896,7 +1920,7 @@ "Please report this bug against the 'update-manager' package and include the " "following error message:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1908,31 +1932,31 @@ "Please report this bug against the 'update-manager' package and include the " "following error message:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (New install)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Size: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "From version %(old_version)s to %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Version %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Release upgrade not possible right now" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1941,21 +1965,21 @@ "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Downloading the release upgrade tool" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "New Ubuntu release '%s' is available" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Software index is broken" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1965,6 +1989,17 @@ "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "New release '%s' available." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Cancel" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Check for Updates" @@ -1974,22 +2009,18 @@ msgstr "Install All Available Updates" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Cancel" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Changelog" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Updates" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Building Updates List" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2013,20 +2044,20 @@ " * Unofficial software packages not provided by Ubuntu\n" " * Normal changes of a pre-release version of Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Downloading changelog" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Other updates (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "This update does not come from a source that supports changelogs." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2034,7 +2065,7 @@ "Failed to download the list of changes. \n" "Please check your Internet connection." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2047,7 +2078,7 @@ "Available version: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2060,7 +2091,7 @@ "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "until the changes become available or try again later." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2073,52 +2104,43 @@ "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "until the changes become available or try again later." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Failed to detect distribution" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "An error '%s' occurred while checking what system you are using." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Important security updates" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Recommended updates" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Proposed updates" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backports" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Distribution updates" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Other updates" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Starting Update Manager" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Partial Upgrade" @@ -2188,37 +2210,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Software Updates" +msgid "Update Manager" +msgstr "Update Manager" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Software Updates" +msgid "Starting Update Manager" +msgstr "Starting Update Manager" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "U_pgrade" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Install" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Changes" +msgid "updates" +msgstr "updates" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Description" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Description of update" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2226,23 +2238,33 @@ "You are connected via roaming and may be charged for the data consumed by " "this update." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "You are connected via a wireless modem." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "It’s safer to connect the computer to AC power before updating." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Install Updates" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Changes" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Settings…" +msgid "Description" +msgstr "Description" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Install" +msgid "Description of update" +msgstr "Description of update" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Settings…" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2266,9 +2288,8 @@ msgstr "You have declined to upgrade to the new version of Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "You can upgrade at a later time by opening Update Manager and clicking on " @@ -2282,57 +2303,57 @@ msgid "Show and install available updates" msgstr "Show and install available updates" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Show version and exit" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Directory that contains the data files" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Check if a new Ubuntu release is available" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Check if upgrading to the latest development release is possible" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "Upgrade using the latest proposed version of the release upgrader" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Do not focus on map when starting" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Try to run a dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Do not check for updates when starting" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Test upgrade with a sandbox aufs overlay" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Running partial upgrade" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Show description of the package instead of the changelog" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Try upgrading to the latest release using the upgrader from $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2342,11 +2363,11 @@ "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Run the specified frontend" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2354,11 +2375,11 @@ "Check only if a new distribution release is available and report the result " "via the exit code" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Checking for a new Ubuntu release" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2366,58 +2387,58 @@ "For upgrade information, please visit:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "No new release found" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "New release '%s' available." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Run 'do-release-upgrade' to upgrade to it." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Ubuntu %(version)s Upgrade Available" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "You have declined the upgrade to Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Add debug output" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Show unsupported packages on this machine" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Show supported packages on this machine" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Show all packages with their status" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Show all packages in a list" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Support status summary of '%s':" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" @@ -2425,11 +2446,11 @@ "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "You have %(num)s packages (%(percent).1f%%) that are unsupported" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2437,122 +2458,152 @@ "Run with --show-unsupported, --show-supported or --show-all to see more " "details" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "No longer downloadable:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Unsupported: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Supported until %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Unsupported" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Unimplemented method: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "A file on disk" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb package" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Install missing package." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Package %s should be installed." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb package" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s needs to be marked as manually installed." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i obsolete entries in the status file" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Obsolete entries in dpkg status" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Obsolete dpkg status entries" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s needs to be marked as manually installed." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Remove lilo since grub is also installed.(See bug #314004 for details.)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Upgrading Ubuntu to version 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s update has been selected." -#~ msgstr[1] "%(count)s updates have been selected." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Welcome to Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Software updates are available for this computer." - -#~ msgid "Update Manager" -#~ msgstr "Update Manager" - -#~ msgid "Starting Update Manager" -#~ msgstr "Starting Update Manager" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "You are connected via a wireless modem." - -#~ msgid "_Install Updates" -#~ msgstr "_Install Updates" +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgid "Checking for a new ubuntu release" #~ msgstr "Checking for a new Ubuntu release" @@ -2685,6 +2736,9 @@ #~ "report this as a bug using the command 'ubuntu-bug update-manager' in a " #~ "terminal." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Upgrading Ubuntu to version 11.10" + #~ msgid "" #~ "These software updates have been issued since this version of Ubuntu was " #~ "released. If you don't want to install them now, choose \"Update Manager" diff -Nru update-manager-17.10.11/po/en_CA.po update-manager-0.156.14.15/po/en_CA.po --- update-manager-17.10.11/po/en_CA.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/en_CA.po 2017-12-23 05:00:38.000000000 +0000 @@ -4,11 +4,12 @@ # Adam Weinberger , 2005. # # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-05-11 19:33+0000\n" "Last-Translator: Daniel LeBlanc \n" "Language-Team: Canadian English \n" @@ -21,7 +22,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -29,13 +30,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Server for %s" @@ -43,20 +44,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Main server" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Custom servers" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Could not calculate sources.list entry" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -64,11 +65,11 @@ "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Failed to add the CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -83,13 +84,13 @@ "The error message was:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Remove package in bad state" msgstr[1] "Remove packages in bad state" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -110,15 +111,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "The server may be overloaded" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Broken packages" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -127,7 +128,7 @@ "software. Please fix them first using synaptic or apt-get before proceeding." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -148,26 +149,26 @@ " * Unofficial software packages not provided by Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "This is most likely a transient problem. Please try again later." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Could not calculate the upgrade" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Error authenticating some packages" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -177,40 +178,40 @@ "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" "The package '%s' is marked for removal but it is in the removal blacklist." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "The essential package '%s' is marked for removal." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Trying to install blacklisted version '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Can't install '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Can't guess meta-package" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -224,15 +225,15 @@ " Please install one of the packages above first using synaptic or apt-get " "before proceeding." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Reading cache" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Unable to get exclusive lock" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -240,11 +241,11 @@ "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Upgrading over remote connection not supported" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -258,11 +259,11 @@ "\n" "The upgrade will abort now. Please try without ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Continue running under SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -279,11 +280,11 @@ "If you continue, an additional ssh daemon will be started at port '%s'.\n" "Do you want to continue?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Starting additional sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -294,7 +295,7 @@ "started on port '%s'. If anything goes wrong with the running ssh, you can " "still connect to the additional one.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -303,29 +304,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Cannot upgrade" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "An upgrade from '%s' to '%s' is not supported with this tool." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Sandbox setup failed" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "It was not possible to create the sandbox environment." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Sandbox mode" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -335,17 +336,17 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Package 'debsig-verify' is installed" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -355,12 +356,12 @@ "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -368,11 +369,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Include latest updates from the Internet?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -392,16 +393,16 @@ "latest updates soon after upgrading.\n" "If you answer 'no' here, the network is not used at all." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "disabled on upgrade to %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "No valid mirror found" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -421,11 +422,11 @@ "If you select 'No' the upgrade will cancel." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Generate default sources?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -438,21 +439,21 @@ "Should default entries for '%s' be added? If you select 'No', the upgrade " "will cancel." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Repository information invalid" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Third party sources disabled" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -462,13 +463,13 @@ "enable them after the upgrade with the 'software-properties' tool or your " "package manager." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Package in inconsistent state" msgstr[1] "Packages in inconsistent state" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -487,11 +488,11 @@ "but no archive can be found for them. Please reinstall the packages manually " "or remove them from the system." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Error during update" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -499,13 +500,13 @@ "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Not enough free disk space" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -520,32 +521,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Calculating the changes" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Do you want to start the upgrade?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Upgrade canceled" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Could not download the upgrades" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -553,27 +554,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Error during commit" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Restoring original system state" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Could not install the upgrades" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -581,7 +582,7 @@ "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -592,7 +593,7 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -600,20 +601,20 @@ "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Remove obsolete packages?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Keep" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Remove" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -623,37 +624,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Required depends is not installed" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "The required dependency '%s' is not installed. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Checking package manager" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Preparing the upgrade failed" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Getting upgrade prerequisites failed" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -661,68 +662,68 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Updating repository information" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Invalid package information" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Fetching" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Upgrading" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Upgrade complete" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Searching for obsolete software" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "System upgrade is complete." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "The partial upgrade was completed." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms in use" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -732,11 +733,11 @@ "software is no longer supported, please switch it off and run the upgrade " "again when this is done." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -744,9 +745,9 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -754,8 +755,8 @@ "Upgrading may reduce desktop effects and performance in games and other " "graphically-intensive programs." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -769,7 +770,7 @@ "\n" "Do you want to continue?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -783,11 +784,11 @@ "\n" "Do you want to continue?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -795,11 +796,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "No ARMv6 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -811,11 +812,11 @@ "minimal architecture. It is not possible to upgrade your system to a new " "Ubuntu release with this hardware." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "No init available" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -831,15 +832,15 @@ "\n" "Are you sure you want to continue?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Sandbox upgrade using aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Use the given path to search for a cdrom with upgradable packages" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -847,57 +848,57 @@ "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "Perform a partial upgrade only (no sources.list rewriting)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Set datadir" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Please insert '%s' into the drive '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Fetching is complete" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Fetching file %li of %li at %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "About %s remaining" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Fetching file %li of %li" @@ -907,27 +908,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Applying changes" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "dependency problems - leaving unconfigured" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Could not install '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -939,7 +940,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -950,7 +951,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -958,20 +959,20 @@ "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "The 'diff' command was not found" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "A fatal error occurred" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -983,13 +984,13 @@ "report. The upgrade has aborted.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c pressed" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -998,134 +999,134 @@ "Are you sure you want to do that?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "To prevent data loss close all open applications and documents." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "No longer supported by Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Downgrade (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Remove (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "No longer needed (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Install (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Upgrade (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Media Change" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Show Difference >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Hide Difference" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Error" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Cancel" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Close" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Show Terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Hide Terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Information" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Details" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "No longer supported %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Remove %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Remove (was auto installed) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Install %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Upgrade %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Restart required" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Restart the system to complete the upgrade" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Restart Now" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1137,32 +1138,32 @@ "The system could be in an unusable state if you cancel the upgrade. You are " "strongly advised to resume the upgrade." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Cancel Upgrade?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li day" msgstr[1] "%li days" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li hour" msgstr[1] "%li hours" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minute" msgstr[1] "%li minutes" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1178,7 +1179,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1192,14 +1193,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1209,34 +1210,32 @@ "with a 56k modem." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "This download will take about %s with your connection. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Preparing to upgrade" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Getting new software channels" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Getting new packages" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Installing the upgrades" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Cleaning up" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1253,28 +1252,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d package is going to be removed." msgstr[1] "%d packages are going to be removed." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d new package is going to be installed." msgstr[1] "%d new packages are going to be installed." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d package is going to be upgraded." msgstr[1] "%d packages are going to be upgraded." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1285,28 +1284,28 @@ "\n" "You have to download a total of %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1314,69 +1313,69 @@ "There are no upgrades available for your system. The upgrade will now be " "canceled." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Reboot required" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "The upgrade is finished and a reboot is required. Do you want to do this now?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Could not run the upgrade tool" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Upgrade tool signature" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Upgrade tool" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Failed to fetch" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Fetching the upgrade failed. There may be a network problem. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Authentication failed" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1384,13 +1383,13 @@ "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Failed to extract" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1398,13 +1397,13 @@ "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Verification failed" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1412,27 +1411,27 @@ "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Can not run the upgrade" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "The error message is '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1444,73 +1443,73 @@ "aborted.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Aborting" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Demoted:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Continue [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Details [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "No longer supported: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Remove: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Install: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Upgrade: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Continue [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1577,7 +1576,7 @@ msgstr "Distribution Upgrade" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1596,166 +1595,180 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Please wait, this can take some time." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Update is complete" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Could not find the release notes" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "The server may be overloaded. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Could not download the release notes" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Please check your internet connection." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Upgrade" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Release Notes" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Downloading additional package files..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "File %s of %s at %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "File %s of %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Open Link in Browser" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Copy Link to Clipboard" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Downloading file %(current)li of %(total)li with %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Downloading file %(current)li of %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Upgrade information" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Install" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Downloading list of changes..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s update has been selected." +msgstr[1] "%(count)s updates have been selected." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s will be downloaded." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "The update has already been downloaded, but not installed" -msgstr[1] "The updates have already been downloaded, but not installed" +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Unknown download size." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "The package information was last updated %(days_ago)s day ago." msgstr[1] "The package information was last updated %(days_ago)s days ago." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1764,34 +1777,44 @@ msgstr[1] "The package information was last updated %(hours_ago)s hours ago." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Welcome to Ubuntu" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1802,7 +1825,7 @@ "least an additional %s of disk space on '%s'. Empty your trash and remove " "temporary packages of former installations using 'sudo apt-get clean'." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1810,23 +1833,23 @@ "The computer needs to restart to finish installing updates. Please save your " "work before continuing." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Reading package information" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Connecting..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "You may not be able to check for updates or download new updates." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Could not initialize the package information" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1840,7 +1863,7 @@ "Please report this bug against the 'update-manager' package and include the " "following error message:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1852,31 +1875,31 @@ "Please report this bug against the 'update-manager' package and include the " "following error message:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (New install)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Size: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "From version %(old_version)s to %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Version %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Release upgrade not possible right now" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1885,21 +1908,21 @@ "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Downloading the release upgrade tool" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "New Ubuntu release '%s' is available" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Software index is broken" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1909,6 +1932,17 @@ "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "New release '%s' available." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Cancel" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1918,22 +1952,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Cancel" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Building Updates List" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1957,20 +1987,20 @@ " * Unofficial software packages not provided by Ubuntu\n" " * Normal changes of a pre-release version of Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Downloading changelog" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Other updates (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -1978,7 +2008,7 @@ "Failed to download the list of changes.\n" "Please check your Internet connection." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1987,7 +2017,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2000,7 +2030,7 @@ "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "until the changes become available or try again later." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2013,52 +2043,43 @@ "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "until the changes become available, or try again later." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Failed to detect distribution" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "An error '%s' occurred while checking what system you are using." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Important security updates" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Recommended updates" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Proposed updates" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backports" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Distribution updates" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Other updates" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Starting Update Manager" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Partial Upgrade" @@ -2128,59 +2149,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Software Updates" +msgid "Update Manager" +msgstr "Update Manager" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Software Updates" +msgid "Starting Update Manager" +msgstr "Starting Update Manager" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "U_pgrade" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Install" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Changes" +msgid "updates" +msgstr "updates" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Description" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Description of update" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Install Updates" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Changes" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "" +msgid "Description" +msgstr "Description" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Install" +msgid "Description of update" +msgstr "Description of update" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2204,9 +2225,8 @@ msgstr "You have declined to upgrade to the new Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "You can upgrade at a later time by opening Update Manager and click on " @@ -2220,57 +2240,57 @@ msgid "Show and install available updates" msgstr "Show and install available updates" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Show version and exit" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Directory that contains the data files" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Check if a new Ubuntu release is available" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Check if upgrading to the latest devel release is possible" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "Upgrade using the latest proposed version of the release upgrader" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Do not focus on map when starting" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Try to run a dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Test upgrade with a sandbox aufs overlay" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Running partial upgrade" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Try upgrading to the latest release using the upgrader from $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2280,11 +2300,11 @@ "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Run the specified frontend" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2292,176 +2312,222 @@ "Check only if a new distribution release is available and report the result " "via the exit code" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "No new release found" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "New release '%s' available." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Run 'do-release-upgrade' to upgrade to it." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Ubuntu %(version)s Upgrade Available" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "You have declined the upgrade to Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Unimplemented method: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "A file on disk" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb package" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Install missing package." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Package %s should be installed." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb package" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s needs to be marked as manually installed." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i obsolete entries in the status file" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Obsolete entries in dpkg status" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Obsolete dpkg status entries" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s needs to be marked as manually installed." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Remove lilo since grub is also installed.(See bug #314004 for details.)" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s update has been selected." -#~ msgstr[1] "%(count)s updates have been selected." - -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Welcome to Ubuntu" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Update Manager" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "Starting Update Manager" -#~ msgstr "Starting Update Manager" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "_Install Updates" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "Checking for a new ubuntu release" #~ msgstr "Checking for a new Ubuntu release" @@ -2501,3 +2567,8 @@ #~ msgid "There are no updates to install" #~ msgstr "There are no updates to install" + +#~ msgid "The update has already been downloaded, but not installed" +#~ msgid_plural "The updates have already been downloaded, but not installed" +#~ msgstr[0] "The update has already been downloaded, but not installed" +#~ msgstr[1] "The updates have already been downloaded, but not installed" diff -Nru update-manager-17.10.11/po/en_GB.po update-manager-0.156.14.15/po/en_GB.po --- update-manager-17.10.11/po/en_GB.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/en_GB.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the PACKAGE package. # Abigail Brady , Bastien Nocera , 2005. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-20 23:02+0000\n" "Last-Translator: Andi Chandler \n" "Language-Team: \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Server for %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Main server" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Custom servers" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Could not calculate the sources.list entry" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Failed to add the CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,13 +83,13 @@ "The error message was:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Remove package in bad state" msgstr[1] "Remove packages in bad state" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -109,15 +110,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "The server may be overloaded" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Broken packages" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -126,7 +127,7 @@ "software. Please fix them first using synaptic or apt-get before proceeding." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -147,11 +148,11 @@ " * Unofficial software packages not provided by Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "This is most likely a temporary problem, please try again later." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -159,16 +160,16 @@ "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Could not determine the upgrade" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Error authenticating some packages. Continue?" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -178,29 +179,29 @@ "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" "The package '%s' is marked for removal but it is in the removal blacklist." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "The essential package '%s' is marked for removal." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Trying to install blacklisted version '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Can't install '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -209,11 +210,11 @@ "using 'ubuntu-bug update-manager' in a terminal." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Can't guess meta-package" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -227,15 +228,15 @@ " Please install one of the packages above first using synaptic or apt-get " "before proceeding." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Reading cache" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Unable to get exclusive lock" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -243,11 +244,11 @@ "This usually means that another package management application (like apt-get " "or aptitude) is already running. Please close that application first." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Upgrading over remote connection not supported" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -261,11 +262,11 @@ "\n" "The upgrade will abort now. Please try without SSH." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Continue running under SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -282,11 +283,11 @@ "If you continue, an additional SSH daemon will be started at port '%s'.\n" "Do you want to continue?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Starting additional sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -297,7 +298,7 @@ "started on port '%s'. If anything goes wrong with the running ssh you can " "still connect to the additional one.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -310,29 +311,29 @@ "with e.g.:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Cannot upgrade" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "An upgrade from \"%s\" to \"%s\" is not supported with this tool." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Sandbox setup failed" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "It was not possible to create the sandbox environment." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Sandbox mode" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -347,17 +348,17 @@ "*No* changes written to a system directory from now until the next reboot " "are permanent." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Package 'debsig-verify' is installed" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -367,12 +368,12 @@ "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Can not write to '%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -383,11 +384,11 @@ "upgrade can not continue.\n" "Please make sure that the system directory is writable." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Include latest updates from the Internet?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -407,16 +408,16 @@ "latest updates as soon as possible after upgrading.\n" "If you answer 'no' here, the network is not used at all." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "disabled on upgrade to %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "No valid mirror found" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -436,11 +437,11 @@ "If you select 'No' the upgrade will cancel." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Generate default sources?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -453,11 +454,11 @@ "Should default entries for '%s' be added? If you select 'No', the upgrade " "will cancel." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Repository information invalid" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -465,11 +466,11 @@ "Upgrading the repository information resulted in an invalid file, so a bug " "reporting process is being started." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Third party sources disabled" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -479,13 +480,13 @@ "enable them after the upgrade with the 'software-properties' tool or your " "package manager." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Package in inconsistent state" msgstr[1] "Packages in inconsistent state" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -504,11 +505,11 @@ "but no archive can be found for them. Please reinstall the packages manually " "or remove them from the system." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Error during update" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -516,13 +517,13 @@ "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Not enough free disk space" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -537,21 +538,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Calculating the changes" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Do you want to start the upgrade?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Upgrade cancelled" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -559,12 +560,12 @@ "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Could not download the upgrades" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -574,27 +575,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Error during commit" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Restoring original system state" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Could not install the upgrades" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -602,7 +603,7 @@ "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -619,7 +620,7 @@ "upgrade/ to the bug report.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -627,20 +628,20 @@ "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Remove obsolete packages?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Keep" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Remove" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -650,27 +651,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Required depends are not installed" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "The required dependency '%s' is not installed. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Checking package manager" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Preparing the upgrade failed" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -678,11 +679,11 @@ "Preparing the system for the upgrade failed, so a bug reporting process is " "being started." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Getting upgrade prerequisites failed" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -694,69 +695,69 @@ "\n" "Additionally, a bug reporting process is being started." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Updating repository information" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Failed to add the CDROM" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Sorry, adding the CDROM was not successful." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Invalid package information" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Fetching" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Upgrading" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Upgrade complete" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "The upgrade has completed but there were errors during the upgrade process." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Searching for obsolete software" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "System upgrade is complete." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "The partial upgrade was completed." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms in use" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -766,11 +767,11 @@ "software is no longer supported, please disable 'evms' and then run the " "upgrade again." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -782,9 +783,9 @@ "https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx Do you want to " "continue with the upgrade?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -792,8 +793,8 @@ "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -807,7 +808,7 @@ "\n" "Do you wish to continue?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -821,11 +822,11 @@ "\n" "Do you wish to continue?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "No i686 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -837,11 +838,11 @@ "minimal architecture. It is not possible to upgrade your system to a new " "Ubuntu release with this hardware." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "No ARMv6 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -853,11 +854,11 @@ "minimal architecture. It is not possible to upgrade your system to a new " "Ubuntu release with this hardware." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "No init available" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -873,15 +874,15 @@ "\n" "Are you sure you want to continue?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Sandbox upgrade using aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Use the given path to search for a CD-ROM with upgradeable packages" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -889,57 +890,57 @@ "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*DEPRECATED* this option will be ignored" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "Perform a partial upgrade only (no sources.list rewriting)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Disable GNU screen support" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Set datadir" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Please insert '%s' into the drive '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Fetching is complete" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Fetching file %li of %li at %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "About %s remaining" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Fetching file %li of %li" @@ -949,27 +950,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Applying changes" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "dependency problems - leaving unconfigured" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Could not install '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -981,7 +982,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -992,7 +993,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1000,20 +1001,20 @@ "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "The 'diff' command was not found" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "A fatal error occurred" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1025,13 +1026,13 @@ "report. The upgrade has aborted.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-C pressed" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1040,134 +1041,134 @@ "you sure that you want to do that?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "To prevent data loss close all open applications and documents." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "No longer supported by Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Downgrade (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Remove (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "No longer needed (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Install (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Upgrade (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Media Change" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Show Difference >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Hide Difference" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Error" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Cancel" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Close" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Show Terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Hide Terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Information" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Details" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "No longer supported %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Remove %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Remove (was auto installed) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Install %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Upgrade %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Restart required" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Restart the system to complete the upgrade" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Restart Now" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1179,32 +1180,32 @@ "Stopping the upgrade may render your system unusable. It is recommended that " "the upgrade is resumed and allowed to complete." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Cancel Upgrade?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li day" msgstr[1] "%li days" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li hour" msgstr[1] "%li hours" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minute" msgstr[1] "%li minutes" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1220,7 +1221,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1234,14 +1235,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1251,34 +1252,32 @@ "with a 56k modem." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "This download should take about %s with your connection. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Preparing to upgrade" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Getting new software channels" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Getting new packages" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Installing the upgrades" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Cleaning up" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1295,28 +1294,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d package is going to be removed." msgstr[1] "%d packages are going to be removed." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d new package is going to be installed." msgstr[1] "%d new packages are going to be installed." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d package is going to be upgraded." msgstr[1] "%d packages are going to be upgraded." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1327,7 +1326,7 @@ "\n" "You have to download a total of %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1335,7 +1334,7 @@ "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be cancelled." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1343,16 +1342,16 @@ "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be cancelled." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Removing the packages can take several hours. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "The software on this computer is up to date." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1360,37 +1359,37 @@ "There are no upgrades available for your system. The upgrade will now be " "cancelled." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Reboot required" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "The upgrade is finished and a reboot is required. Do you want to do this now?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "authenticate '%(file)s' against '%(signature)s' " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "extracting '%s'" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Could not run the upgrade tool" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1398,33 +1397,33 @@ "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Upgrade tool signature" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Upgrade tool" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Failed to fetch" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Fetching the upgrade failed. There may be a network problem. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Authentication failed" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1432,13 +1431,13 @@ "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Failed to extract" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1446,13 +1445,13 @@ "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Verification failed" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1460,15 +1459,15 @@ "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Cannot run the upgrade" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1476,13 +1475,13 @@ "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "The error message is '%s'" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1494,73 +1493,73 @@ "aborted.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Aborting" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Demoted:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "To continue please press [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Continue [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Details [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "No longer supported: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Remove: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Install: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Upgrade: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Continue? [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1627,9 +1626,8 @@ msgstr "Distribution Upgrade" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Upgrading Ubuntu to version 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Upgrading Ubuntu to version 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1647,84 +1645,85 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Please wait, this can take some time." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Update is complete" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Could not find the release notes" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "The server may be overloaded. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Could not download the release notes" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Please check your internet connection." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Upgrade" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Release Notes" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Downloading additional package files..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "File %s of %s at %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "File %s of %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Open Link in Browser" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Copy Link to Clipboard" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Downloading file %(current)li of %(total)li with %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Downloading file %(current)li of %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Your Ubuntu release is not supported anymore." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1732,52 +1731,58 @@ "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Upgrade information" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Install" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Name" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "No network connection detected, you can not download changelog information." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Downloading list of changes..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Deselect All" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Select _All" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s update has been selected." +msgstr[1] "%(count)s updates have been selected." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s will be downloaded." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "The update has already been downloaded, but not installed." msgstr[1] "The updates have already been downloaded, but not installed." @@ -1785,11 +1790,18 @@ msgid "There are no updates to install." msgstr "There are no updates to install." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Unknown download size." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1797,7 +1809,7 @@ "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1806,14 +1818,14 @@ "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "The package information was last updated %(days_ago)s day ago." msgstr[1] "The package information was last updated %(days_ago)s days ago." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1822,34 +1834,46 @@ msgstr[1] "The package information was last updated %(hours_ago)s hours ago." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "The package information was last updated about %s minutes ago." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "The package information was just updated." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Software updates may be available for your computer." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Welcome to Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Since this version of Ubuntu was released, these software updates have been " +"issued." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Software updates are available for this computer." + +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1860,7 +1884,7 @@ "least an additional %s of disk space on '%s'. Empty your trash and remove " "temporary packages of former installations using 'sudo apt-get clean'." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1868,23 +1892,23 @@ "The computer needs to restart to finish installing updates. Please save your " "work before continuing." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Reading package information" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Connecting..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "You may not be able to check for updates or download new updates." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Could not initialise the package information" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1898,7 +1922,7 @@ "Please report this bug for the 'update-manager' package and try to include " "the following error message:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1910,31 +1934,31 @@ "Please report this bug in the 'update-manager' package and try to include " "the following error message:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (New install)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Size: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "From version %(old_version)s to %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Version %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Release upgrade not possible right now" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1943,21 +1967,21 @@ "The release upgrade cannot be performed currently, please try again later. " "The server reported: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Downloading the release upgrade tool" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "New Ubuntu release '%s' is available" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Software index is broken" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1967,6 +1991,17 @@ "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "New release '%s' available." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Cancel" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Check for Updates" @@ -1976,22 +2011,18 @@ msgstr "Install All Available Updates" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Cancel" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Changelog" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Updates" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Building Updates List" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2015,20 +2046,20 @@ " * Unofficial software packages not provided by Ubuntu\n" " * Normal changes of a pre-release version of Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Downloading changelog" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Other updates (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "This update does not come from a source that supports changelogs." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2036,7 +2067,7 @@ "Failed to download the list of changes. \n" "Please check your Internet connection." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2049,7 +2080,7 @@ "Available version: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2062,7 +2093,7 @@ "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "until the changes become available or try again later." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2075,52 +2106,43 @@ "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "until the changes become available or try again later." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Failed to detect the distribution" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "An error '%s' occurred while checking which system you are using." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Important security updates" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Recommended updates" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Proposed updates" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backports" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Distribution updates" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Other updates" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Starting Update Manager" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Partial Upgrade" @@ -2190,37 +2212,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Software Updates" +msgid "Update Manager" +msgstr "Update Manager" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Software Updates" +msgid "Starting Update Manager" +msgstr "Starting Update Manager" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "U_pgrade" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Install" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Changes" +msgid "updates" +msgstr "updates" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Description" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Description of update" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2228,23 +2240,33 @@ "You are connected via roaming and may be charged for the data consumed by " "this update." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "You are connected via a wireless modem." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "It’s safer to connect the computer to AC power before updating." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Install Updates" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Changes" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Settings..." +msgid "Description" +msgstr "Description" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Install" +msgid "Description of update" +msgstr "Description of update" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Settings..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2268,9 +2290,8 @@ msgstr "You have declined to upgrade to the new Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "You can upgrade at a later time by opening Update Manager and click on " @@ -2284,57 +2305,57 @@ msgid "Show and install available updates" msgstr "Show and install available updates" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Show version and exit" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Directory that contains the data files" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Check if a new Ubuntu release is available" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Check if upgrading to the latest devel release is possible" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "Upgrade using the latest proposed version of the release upgrader" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Do not focus on map when starting" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Try to run a dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Do not check for updates when starting" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Test upgrade with a sandbox aufs overlay" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Running partial upgrade" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Show description of the package instead of the changelog" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Try upgrading to the latest release using the upgrader from $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2344,11 +2365,11 @@ "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Run the specified frontend" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2356,11 +2377,11 @@ "Check only if a new distribution release is available and report the result " "via the exit code" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Checking for a new Ubuntu release" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2368,58 +2389,58 @@ "For upgrade information, please visit:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "No new release found" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "New release '%s' available." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Run 'do-release-upgrade' to upgrade to it." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Ubuntu %(version)s Upgrade Available" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "You have declined the upgrade to Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Add debug output" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Show unsupported packages on this machine" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Show supported packages on this machine" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Show all packages with their status" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Show all packages in a list" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Support status summary of '%s':" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" @@ -2427,11 +2448,11 @@ "You have %(num)s packages (%(percent).1f%%) that can not/no longer be " "downloaded" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "You have %(num)s packages (%(percent).1f%%) that are unsupported" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2439,122 +2460,152 @@ "Run with --show-unsupported, --show-supported or --show-all to see more " "details" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "No longer downloadable:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Unsupported: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Supported until %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Unsupported" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Unimplemented method: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "A file on disk" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb package" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Install missing package." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Package %s should be installed." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb package" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s needs to be marked as manually installed." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i obsolete entries in the status file" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Obsolete entries in dpkg status" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Obsolete dpkg status entries" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s needs to be marked as manually installed." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Remove lilo since grub is also installed.(See bug #314004 for details.)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "After your package information was updated, the essential package '%s' " -#~ "can not be found anymore, so a bug reporting process is being started." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Upgrading Ubuntu to version 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s update has been selected." -#~ msgstr[1] "%(count)s updates have been selected." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Welcome to Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Since this version of Ubuntu was released, these software updates have " -#~ "been issued." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Software updates are available for this computer." - -#~ msgid "Update Manager" -#~ msgstr "Update Manager" - -#~ msgid "Starting Update Manager" -#~ msgstr "Starting Update Manager" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "You are connected via a wireless modem." - -#~ msgid "_Install Updates" -#~ msgstr "_Install Updates" +#~ "After your package information was updated, the essential package '%s' " +#~ "can not be found anymore, so a bug reporting process is being started." #~ msgid "Checking for a new ubuntu release" #~ msgstr "Checking for a new ubuntu release" @@ -2713,3 +2764,6 @@ #~ "These software updates have been issued since this version of Ubuntu was " #~ "released. If you don't want to install them now, choose \"Update Manager" #~ "\" from the Administration Menu later." + +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Upgrading Ubuntu to version 11.10" diff -Nru update-manager-17.10.11/po/eo.po update-manager-0.156.14.15/po/eo.po --- update-manager-17.10.11/po/eo.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/eo.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-21 15:10+0000\n" "Last-Translator: Michael Moroni \n" "Language-Team: Esperanto \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Servilo por %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Ĉefa servilo" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Propraj serviloj" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Ne eblis kalkuli eron de sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Neeblas trovi ajnan pakaĵdosieron. Ĉu eble ĉi tiu ne estas Ubuntu-disko aŭ " "neĝustas ĝia arkitekturo?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Malsukcesis aldoni la KD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,13 +83,13 @@ "La erarmesaĝo estis:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Forigi pakaĵon en erara stato" msgstr[1] "Forigi pakaĵojn en erara stato" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -109,15 +110,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Eble la servilo estas superŝarĝita" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Difektaj pakaĵoj" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -126,7 +127,7 @@ "ripari. Bonvolu ripari ilin per Synaptic aŭ Apt-get antaŭ ol daŭrigi." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -147,11 +148,11 @@ " * Neoficiala programaraj pakaĵoj ne provizitaj de Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Ĉi tio probable estas maldaŭra problemo, bonvolu reprovi poste." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -159,16 +160,16 @@ "Se neniu el ĉi tiuj aplikas, do bonvolu raporti tion kiel cimo per la " "komando 'ubuntu-bug update-manager' en terminalo." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Ne eblas kalkuli la ĝisdatigon" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Eraro dum aŭtentigado de iuj pakaĵoj" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -177,7 +178,7 @@ "Ne eblis aŭtentigi iujn pakaĵojn, eble pro maldaŭra reta problemo. Eble vi " "volas reprovi poste. Vidu malsupre por listo de neaŭtentigitaj pakaĵoj." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -185,22 +186,22 @@ "La pakaĵo '%s' estas markita por forigi sed ĝi estas en la nigra listo por " "forigoj." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "La esenca pakaĵo '%s' estas markita por forigi." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Provo instali version '%s', kiu estas en la nigra listo" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Ne eblis instalo de '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -209,11 +210,11 @@ "la komando 'ubuntu-bug update-manager' en terminalo." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Ne eblas diveni meta-pakaĵon" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -227,15 +228,15 @@ " Bonvolu unue instali iun el la suprajn pakaĵojn uzante synaptic aŭ apt-get " "antaŭ ol daŭrigi." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Legado de kaŝmemoro" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Ne eblas ekskluzive ŝlosi." -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -243,11 +244,11 @@ "Tio plej ofte signifas ke alia pakaĵomastruma aplikaĵo (eble apt-get aŭ " "aptitude) jam ruliĝas. Bonvolu unue fermi tiun aplikaĵon." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Promociado trans fora konekto ne subtenata" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -260,11 +261,11 @@ "\n" "La ĝisdatigado nun ĉesos. Bonvolu reprovi sen ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Ĉu daŭrigi ruladon sub SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -280,11 +281,11 @@ "Se vi daŭrigas, aldona ssh-demono estos lanĉata je pordo '%s\n" "Ĉiu vi volas daŭrigi?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Lanĉante ekstran sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -295,7 +296,7 @@ "je pordo '%s'. Se io ajn fiaskas pri la ruliĝanta ssh, vi ankoraŭ povos " "konekti al la aldona.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -308,29 +309,29 @@ "pordon per ekz.:\n" "‘%s’" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Ne povas ĝisdatigi" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Ĉi tiu ilo ne ebligas ĝisdatigon de '%s' al '%s'." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Instalo de la testludejo malsukcesis." -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Estis neeble krei la testludejan medion." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Testludeja reĝimo" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -345,18 +346,18 @@ "Ekde nun ĝis la sekva restartigo, *neniu* ŝanĝo al sistemdosierujo estos " "permanenta." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Via pitona instalado estas damaĝita. Bonvolu ripari la simbolan ligilon '/" "usr/bin/python'." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Pakaĵo 'debsig-verify' estas instalita." -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -366,12 +367,12 @@ "Bonvolu unue forigi ĝin per synaptic aŭ 'apt-get remove debsig-verify' kaj " "re-ruli la aktualigon." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Ne povis konservi al ‘%s’" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -382,11 +383,11 @@ "daŭrigi la promociadon.\n" "Bonvolu certigi ke la sistemdosierujo estas skribebla." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Ĉu inkluzivi la plej lastajn ĝisdatigojn el la interreto?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -406,16 +407,16 @@ "instalu la plej novajn ĝisdatigojn baldaŭ post ĝisdatigo. Se vi respondas " "'ne' ĉi tie, la reto estos entute ne uzata." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "malaktivigita dum ĝisdatigo al %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Ne eblis trovi validan spegulejon" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -435,11 +436,11 @@ "Se vi decidas, ke 'ne', la ĝisdatigo ĉesos." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Generi defaŭltajn fontojn?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -452,11 +453,11 @@ "Ĉu vi volas aldoni normajn valorojn por '%s'? Se vi decidas, ke 'ne', la " "ĝisdatigo nuliĝos." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Deponeja informo ne valida" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -464,11 +465,11 @@ "La promociado de la deponejaj informoj rezultiĝis en nevalidan dosieron, do " "cimraportaĵo estas aŭtomate farata." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Aliulaj fontoj malŝaltitaj" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -478,13 +479,13 @@ "povas reŝalti ilin post la ĝisdatigo per la ilo 'software-properties' aŭ per " "via pakaĵadministrilo." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Pakaĵo en nekohera stato" msgstr[1] "Pakaĵoj en nekohera stato" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -503,11 +504,11 @@ "reinstalitaj, sed ne troviĝas arkivo por ili. Bonvolu reinstali la pakaĵojn " "permane aŭ forigi ilin." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Eraro dum ĝisdatigo" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -515,13 +516,13 @@ "Problemo okazis dum la ĝisdatigo. Kutime tio okazas pro iu reta problemo, " "bonvolu kontroli vian retan konekton kaj reprovi." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Ne estas sufiĉa libera loko en disko" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -536,21 +537,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Kalkulado de la ŝanĝoj" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Ĉu vi volas komenci la ĝisdatigon?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Ĝisdatigo nuligita" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -558,12 +559,12 @@ "La ĝisdatigado nun ĉesos kaj la originala sistemstato estos restaŭrita. Vi " "povas daŭrigi la ĝisdatigadon je alia fojo." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Ne eblis elŝuti la ĝisdatigojn" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -574,27 +575,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Eraro dum farado" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Restarigante originan sisteman staton" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Ne eblis instali la ĝisdatigojn" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -602,7 +603,7 @@ "La ĝisdatigo ĉesiĝis. Via sistemo povas esti en neuzebla stato. " "Riparproceduro nun ruliĝos (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -619,7 +620,7 @@ "dist-upgrade/ al la cimraportaĵo.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -627,20 +628,20 @@ "La ĝisdatigo ĉesiĝis. Bonvolu kontroli vian retkonekton aŭ instal-" "datumportilojn kaj reprovu. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Ĉu forigi arkaikajn pakaĵojn?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "Konservi" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "Forigi" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -650,27 +651,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Bezonataj dependaĵoj ne estas instalitaj" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "La bezonata dependaĵo '%s' ne estas instalita. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Kontrolado de pakaĵa direktisto" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Preparado de la ĝisdatigo malsukcesis" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -678,11 +679,11 @@ "Pretigado de la sistemo por la ĝisdatigo fiaskis, do raporto de cimo estas " "startigota." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Akirado de risursoj bezonataj por la ĝisdatigo malsukcesis" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -694,68 +695,68 @@ "\n" "Aldone, cimraportaĵo estas farata." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Ĝisdatigo de deponeja informo" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Fiaskis aldoni la lumdiskon" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Bedaŭrinde la aldono de la lumdisko fiaskis." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Nevalida pakaĵa informo" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Prenado" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Aktualigo" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Ĝisdatigo finita" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "La ĝisdatigo kompletiĝis sed okazis eraroj dum la ĝisdatigado." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Serĉado de ne plu uzataj programaroj" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Sistema ĝisdatigo estas kompleta." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "La parta ĝisdatigo finiĝis." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms uzata" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -765,12 +766,12 @@ "programaro 'evms' ne plu estas subtenata, bonvolu malŝalti ĝin kaj poste " "denove rulu la ĝisdatigon." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "Via grafika aparataro eble ne estas tute subtenata de Ubuntu 12.04 LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -782,9 +783,9 @@ "vidu https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx Ĉu vi volas " "daŭrigi kun la promocio?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -792,8 +793,8 @@ "Promociado povas redukti labortablajn efektojn, kaj rendimenton en ludoj kaj " "aliaj grafike intensaj programoj." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -806,7 +807,7 @@ "Ubuntu 10.04 LTS.\n" "Ĉu vi volas daŭrigi?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -818,11 +819,11 @@ "versio de tiu pelilo kiu funkcias per via aparataro en Ubuntu 10.04 LTS.\n" "Ĉu vi volas daŭrigi?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Neniu i686-procesoro" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -833,11 +834,11 @@ "pakaĵoj kunmetiĝis kun optimigoj kiuj postulas minimume i686-procesoron. Ne " "eblas ĝisdatigi vian sistemon al nova Ubuntu-eldono kun ĉi tiu aparataro." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Ne estas ARMv6-CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -849,11 +850,11 @@ "postulas la ARMv6-arkitekturon. Ne eblas ĝisdatigi vian sistemon al nova " "Ubuntu-eldono kun ĉi tiu aparataro." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Ne disponeblas 'init'" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -867,16 +868,16 @@ "agordojn de via virtuala maŝino.\n" "Ĉu vi vere volas daŭrigi?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Proveja ĝisdatigo uzanta aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Uzu la donitan vojprefikson por serĉi lumdiskon kun aktualigeblaj pakaĵoj" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -884,57 +885,57 @@ "Uzu fasadon. Aktuale disponeblaj: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*EVITINDA* ĉi tiu opcio estos ignorata" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "Ĝisdatigu nur parte (ne rekonservu la dosieron sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Malŝalti GNU-ekransubtenon" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Agordi datendosierujon" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Bonvolu enmeti je '%s' en ingon '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Prenado estas preta" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Prenas dosieron %li el %li per %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Ĉirkaŭ %s restas" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Prenante dosieron %li el %li" @@ -944,27 +945,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Aplikanta ŝanĝojn" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "dependecaj problemoj - agordado ne farita" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Ne eblis instali '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -976,7 +977,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -987,7 +988,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -995,20 +996,20 @@ "Vi perdos ĉiujn ŝanĝojn, kiujn vi faris pri ĉi tiu agorda dosiero, se vi " "elektas anstataŭigi ĝin per pli nova versio." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "La komando 'diff' ne estis trovita" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Neriparebla eraro okazis" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1021,13 +1022,13 @@ "Via originala sources.list estis konservita en /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Stir-c premita" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1036,136 +1037,136 @@ "Ĉu vi certas ke vi volas fari tion?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Por preventi datuman perdon, fermu ĉiujn malfermitajn aplikaĵojn kaj " "dokumentojn." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Ne plu subtenata de Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Malĝisdatigi (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Forigi (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Ne plu nepra (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Instali (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Ĝisdatigi (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Ŝanĝo de Datumportilo" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Montru la diferencon >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Kaŝu la diferencon" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Eraro" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Rezignu" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "F&ermu" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Vidigu Terminalon >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Kaŝu Terminalon" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Informoj" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Detaloj" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Ne plu subtenata %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Forigi %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Forigi %s (estis aŭtomate instalita)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Instali je %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Ĝisdatigi %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Necesas restartigo" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Restartigu la sistemon por kompletigi la ĝisdatigon" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Restartigi nun" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1177,32 +1178,32 @@ "La sistemo povas esti neuzebla, se la ĝisdatigo estas interrompita nun. " "Estas rekomendite daŭrigi la ĝisdatigon." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Rezigni ĝisdatigadon?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li tago" msgstr[1] "%li tagoj" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li horo" msgstr[1] "%li horoj" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minuto" msgstr[1] "%li minutoj" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1218,7 +1219,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1232,14 +1233,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1249,34 +1250,32 @@ "%s per 56k-modemo." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Ĉi-tiu elŝuto daŭros ĉirkaŭ %s tra via konekto. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Pretigi por ĝisdatigi" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Akirado de novaj programaraj kanaloj" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Prenado de novaj pakaĵoj" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Intstalanta ĝisdatigojn" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Fina purigado" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1293,28 +1292,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d pakaĵo estas forigota." msgstr[1] "%d pakaĵoj estas forigotaj." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d nova pakaĵo estas instalota." msgstr[1] "%d novaj pakaĵoj estas instalotaj." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d pakaĵo estas ĝisdatigota." msgstr[1] "%d pakaĵoj estas ĝisdatigotaj." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1325,7 +1324,7 @@ "\n" "Vi devas elŝuti totalon de %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1333,7 +1332,7 @@ "La instalado de promocio povas daŭri plurajn horojn. Post la fino de la " "elŝutado, ne plu eblos nuligi la procezon." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1341,53 +1340,53 @@ "La akirado kaj instalado de la promocio povas daŭri plurajn horojn. Post la " "fino de la elŝutado, ne plu eblos nuligi la procezon." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "La forigo de la pakaĵoj povas daŭri plurajn horojn. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "La programaro sur ĉi tiu komputilo estas ĝisdata." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" "Neniuj aktualigoj estas disponeblaj por via sistemo. La ĝisdatigo nun ĉesos." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Necesas restartigo" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "La ĝisdatigado finiĝis kaj restartigo bezonatas. Ĉu vi volas nun fari tion?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "aŭtentigi '%(file)s' per '%(signature)s' " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "eltiras ‘%s’" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Ne eblis ruli la ĝisdatigilon" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1395,33 +1394,33 @@ "Tre ŝajnas, ke tio estas cimo en la promociilo. Bonvolu raporti tion kiel " "cimo per la komando 'ubuntu-bug update-manager' en terminalo." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Ĝisdatigu ilan subskribon" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Ĝisdatigilo" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Malsukcesis alporti" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Malsukcesis alporti la ĝisdatigon. Eble okazis reta problemo. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Malsukcesis aŭtentikigi" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1429,13 +1428,13 @@ "Malsukcesis aŭtentikigi la ĝisdatigon. Eble okazis problemo pri la reto aŭ " "pri la servilo. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Malsukcesis ekstrakti" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1443,13 +1442,13 @@ "Malsukcesis malpaki la ĝisdatigon. Eble okazis problemo pri la reto aŭ pri " "la servilo. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Fiaskis la programkontrolo" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1457,15 +1456,15 @@ "Konfirmado de la ĝisdatigo malsukcesis. Eble estas problemo pri la reto aŭ " "servilo. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Ne povas ruli la ĝisdatigon" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1473,13 +1472,13 @@ "Tio kutime estas kaŭzata pro sistemo kiam /tmp estas surmetita kun noexec. " "Bonvolu resurmeti sen noexec kaj ruli la promocion denove." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "La erarmesaĝo estas '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1491,73 +1490,73 @@ "Via originala sources.list estis konservita en /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Ĉesante" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Malĝisdatigi:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Por daŭrigi premu [ENIGKLAVON]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Daŭrigi [jN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Detaloj [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "j" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Ne plu subtenata: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Forigi: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Instali: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Ĝisdatigi: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Daŭrigi [Jn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1624,9 +1623,8 @@ msgstr "Ĝisdatigo de la distribuaĵo" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Promocianta Ubuntu al versio 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Promocias Ubuntu al versio 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1644,84 +1642,85 @@ msgid "Terminal" msgstr "Terminalo" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Bonvolu atendi. Tio eble longe daŭros." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Ĝisdatigado estas finita." -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Ne eblis trovi la eldonajn notojn" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "La servilo eble estas tro uzata. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Ne eblis elŝuti la eldonajn notojn" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Bonvolu kontroli vian interretan konekton." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Promocii" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Eldonaj Notoj" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Elŝutas aldonajn pakaĵdosierojn..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Bestand %s van %s met %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Dosiero %s el %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Malfermi ligilon en foliumilo" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Kopii ligilon al tondejo" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Elŝutante dosieron %(current)li el %(total)li per %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Elŝutante dosieron %(current)li el %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Via Ubuntu-eldono estas ne plu subtenata." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1729,52 +1728,58 @@ "Vi ne plu obtenos pliajn sekurecajn flikaĵojn aŭ kritikajn ĝisdatigojn. " "Bonvole promociu al nova versio de Ubuntu." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Informoj pri promocio" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Instali" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Nomo" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Versio %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Neniu retkonekto detektita, vi ne povos elŝuti ŝanĝoprotokolajn informojn." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Elŝutante liston de ŝanĝoj..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "Ma_lelekti ĉiujn" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "_Elekti ĉiujn" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s ĝisdatigo elektiĝis." +msgstr[1] "%(count)s ĝisdatigoj elektiĝis." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s estas elŝutota." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "La promocio estas jam elŝutita, sed ankoraŭ ne instalita." msgstr[1] "La promocioj estas jam elŝutitaj, sed ankoraŭ ne instalitaj." @@ -1782,11 +1787,18 @@ msgid "There are no updates to install." msgstr "Estas neniu instalebla ĝisdatigo." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Nekonata elŝutgrando." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1794,7 +1806,7 @@ "Ne estas konata kiam la pakaĵinformoj estis lastfoje ĝisdatigitaj. Bonvolu " "alklaki sur la 'Kontroli'-butonon por ĝisdatigi la informojn." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1804,14 +1816,14 @@ "Alklaku la ĉi-suban butonon 'Kontroli' por kontroli ĉu estas novaj " "programaraj ĝisdatigoj." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "La pakaĵinformoj estis laste ĝisdatigitaj antaŭ %(days_ago)s tago." msgstr[1] "La pakaĵinformoj estis laste ĝisdatigitaj antaŭ %(days_ago)s tagoj." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1821,34 +1833,46 @@ "La pakaĵinformoj estis laste ĝisdatigitaj antaŭ %(hours_ago)s horoj." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "La pakaĵinformoj estis lastfoje ĝisdatigitaj antaŭ preskaŭ %s minutoj." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "La pakaĵinformoj estas ĵus ĝisdatigitaj." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Programaj ĝisdatigoj korektas erarojn, eliminas sekurecajn difektojn kaj " +"aldonas novajn trajtojn." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Programaraj ĝisdatigoj povas esti disponeblaj por via komputilo." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Bonvenon al Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Ĉi tiuj ĝisdatigoj de programaroj estas eldonitaj ekde ĉi tiu versio de " +"Ubuntu estis publikigita." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Ĝisdatigoj de programaroj disponeblas por ĉi tiu komputilo." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1859,7 +1883,7 @@ "aldone almenaŭ %s da spaco sur '%s'. Malplenigu vian rubujon kaj forigu " "provizorajn pakaĵojn de antaŭaj instaloj uzante 'sudo apt-get clean'." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1867,24 +1891,24 @@ "Necesas restartigi la komputilon por fini la instaladon de ĝisdatigoj. " "Bonvolu konservi vian laboron antaŭ ol daŭrigi." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Legado de pakaĵaj informoj" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Konektante..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Povas esti ke vi ne povos kontroli por novaj ĝisdatigoj aŭ elŝuti novajn." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Ne eblis pravalorizi la pakaĵajn informojn" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1897,7 +1921,7 @@ "Bonvolu raporti ĉi tiun cimon pri la pakaĵo 'update-manager' kaj inkluzivu " "la jenan erarmesaĝon:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1909,31 +1933,31 @@ "Bonvolu raporti ĉi tiun cimon pri la pakaĵo 'update-manager' kaj inkluzivu " "la jenan erarmesaĝon:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (nova instalaĵo)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Grando: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "De versio %(old_version)s al %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Versio %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Eldonĝisdatigo aktuale ne eblas" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1942,21 +1966,21 @@ "La eldonĝisdatigo aktuale ne eblas, bonvolu reprovi poste. La servilo " "raportis: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Elŝutaanta la ilon por eldonĝisdatigi" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Nova eldono '%s' de Ubuntu estas disponebla." #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Indekso de programaroj estas difektita" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1966,6 +1990,17 @@ "mastrumilon \"Synaptic\" aŭ ruli la komandon \"sudo apt-get install -f\" en " "terminalo por ripari ĉi/tiun problemon." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Nova eldono '%s' disponebla." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Nuligi" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Kontroli por ĝisdatigoj" @@ -1975,22 +2010,18 @@ msgstr "Instali ĉiujn disponeblajn ĝisdatigojn" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Nuligi" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Ŝanĝoprotokolo" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Ĝisdatigoj" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Kunmetanta la liston de ĝisdatigoj" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2014,20 +2045,20 @@ " * Neoficialaj programarpakaĵoj nesubtenataj de Ubuntu\n" " * Kutimaj ŝanĝoj de antaŭ-eldono de Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Elŝutanta protokolon de ŝanĝoj" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Aliaj ĝisdatigoj (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "Ĉi tiu ĝisdatigo ne devenas de fonto, kiu subtenas ŝanĝoprotokolojn." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2035,7 +2066,7 @@ "Malsukcesis elŝuti la liston de ŝanĝoj. \n" "Bonvolu kontroli vian interretan konekton." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2048,7 +2079,7 @@ "Disponebla versio: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2061,7 +2092,7 @@ "Uzu http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "ĝis la ŝanĝoj ekhaveblos aŭ reprovu poste." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2074,52 +2105,43 @@ "Bonvolu uzi http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "ĝis kiam la ŝanĝoj iĝos haveblaj aŭ poste reprovi." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Malsukcesis trovi distribuaĵon" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Eraro '%s' okazis dum provo eltrovi, kiun sistemon vi uzas." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Gravaj sekurecaj ĝisdatigoj" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Rekomenditaj ĝisdatigoj" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Proponitaj ĝisdatigoj" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Retroportoj" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Distribuaj ĝisdatigoj" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Aliaj ĝisdatigoj" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Lanĉado de la ĝisdatiga mastrumilo" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Programaj ĝisdatigoj korektas erarojn, eliminas sekurecajn difektojn kaj " -"aldonas novajn trajtojn." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Parta ĝisdatigo" @@ -2191,37 +2213,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Programaj ĝisdatigoj" +msgid "Update Manager" +msgstr "Ĝisdatiga mastrumilo" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Programaj ĝisdatigoj" +msgid "Starting Update Manager" +msgstr "Komencanta ĝisdatigan mastrumilon" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "Ĝisdatigi" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "ĝisdatigoj" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Instali" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Ŝanĝoj" +msgid "updates" +msgstr "ĝisdatigoj" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Priskribo" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Priskribo de ĝisdatigo" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2229,24 +2241,34 @@ "Vi estas konektita per retmigrado kaj eble vi devos pagi pro la datumoj " "elŝutotaj por la ĝisdatigo." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Vi estas konektita per sendrata modemo." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Estas pli sekure konekti vian komputilon al konektingo antaŭ ol ĝisdatigi." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Instali ĝisdatigojn" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Ŝanĝoj" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Agordoj..." +msgid "Description" +msgstr "Priskribo" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Instali" +msgid "Description of update" +msgstr "Priskribo de ĝisdatigo" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Agordoj..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2269,9 +2291,8 @@ msgstr "Vi decidis ne ĝisdatigi al la nova Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Eblas ĝisdatigi poste per lanĉo de la Ĝisdatiga mastrumilo kaj klako al " @@ -2285,58 +2306,58 @@ msgid "Show and install available updates" msgstr "Vidigi kaj instali disponeblajn ĝisdatigojn" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Montru la version kaj ĉesu" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Dosierujo kiu enhavas la datumdosierojn" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Kontrolu, ĉu nova eldono de Ubuntu estas disponebla" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Kontroli ĉu aktualigo al la plej nova disvolva eldono eblas" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "Ĝisdatigi uzante la laste proponitan version de la eldonĝisdatigilo" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Ne enfokusigi al mapo dum starto" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Klopodu ruli dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Ne kontroli por ĝisdatigoj dum startigo" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Testi ĝisdatigon per proveja aufs-surmeto" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Rulanta partan ĝisdatigon" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Montri priskribon de la pakaĵo anstataŭ la ŝanĝoprotokolon" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Provu ĝisdatigi al la plej nova eldono uzante la ĝisdatigilon de $distro-" "proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2346,11 +2367,11 @@ "Aktuale 'labortablo' por normalaj labortabl-sistemaj ĝisdatigoj kaj " "'servilo' por servilaj sistemoj estas subtenataj." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Ruli la specifitan fasadon" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2358,11 +2379,11 @@ "Nur kontroli ĉu haveblas nova distribu-eldono kaj raporti la rezulton per la " "elira kodo" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Kontrolas por nova eldono de Ubuntu" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2370,71 +2391,71 @@ "Por informoj pri ĝisdatigado, bonvolu viziti:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Neniu nova eldono trovita" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Nova eldono '%s' disponebla." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Rulu 'do-release-upgrade' por ĝisdatigi al ĝi" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" -msgstr "Ĝisdatigoj por Ubuntu %(version) disponeblas" +msgstr "Ĝisdatigoj por Ubuntu %(version)s disponeblas" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Vi decidis ne ĝisdatigi al Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Aldoni eligon de sencimigo" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Montri nesubtenatajn pakaĵojn sur tiu ĉi maŝino" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Montri subtenatajn pakaĵojn sur tiu ĉi maŝino" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Montri ĉiujn pakaĵojn kun ilia stato" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Montri ĉiujn pakaĵojn en listo" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Subteni statresumon de ‘%s’:" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -"Vi havas %(num)s pakaĵojn (%(percent).1f%%) kiuj estas subtenataj ĝis %(time)" -"s" +"Vi havas %(num)s pakaĵojn (%(percent).1f%%) kiuj estas subtenataj ĝis " +"%(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" "Vi havas %(num)s pakaĵojn (%(percent).1f%%) kiuj ne (plu) estas elŝuteblaj" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "Vi havas %(num)s pakaĵojn (%(percent).1f%%) kiuj estas nesubtenataj" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2442,123 +2463,153 @@ "Rulu ĝin per --show-unsupported, --show-supported aŭ --show-all por vidi pli " "da detaloj" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Ne plu elŝuteblaj:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Nesubtenataj: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Subtenataj ĝis %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Nesubtenate" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Nerealigita metodo: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Dosiero sur disko" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb-pakaĵo" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Instali mankantan pakaĵon" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Pakaĵo %s estu instalita." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb-pakaĵo" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "Necesas marki %s kiel permanan instalaĵon." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"Kiam dum promocio la dosiero kdelibs4-dev estas instalita, kdelibs5-dev " -"devos esti instalata. Vidu bugs.launchpad.net, cimo #279621 por detaloj." - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i arkaikaj eroj en la statdosiero" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Arkaikaj eroj en dpkg-stato" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Arkaikaj eroj de dpkg-stato" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"Kiam dum promocio la dosiero kdelibs4-dev estas instalita, kdelibs5-dev " +"devos esti instalata. Vidu bugs.launchpad.net, cimo #279621 por detaloj." + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "Necesas marki %s kiel permanan instalaĵon." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Forigu 'lilo', ĉar ankaŭ 'grub' estas instalita. (Vidu detalojn en eraro n-" "ro 314004.)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Post la renovigo de la pakaĵinformoj la esenca pakaĵo ‘%s’ ne plu estas " -#~ "trovebla. Cimraportaĵo estas farata." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Promocias Ubuntu al versio 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s ĝisdatigo elektiĝis." -#~ msgstr[1] "%(count)s ĝisdatigoj elektiĝis." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Bonvenon al Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Ĉi tiuj ĝisdatigoj de programaroj estas eldonitaj ekde ĉi tiu versio de " -#~ "Ubuntu estis publikigita." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Ĝisdatigoj de programaroj disponeblas por ĉi tiu komputilo." - -#~ msgid "Update Manager" -#~ msgstr "Ĝisdatiga mastrumilo" - -#~ msgid "Starting Update Manager" -#~ msgstr "Komencanta ĝisdatigan mastrumilon" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Vi estas konektita per sendrata modemo." - -#~ msgid "_Install Updates" -#~ msgstr "_Instali ĝisdatigojn" +#~ "Post la renovigo de la pakaĵinformoj la esenca pakaĵo ‘%s’ ne plu estas " +#~ "trovebla. Cimraportaĵo estas farata." #~ msgid "Checking for a new ubuntu release" #~ msgstr "Kontrolante pri nova ubuntu-eldono" @@ -2691,6 +2742,9 @@ #~ "raporti tion kiel cimo per la komando 'ubuntu-bug update-manager' en " #~ "terminalo." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Promocianta Ubuntu al versio 11.10" + #~ msgid "%.0f kB" #~ msgstr "%.0f kB" diff -Nru update-manager-17.10.11/po/es.po update-manager-0.156.14.15/po/es.po --- update-manager-17.10.11/po/es.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/es.po 2017-12-23 05:00:38.000000000 +0000 @@ -6,11 +6,12 @@ # Jorge Bernal , 2005. # Paco Molinero , 2011. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-20 20:23+0000\n" "Last-Translator: Fitoschido \n" "Language-Team: Spanish \n" @@ -23,7 +24,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -31,13 +32,13 @@ msgstr[1] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Servidor para %s" @@ -45,20 +46,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Servidor principal" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Servidores personalizados" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "No se puede calcular la entrada en sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -66,11 +67,11 @@ "No se pudo localizar ningún paquete, quizá no es un disco de Ubuntu o no es " "la arquitectura correcta." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Error al añadir el CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -85,13 +86,13 @@ "El mensaje de error fue:\n" "«%s»" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Desinstalar paquete en mal estado" msgstr[1] "Desinstalar paquetes en mal estado" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -112,15 +113,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "El servidor puede estar sobrecargado" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Paquetes rotos" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -130,7 +131,7 @@ "continuar." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -151,12 +152,12 @@ " * Paquetes de software no oficiales, no suministrados por Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Probablemente sea un problema transitorio, inténtelo de nuevo más tarde." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -164,16 +165,16 @@ "Si ninguna de estas aplica, entonces informe de este fallo usando la orden " "«ubuntu-bug update-manager» en una terminal." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "No se ha podido calcular la actualización" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Error al autenticar algunos paquetes" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -183,7 +184,7 @@ "problema transitorio en la red. Pruebe de nuevo más tarde. Vea abajo una " "lista de los paquetes no autenticados." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -191,22 +192,22 @@ "El paquete «%s» está marcado para desinstalarse pero está en la lista negra " "de desinstalación." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "El paquete esencial «%s» ha sido marcado para su desinstalación." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Intentando instalar la versión prohibida «%s»" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "No se ha podido instalar «%s»" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -215,11 +216,11 @@ "«ubuntu-bug update-manager» en una terminal." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "No se ha podido determinar el metapaquete" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -233,15 +234,15 @@ " Por favor, instale uno de los paquetes anteriores usando Synaptic o apt-get " "antes de proceder." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Leyendo caché" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "No se ha podido obtener un bloqueo exclusivo" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -250,11 +251,11 @@ "gestión de paquetes (como apt-get o aptitude). Por favor, cierre esa " "aplicación primero." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Actualizando sobre conexión remota no soportada" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -268,11 +269,11 @@ "\n" "La actualización se detendrá ahora. Intente sin ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "¿Continuar la ejecución bajo SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -289,11 +290,11 @@ "Si continua, se iniciará un demonio ssh adicional en el puerto «%s».\n" "¿Quiere continuar?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Iniciando sshd adicional" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -304,7 +305,7 @@ "adicional en el puerto «%s». Si algo va mal con el ssh en ejecución, aún " "podrá conectarse al adicional.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -317,29 +318,29 @@ "abrir el puerto con:\n" "«%s»" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "No se puede actualizar" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Esta herramienta no permite actualizaciones de «%s» a «%s»." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Falló la configuración de la caja de arena" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "No ha sido posible crear un entorno de caja de arena." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Modo caja de arena" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -354,18 +355,18 @@ "*Ninguno* de los cambios escritos en el directorio de sistema desde ahora " "hasta el siguiente arranque son permanentes." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Su instalación de python está dañada. Por favor, repare el enlace simbólico " "«/usr/bin/python»." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "El paquete «debsig-verify» esta instalado" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -375,12 +376,12 @@ "Desinstálelo con synaptic o «apt-get remove debsig-verify» primero y luego " "intente actualizar nuevamente." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "No se puede escribir en «%s»" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -391,11 +392,11 @@ "actualización no puede continuar.\n" "Asegúrese de que el directorio de sistema permite escribir." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "¿Incluir las últimas actualizaciones desde Internet?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -417,16 +418,16 @@ "nueva versión.\n" "Si responde «no» ahora, la red no se usará para nada." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "(desactivado en la actualización a %s)" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "No se ha encontrado un servidor espejo válido" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -446,11 +447,11 @@ "Si selecciona «No» la actualización se cancelará." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "¿Generar orígenes predeterminados?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -464,11 +465,11 @@ "¿Se deben añadir entradas predeterminadas para «%s»? Si selecciona «No», la " "actualización se cancelará." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Información de repositorio no válida" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -477,11 +478,11 @@ "archivo inválido por lo que se está iniciando un proceso de notificación de " "errores." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Desactivados los orígenes de terceros" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -491,13 +492,13 @@ "list». Puede volver a activarlas tras la actualización con la herramienta " "«Orígenes del software», o con su gestor de paquetes." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Paquete en un estado inconsistente" msgstr[1] "Paquetes en un estado inconsistente" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -516,11 +517,11 @@ "pero no se encuentran en ningún repositorio. Por favor, reinstale los " "paquetes manualmente o desinstálelos del sistema." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Error durante la actualización" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -529,13 +530,13 @@ "tipo de problema en la red, por lo que le recomendamos que compruebe su " "conexión de red y vuelva a intentarlo." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "No hay espacio suficiente en el disco" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -550,21 +551,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Calculando los cambios" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "¿Quiere comenzar la actualización?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Actualización cancelada" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -572,12 +573,12 @@ "La actualización se cancelará ahora y el sistema volverá a su estado " "original. Puede reanudar la actualización posteriormente." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "No se han podido descargar las actualizaciones" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -588,27 +589,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Error durante la confirmación" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Restaurando el estado original del sistema" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "No se han podido instalar las actualizaciones" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -617,7 +618,7 @@ "estado no utilizable. Ahora se llevará a cabo una recuperación (dpkg --" "configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -634,7 +635,7 @@ "upgrade al informe de error.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -642,20 +643,20 @@ "La actualización ha sido cancelada. Por favor, compruebe su conexión a " "Internet o el soporte de instalación y vuelva a intentarlo. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "¿Desinstalar los paquetes obsoletos?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Conservar" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Eliminar" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -665,27 +666,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "La dependencia requerida no está instalada" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "La dependencia requerida «%s» no está instalada. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Comprobando el gestor de paquetes" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Falló la preparación de la actualización" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -693,11 +694,11 @@ "Falló la preparación del sistema para actualizarse, de manera que se ha " "iniciado el proceso de informe de errores." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Ha fallado la obtención de los requisitos previos de la actualización" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -710,68 +711,68 @@ "\n" "Adicionalmente, se está iniciando un proceso de notificación de errores." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Actualizando la información del repositorio" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Fallo al añadir el CDROM" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Lo sentimos, no se pudo añadir el CDROM" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Información sobre los paquetes no válida" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Descargando" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Actualizando" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Actualización completada" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "La actualización se completó pero hubo errores durante el proceso." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Buscando paquetes obsoletos" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "La actualización del sistema se ha completado." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "La actualización parcial se ha completado." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "Se está usando «evms»" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -781,12 +782,12 @@ "software «evms» ya no está soportado; por favor, desactívelo y vuelva a " "ejecutar de nuevo la actualización." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "Su hardware de gráficos no es plenamente compatible con Ubuntu 12.04 LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -798,9 +799,9 @@ "más información vea https://wiki.ubuntu.com/X/Bugs/" "UpdateManagerWarningForI8xx ¿Quiere continuar con la actualización?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -809,8 +810,8 @@ "rendimiento de los juegos y otros programas que usen gráficos de forma " "intensiva." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -824,7 +825,7 @@ "\n" "¿Quiere continuar?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -838,11 +839,11 @@ "\n" "¿Quiere continuar?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Sin CPU i686" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -854,11 +855,11 @@ "como arquitectura mínima. No es posible actualizar su sistema a la nueva " "versión de Ubuntu con este hardware." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "No hay CPU ARMv6" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -870,11 +871,11 @@ "requieren ARMv6 como arquitectura mínima. No es posible actualizar sus " "sistema a la nueva versión de Ubuntu con este hardware." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "El demonio init no está disponible" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -890,15 +891,15 @@ "\n" "¿Está seguro de que quiere continuar?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Actualización de prueba usando aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Usar la ruta dada para buscar un CD-ROM con paquetes actualizables" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -906,58 +907,58 @@ "Usar interfaz de usuario. Actualmente disponibles: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*OBSOLETO* esta opción se ignorará" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Realizar solo una actualización parcial (no se reescribirá el «sources.list»)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Desactive el soporte de pantalla GNU" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Establecer datadir" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Inserte «%s» en la unidad «%s»" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "La descarga se ha completado" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Descargando archivo %li de %li a %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Faltan alrededor de %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Descargando archivo %li de %li" @@ -967,27 +968,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Aplicando los cambios" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "problemas de dependencias - se deja sin configurar" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "No se ha podido instalar «%s»" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -1000,7 +1001,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1011,7 +1012,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1019,20 +1020,20 @@ "Perderá todos los cambios que haya realizado en este archivo de " "configuración si decide sustituirlo por una nueva versión." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "No se ha encontrado la orden «diff»" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Ha ocurrido un error fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1045,13 +1046,13 @@ "Su archivo sources.list original se guardó en /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Se ha pulsado Ctrl-C" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1060,136 +1061,136 @@ "defectuoso. ¿Seguro que desea hacer eso?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Para prevenir la pérdida de datos, cierre todas las aplicaciones y " "documentos." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Ya no está soportado por Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Desactualizar (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Eliminar (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Ya no es necesario (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Instalar (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Actualizar (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Cambio de soporte" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Mostrar diferencias >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Ocultar diferencias" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Error" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Cancelar" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Cerrar" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Mostrar terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Ocultar terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Información" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Detalles" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Ya no está soportado %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Eliminar %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Eliminar (fue autoinstalado) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Instalar %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Actualizar %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Se requiere reiniciar" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Reinicie el sistema para completar la actualización" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Reiniciar ahora" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1201,32 +1202,32 @@ "El sistema podría quedar en un estado no utilizable si cancela la " "actualización. Le recomendamos encarecidamente que continúe la actualización." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "¿Cancelar la actualización?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li día" msgstr[1] "%li días" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li hora" msgstr[1] "%li horas" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minuto" msgstr[1] "%li minutos" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1242,7 +1243,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1256,14 +1257,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1273,34 +1274,32 @@ "aproximadamente con un módem de 56k." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Esta descarga tardará aproximadamente %s con su conexión actual. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Preparando la actualización" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Obteniendo nuevos canales de software" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Obteniendo paquetes nuevos" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Instalando las actualizaciones" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Limpiando" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1317,28 +1316,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "Se va a desinstalar %d paquete." msgstr[1] "Se van a desinstalar %d paquetes." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "Se va a instalar %d paquete nuevo." msgstr[1] "Se van a instalar %d paquetes nuevos." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "Se va a actualizar %d paquete." msgstr[1] "Se van a actualizar %d paquetes." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1349,7 +1348,7 @@ "\n" "Debe descargar un total de %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1357,7 +1356,7 @@ "Esta actualización puede tardar varias horas. Una vez finalice la descarga, " "el proceso no podrá ser cancelado." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1365,16 +1364,16 @@ "Recoger e instalar la actualización puede llevar varias horas. Una vez que " "la descarga haya terminado, el proceso no se puede cancelar." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "La desinstalación de los paquetes puede tardar varias horas. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "El software de este equipo está actualizado." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1382,38 +1381,38 @@ "No hay actualizaciones disponibles para su sistema. Se ha cancelado la " "actualización." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Se requiere reiniciar el equipo" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "La actualización ha finalizado y se necesita reiniciar el equipo. ¿Quiere " "hacerlo ahora?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "autentificar «%(file)s» contra «%(signature)s» " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "extrayendo «%s»" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "No se ha podido ejecutar la herramienta de actualización" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1421,35 +1420,35 @@ "Esto parece ser un fallo en la herramienta de actualización. Informe de este " "fallo usando la orden «ubuntu-bug update-manager»." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Firma de la herramienta de actualización" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Herramienta de actualización" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Error al descargar" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "Ha fallado la descarga de la actualización. Puede haber un problema con la " "red. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Error de autenticación" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1457,13 +1456,13 @@ "Ha fallado la autenticación de la actualización. Es posible que exista un " "problema con la red o el servidor. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Error al extraer" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1471,13 +1470,13 @@ "Ha fallado la extracción de la actualización. Puede haber un problema con la " "red o el servidor. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Falló la verificación" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1485,15 +1484,15 @@ "Ha fallado la verificación de la actualización. Puede haber un problema con " "la red o con el servidor. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "No se ha podido ejecutar la actualización" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1502,13 +1501,13 @@ "no ejecutable. Vuelva a montarlo sin «noexec» y ejecute de nuevo la " "actualización." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "El mensaje de error es «%s»" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1521,73 +1520,73 @@ "Su archivo sources.list original se guardó en /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Cancelando" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Para quitar:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Para continuar, pulse Intro" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Continuar [sN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Detalles [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "s" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Ya no está soportado: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Desinstalar: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Instalar: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Actualizar: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Continuar [Sn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1654,9 +1653,8 @@ msgstr "Actualización completa de la distribución" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Actualizar Ubuntu a la versión 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Actualizando Ubuntu a la versión 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1674,84 +1672,85 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Por favor, espere; esto puede tardar un poco." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "La actualización se ha completado" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "No se han podido encontrar las notas de publicación" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Puede que el servidor esté sobrecargado. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "No se han podido descargar las notas de publicación" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Por favor, compruebe su conexión a Internet." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Actualizar" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Notas de la versión" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Descargando archivos de paquetes adicionales..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Archivo %s de %s a %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Archivo %s de %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Abrir vínculo en el navegador" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Copiar vínculo en el portapapeles" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Descargando archivo %(current)li de %(total)li a %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Descargando archivo %(current)li de %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Su versión de Ubuntu ya no tiene soporte." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1759,53 +1758,59 @@ "No recibirá más correcciones de seguridad o actualizaciones críticas. " "Actualice a una versión posterior de Ubuntu." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Información de actualización" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Instalar" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Nombre" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Versión %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "No se han detectado conexiones de red, no puede descargar la información del " "registro de cambios." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Descargando la lista de cambios..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Deseleccionar todo" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Seleccionar _todo" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "Se ha seleccionado %(count)s actualización." +msgstr[1] "Se han seleccionado %(count)s actualizaciones." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "Se descargarán %s." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "La actualización ya ha sido descargada, pero no instalada." msgstr[1] "Las actualizaciones ya han sido descargadas, pero no instaladas." @@ -1813,11 +1818,18 @@ msgid "There are no updates to install." msgstr "No hay actualizaciones para instalar." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Tamaño de la descarga desconocido." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1825,7 +1837,7 @@ "No se sabe cuando se ha actualizado por última vez la información del " "paquete. Pulse el botón «Comprobar» para actualizar la información." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1836,14 +1848,14 @@ "Pulse el botón «Comprobar» más abajo para buscar nuevas actualizaciones de " "software." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "La información del paquete fue actualizada hace %(days_ago)s día." msgstr[1] "La información del paquete fue actualizada hace %(days_ago)s días." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1856,34 +1868,46 @@ "%(hours_ago)s horas." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "La información de los paquetes se actualizó hace %s minutos." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "La información de los paquetes se acaba de actualizar." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Las actualizaciones de software corrigen errores, eliminan fallos de " +"seguridad y proporcionan nuevas funcionalidades." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Puede haber actualizaciones disponibles para su equipo." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Bienvenido/a a Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Estas actualizaciones de software se publicaron desde el lanzamiento de esta " +"versión de Ubuntu." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Hay actualizaciones disponibles para este equipo." + +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1895,7 +1919,7 @@ "papelera y elimine paquetes temporales de instalaciones anteriores usando " "«sudo apt-get clean»." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1903,25 +1927,25 @@ "El equipo necesita reiniciarse para finalizar la actualización. Guarde su " "trabajo antes de continuar." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Leyendo la información de paquetes" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Conectando…" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Puede que no sea capaz de comprobar actualizaciones o de descargar nuevas " "actualizaciones." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "No se ha podido inicializar la información de los paquetes" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1935,7 +1959,7 @@ "Por favor, informe de esto como un fallo en el paquete «update-manager» e " "incluya el siguiente mensaje de error:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1948,31 +1972,31 @@ "Por favor, informe de esto como un fallo en el paquete «update-manager» e " "incluya el siguiente mensaje de error:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Instalación nueva)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Tamaño: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "De la versión %(old_version)s a la %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Versión %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "La actualización de versión no es posible en este momento" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1981,21 +2005,21 @@ "La actualización de versión no se puede realizar en este momento, inténtelo " "de nuevo después. El servidor informó: «%s»" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Descargando la herramienta de actualización de la versión" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Está disponible la nueva versión «%s» de Ubuntu" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "El índice de software está dañado" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -2005,6 +2029,17 @@ "de paquetes «Synaptic» (o ejecute «sudo apt-get install -f» en una " "terminal), para corregir este problema." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Está disponible la nueva versión «%s»." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Cancelar" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Comprobar actualizaciones" @@ -2014,22 +2049,18 @@ msgstr "Instalar todas las actualizaciones disponibles" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Cancelar" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Lista de cambios" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Actualizaciones" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Construyendo la lista de actualizaciones" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2053,21 +2084,21 @@ " * Paquetes no oficiales de software, no provistos por Ubuntu\n" " * Cambios normales en una versión aún no publicada de Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Descargando el informe de cambios" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Otras actualizaciones (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" "Esta actualización no procede de una fuente que soporte registro de cambios." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2075,7 +2106,7 @@ "Hubo un fallo al descargar la lista de cambios. \n" "Compruebe su conexión a Internet." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2088,7 +2119,7 @@ "Versión disponible: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2101,7 +2132,7 @@ "Por favor, use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "hasta que los cambios estén disponibles, o pruebe de nuevo más tarde." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2114,53 +2145,44 @@ "Por favor, use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "hasta que los cambios estén disponibles, o inténtelo más tarde." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Error al detectar la distribución" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" "Ha ocurrido un error «%s» mientras se comprobaba qué sistema está usando." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Actualizaciones importantes de seguridad" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Actualizaciones recomendadas" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Actualizaciones propuestas" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "«Backports»" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Actualizaciones de la distribución" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Otras actualizaciones" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Iniciando el gestor de actualizaciones" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Las actualizaciones de software corrigen errores, eliminan fallos de " -"seguridad y proporcionan nuevas funcionalidades." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Actualización parcial" @@ -2234,37 +2256,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Actualizaciones de software" +msgid "Update Manager" +msgstr "Gestor de actualizaciones" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Actualizaciones de software" +msgid "Starting Update Manager" +msgstr "Iniciando el Gestor de actualizaciones" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Actualizar" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "actualizaciones" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Instalar" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Cambios" +msgid "updates" +msgstr "actualizaciones" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Descripción" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Descripción de la actualización" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2272,24 +2284,34 @@ "Ahora está conectado en itinerancia y puede tener cargos por los datos " "consumidos en esta actualización." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Está conectado vía módem inalámbico." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Es más seguro enchufar el equipo a la toma de corriente antes de actualizar." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Instalar actualizaciones" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Cambios" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Configuración..." +msgid "Description" +msgstr "Descripción" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Instalar" +msgid "Description of update" +msgstr "Descripción de la actualización" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Configuración..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2313,9 +2335,8 @@ msgstr "Ha decidido no actualizarse a la nueva versión de Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Puede actualizar más adelante abriendo el Gestor de actualizaciones y " @@ -2329,59 +2350,59 @@ msgid "Show and install available updates" msgstr "Mostrar e instalar las actualizaciones disponibles" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Mostrar la versión y salir" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Directorio que contiene los archivos de datos" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Verificar si hay una nueva versión de Ubuntu disponible" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Comprobar si es posible actualizar a la última versión de desarrollo" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Actualizar usando la versión más reciente propuesta por el actualizador" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "No poner el foco sobre el mapa cuando se inicie" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Intente ejecutar dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "No comprobar actualizaciones al iniciar" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Comprobar la actualización en una capa aufs de caja de arena" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Ejecutando una actualización parcial" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Mostrar la descripción del paquete en lugar de la lista de cambios" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Intente actualizar a la última versión usando el actualizador de $distro-" "proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2391,11 +2412,11 @@ "Actualmente se soportan los modos «desktop» (para actualizaciones normales " "de un sistema de escritorio) y «server» (para servidores)." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Ejecutar la interfaz especificada" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2403,11 +2424,11 @@ "Comprueba únicamente si está disponible una nueva versión de la distribución " "e informa del resultado mediante un código de salida" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Comprobar si hay una nueva versión de Ubuntu" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2415,68 +2436,68 @@ "Para saber más sobre esta actualización,visite:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "No se ha encontrado ninguna edición nueva" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Está disponible la nueva versión «%s»." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Ejecute «do-release-upgrade» para actualizarse a ella." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Está disponible la actualización a Ubuntu %(version)s" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Ha decidido no actualizarse a Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Añadir resultado de la depuración" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Mostrar paquetes sin soporte en esta máquina" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Mostrar paquetes con soporte en esta máquina" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Mostrar todos los paquetes con sus estados" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Mostrar todos los paquetes en una lista" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Resumen de estado de soporte de «%s»:" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "Tiene %(num)s paquetes (%(percent).1f%%) con soporte hasta %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "Tiene %(num)s paquetes (%(percent).1f%%) que no pueden descargarse más" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "Tiene %(num)s paquetes (%(percent).1f%%) sin soporte" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2484,124 +2505,154 @@ "Ejecute con --show-unsupported, --show-supported o --show-all para ver más " "detalles" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "No se pueden descargar más:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Sin soporte: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Con soporte hasta %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Sin soporte" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Método no implementado: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Un archivo en disco" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "Paquete .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Instalar paquete que falta." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Debe instalarse el paquete %s" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "Paquete .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "Se debe marcar %s como instalado manualmente." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"Al actualizar. Sí kdelibs4-dev esta instalado hay que instalar kdelibs5-" -"dev. Vea bugs.launchpad.net , bug #279621 para más detalles" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i entradas obsoletas en el archivo de estado" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Entradas obsoletas en estado de dpkg" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Entradas de estado dpkg obsoletas" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"Al actualizar. Sí kdelibs4-dev esta instalado hay que instalar kdelibs5-" +"dev. Vea bugs.launchpad.net , bug #279621 para más detalles" + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "Se debe marcar %s como instalado manualmente." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Se elimina LILO ya que GRUB también está instalado (Consulte el bug #314004 " "para más información.)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Después de que su información del paquete fuese actualizada el paquete " -#~ "esencial «%s» no se encuentra, por lo que se está iniciando un proceso de " -#~ "notificación de errores." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Actualizando Ubuntu a la versión 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "Se ha seleccionado %(count)s actualización." -#~ msgstr[1] "Se han seleccionado %(count)s actualizaciones." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Bienvenido/a a Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Estas actualizaciones de software se publicaron desde el lanzamiento de " -#~ "esta versión de Ubuntu." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Hay actualizaciones disponibles para este equipo." - -#~ msgid "Update Manager" -#~ msgstr "Gestor de actualizaciones" - -#~ msgid "Starting Update Manager" -#~ msgstr "Iniciando el Gestor de actualizaciones" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Está conectado vía módem inalámbico." - -#~ msgid "_Install Updates" -#~ msgstr "_Instalar actualizaciones" +#~ "Después de que su información del paquete fuese actualizada el paquete " +#~ "esencial «%s» no se encuentra, por lo que se está iniciando un proceso de " +#~ "notificación de errores." #~ msgid "Checking for a new ubuntu release" #~ msgstr "Comprobar si existe un nueva versión de Ubuntu" @@ -2694,6 +2745,9 @@ #~ "archivo inválido. Informe de este fallo usando la orden «ubuntu-bug " #~ "update-manager» en una terminal." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Actualizar Ubuntu a la versión 11.10" + #~ msgid "" #~ "\n" #~ "\n" diff -Nru update-manager-17.10.11/po/et.po update-manager-0.156.14.15/po/et.po --- update-manager-17.10.11/po/et.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/et.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-02-23 19:54+0000\n" "Last-Translator: tabbernuk \n" "Language-Team: Estonian \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Server %s jaoks" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Põhiserver" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Kohandatud serverid" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Sources.list kirjet pole võimalik tõlgendada" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Ühtegi pakifaili ei leitud. Võib-olla ei ole see Ubuntu plaat või on valele " "protsessoriarhitektuurile?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "CD lisamine nurjus" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,13 +83,13 @@ "Veateade oli:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Eemalda halvas seisus tarkvarapakett" msgstr[1] "Eemalda halvas seisus tarkvarapaketid" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -109,15 +110,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Server võib olla ülekoormatud" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Katkised paketid" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -126,7 +127,7 @@ "parandada. Palun paranda need synaptic'u või apt-get'i abil enne jätkamist." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -147,11 +148,11 @@ " * mitteametlike pakkide kasutamine, mida ei jaga Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "See on üsna tõenäoliselt mööduv probleem, proovi hiljem uuesti." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -159,16 +160,16 @@ "Kui ükski sellest ei tundu sobiv, siis palun teatada sellest veast kasutades " "terminalikäsku 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Uuenduse arvutamine polnud võimalik" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Viga mõnede pakettide usaldusväärsuse kinnitamisel" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -178,7 +179,7 @@ "mööduv võrguprobleem, nii et võid hiljem uuesti proovida. All järgneb " "kontrollimata pakettide nimekiri." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -186,22 +187,22 @@ "Eemaldamiseks on märgistatud pakett '%s', mis on aga eemaldamise mustas " "nimekirjas." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Oluline pakett '%s' on märgistatud eemaldamiseks." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Halvas nimekirjas oleva versiooni '%s' paigaldamise katse" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Paketi '%s' paigaldamine pole võimalik" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -210,11 +211,11 @@ "kasutades terminalikäsku 'ubuntu-bug update-manager'." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Meta-paketi arvamine pole võimalik" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -228,15 +229,15 @@ "Enne jätkamist paigalda synaptic'u või apt-get'i abil mõni ülalnimetatud " "pakettidest." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Vahemälu lugemine" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Lukustamine ebaõnnestus" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -244,11 +245,11 @@ "Tavaliselt tähendab see, et teine paketihaldur (nt apt-get või aptitude) " "töötab. Palun sulge esmalt see teine rakendus." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Kaugühenduse kaudu uuendamine ei ole toetatud." -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -261,11 +262,11 @@ "\n" "Uuendamine katkestatakse. Palun proovige uuesti ilma ssh ühenduseta." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Kas jätkata SSH all?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -281,11 +282,11 @@ "Kui jätkate, siis käivitatakse veel üks ssh daemon pordis '%s'.\n" "Kas soovite jätkata?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Täiendava sshd käivitamine" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -296,7 +297,7 @@ "sshd pordil '%s'. Kui miski peaks viltu minema esimese ssh-ga, saad ikka " "ühenduda teise külge.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -308,29 +309,29 @@ "võib olla ohtlik, et tehta seda automaatselt. Pordi saad avada näiteks " "käsuga '%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Uuendamine pole võimalik" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "See tööriist ei toeta uuendamist '%s'-lt '%s'-le." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Liivakasti ülesseadmine nurjus" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Liivakastikeskkonna loomine ei olnud võimalik." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Liivakastirežiim" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -340,17 +341,17 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Sinu python'i paigaldus on vigane. Palun paranda nimeviide '/usr/bin/python'." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Tarkvarapakett 'debsig-verify' on paigaldatud" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -360,12 +361,12 @@ "Palun eemalda see kõigepealt synaptikuga või käsuga 'apt-get remove debsig-" "verify' ning käivita uuendus uuesti." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -373,11 +374,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Kas lisada värskeimad uuendused internetist?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -397,16 +398,16 @@ "võimalusel värskeimad uuendused ikkagi paigaldama.\n" "Kui vastad siin eitavalt, ei kasutata internetti üldse." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "keelatud %s-le uuendamisel" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Ühtegi sobivat peeglit ei leitud" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -425,11 +426,11 @@ "Kui valid 'Ei', katkestatakse uuendus." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Kas genereerida vaikimisi allikad?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -442,21 +443,21 @@ "Kas vaikimisi kirjed '%s' jaoks tuleks lisada? Kui valid 'Ei', katkestatakse " "uuendamine." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Varamu informatsioon vigane" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Kolmandate osapoolte allikad keelatud" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -466,13 +467,13 @@ "võid need jälle lubada, kasutades tööriista 'software-properties' või oma " "paketihaldurit." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Vasturääkivustega pakett" msgstr[1] "Vasturääkivustega paketid" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -491,11 +492,11 @@ "paigaldada, kuid arhiive ei leitud. Palun paigalda need käsitsi uuesti või " "eemalda süsteemist." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Uuendamise ajal ilmnes viga." -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -503,13 +504,13 @@ "Uuendamisel esines viga. Tavaliselt on selleks võrguprobleem, kontrolli " "võrguühendust ja proovi uuesti." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Kõvakettal pole piisavalt vaba ruumi" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -523,21 +524,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Muudatuste rehkendamine" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Kas alustada uuendamist?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Uuendamine katkestatud" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -545,12 +546,12 @@ "Uuendamine katkestatakse nüüd ning esialgne süsteemi olukord taastatakse. Sa " "võid uuendada mõni teine kord." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Uuenduste allalaadimine polnud võimalik" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -560,27 +561,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Toimingu ajal esines viga" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Süsteemi algse oleku taastamine" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Uuenduste paigaldamine polnud võimalik" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -588,7 +589,7 @@ "Uuendamine katkes. Sinu arvuti võib olla praegu kasutamatu. Praegu käivitati " "taastamisoperatsioon (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -599,7 +600,7 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -607,20 +608,20 @@ "Uuendamine katkes. Kontrolli internetiühendust või paigaldusmeediumi ning " "proovi uuesti. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Kas eemaldada iganenud paketid?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Hoia alles" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Eemalda" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -628,37 +629,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Vajalik sõltuvus pole paigaldatud" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Vajalik sõltuvus '%s' pole paigaldatud. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Paketihalduri kontrollimine" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Uuendamise ettevalmistamine ebaõnnestus" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Uuendamise eelduste hankimine ebaõnnestus" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -666,68 +667,68 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Varamuinfo uuendamine" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Cdromi lisamine nurjus" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Kahjuks cdromi lisamine nurjus." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Vigane paketiinfo" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Allalaadimine" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Uuendamine" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Uuendamine valmis" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "Uuendus on lõpetatud, kuid uuendamise ajal tekkisid vead." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Aegunud tarkvara otsimine" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Süsteemi uuendamine on valmis." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Osaline uuendamine lõpetati." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms on kasutusel" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -736,11 +737,11 @@ "Sinu süsteem kasutab 'evms' köitehaldurit kohas /proc/mounts. 'Evms' " "tarkvara pole enam toetatud, lülita see välja ja käivita uuendamine uuesti." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -748,9 +749,9 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -758,8 +759,8 @@ "Uuendamine võib eemaldada töölauaefektid ja vähendada mängude ning teiste " "graafikamahukate rakenduste jõudlust." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -772,7 +773,7 @@ "\n" "Kas tahad sellest hoolimata jätkata?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -785,11 +786,11 @@ "\n" "Kas tahad sellest hoolimata jätkata?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Pole i686 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -801,11 +802,11 @@ "i686 arhitektuurile. Sellise riistvaraga ei ole võimalik süsteemi paigaldada " "uut Ubuntu väljalaset." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Ei leitud ARMv6 protsessorit" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -816,11 +817,11 @@ "Kõik paketid karmic'us koostati optimeeritult vähemalt ARMv6 arhitektuurile. " "Selle raudvaraga ei ole võimalik Ubuntut uuendada." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Init pole saadaval" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -835,15 +836,15 @@ "\n" "Kas tahad sellest hoolimata jätkata?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Liivakastiuuendus kasutades aufs-i" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Antud teelt otsitakse CD'd uuendatavate pakkidega" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -851,58 +852,58 @@ "Liidese kasutamine. Hetkel saadaval: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*VANANENUD* seda valikut ignoreeritakse" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Soorita ainult osaline uuendamine (faili sources.list ei kirjutata üle)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Keela GNU ekraani tugi" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Määra andmekaust (datadir)" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Palun sisesta '%s' seadmesse '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Allalaadimine on valmis" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "%li. faili %li-st allalaadimine kiirusel %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Umbes %s jäänud" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "%li. faili allalaadimine %li-st" @@ -912,27 +913,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Muudatuste rakendamine" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "sõltuvusprobleemid - jäetakse seadistamata" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Paketi '%s' paigaldamine pole võimalik" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -944,7 +945,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -955,7 +956,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -963,20 +964,20 @@ "Kui asendad selle seadistusfaili uuema versiooniga, kaotad kõik sellesse " "tehtud muudatused." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Käsku 'diff' ei leitud" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Esines saatuslik viga" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -989,13 +990,13 @@ "Sinu esialgne sources.list fail salvestati nimega /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Vajutati Ctrl-c" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1004,134 +1005,134 @@ "kindel, et sa tahad seda teha?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "Andmekao vältimiseks sulge kõik avatud rakendused ja dokumendid." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Pole enam Canonicali poolt toetatud (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Paigaldatakse vanem (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Eemaldatakse (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Pole enam vaja (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Paigaldatakse (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Uuendatakse (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Meedia muutmine" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Erinevuse näitamine >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Erinevuse peitmine" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Tõrge" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Loobu" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Sulge" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Terminali näitamine >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Terminali peitmine" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Teave" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Üksikasjad" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Pole enam toetatud %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "%s eemaldamine" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Eemaldada (automaatselt paigaldatud) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "%s paigaldus" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "%s uuendamine" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Vajalik taaskäivitus" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Uuendamise lõpuleviimiseks palun taaskäivita süsteem" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Taaskäivita kohe" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1143,32 +1144,32 @@ "Uuenduse katkestamisega võib süsteem jääda mittekasutatavaks. Tungivalt " "soovitatav on uuendamist jätkata." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Kas katkestada uuendamine?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li päev" msgstr[1] "%li päeva" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li tund" msgstr[1] "%li tundi" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minut" msgstr[1] "%li minutit" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1184,7 +1185,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1198,14 +1199,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1215,34 +1216,32 @@ "modemiga." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Allalaadimine võtab sinu ühendusega aega umbes %s. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Uuenduse ettevalmistamine" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Uute tarkvarakanalite hankimine" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Uute pakettide hankimine" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Uuenduste paigaldamine" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Puhastamine" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1259,28 +1258,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d pakett eemaldatakse." msgstr[1] "%d paketti eemaldatakse." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "Paigaldatakse %d uus pakett." msgstr[1] "Paigaldatakse %d uut paketti." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d pakett uuendatakse." msgstr[1] "%d paketti uuendatakse." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1291,65 +1290,65 @@ "\n" "Alla tuleb laadida kokku %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" "Sinu süsteemile pole ühtegi uuendust saadaval. Uuendamisest loobutakse." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Vajalik taaskäivitus" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Uuendamine on valmis ja vaja on süsteem taaskäivitada. Kas teha seda kohe?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Uuendamistööriista käivitamine polnud võimalik" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1357,46 +1356,46 @@ "Ilmselt on tegemist uuendamisprogrammi veaga. Palun teatada sellest veast " "kasutades terminalikäsku 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Uuendustööriista signatuur" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Uuendustööriist" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Allalaadimine ebaõnnestus" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Uuenduse allalaadimine ebaõnnestus. See võib olla võrguprobleem. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Autentimine ebaõnnestus" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" "Uuenduse autentimine ebaõnnestus. See võib olla võrgu- või serveriprobleem. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Lahtipakkimine ebaõnnestus" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1404,13 +1403,13 @@ "Uuenduse lahtipakkimine ebaõnnestus. Võrgu või serveriga võib probleeme " "olla. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Õigsuse kontroll nurjus" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1418,15 +1417,15 @@ "Uuenduse ehtsuse kontroll ebaõnnestus. See võib olla võrgu- või " "serveriprobleem. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Uuendamist pole võimalik käivitada" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1434,13 +1433,13 @@ "Tavaliselt põhjustab seda olukord, kui /tmp on haagitud lipuga noexec. Palun " "uuesti haakida ilma noexec liputa ja taaskäivitada uuendus." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Veateade on '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1453,73 +1452,73 @@ "Sinu esialgne sources.list fail salvestati nimega /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Katkestamine" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Degradeeritud:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Jätkamiseks vajuta [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Kas jätkata? [y/N] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Üksikasjad [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Pole enam toetatud: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Eemaldatakse: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Paigaldatakse: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Uuendatakse: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Kas jätkata? [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1586,9 +1585,8 @@ msgstr "Distributsiooniuuendus" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Ubuntu uuendamine 11.10 versioonile" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1606,146 +1604,160 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Palun oota, läheb natuke aega." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Uuendamine on valmis" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Väljalaskemärkmeid ei leitud" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Server võib olla ülekoormatud. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Väljalaskemärkmete allalaadimine polnud võimalik" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Palun kontrolli oma võrguühendust." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Uuendamine" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Väljalaskemärkmed" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Täiendavate paketifailide allalaadimine..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "%s. fail %s-st kiirusel %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "%s. fail %s-st" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Ava link veebilehitsejas" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Kopeeri link" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "%(current)li. faili allalaadimine %(total)li-st kiirusel %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "%(current)li. faili allalaadimine %(total)li-st" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Sinu Ubuntu väljalaset ei toetata enam." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Uuenduse andmed" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Paigalda" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Versioon %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "Võrguühendust ei leitud, muudatuste logi allalaadimine pole võimalik." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Muudatuste nimekirja allalaadimine..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Eemalda kõik" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "_Vali kõik" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "Valitud on %(count)s uuendus." +msgstr[1] "Valitud on %(count)s uuendust." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s laaditakse alla." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "See uuendus on juba alla laaditud, kuid pole paigaldatud" -msgstr[1] "Need uuendused on juba alla laaditud, kuid pole paigaldatud" +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Allalaadimise suurus pole teada." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1753,7 +1765,7 @@ "Pole teada, millal viimati paketiinfot uuendati. Palun vajutada 'Kontrolli' " "nupule, et seda teha." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1762,14 +1774,14 @@ "Paketiandmeid uuendati viimati %(days_ago)s päeva tagasi.\n" "Vajuta \"Kontrolli\" nuppu, et küsida tarkvarauuendusi." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "Paketiandmeid uuendati viimati %(days_ago)s päev tagasi." msgstr[1] "Paketiandmeid uuendati viimati %(days_ago)s päeva tagasi." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1778,34 +1790,44 @@ msgstr[1] "Paketiandmeid uuendati viimati %(hours_ago)s tundi tagasi." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Paketiinfot uuendati viimati %s minuti eest." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Paketiinfot uuendati hetk tagasi." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Tarkvarauuendused parandavad vigu, kõrvaldavad turvaauke ja lisavad uusi " +"funktsioone." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Sinu arvutile võivad olla kättesaadavad tarkvarauuendused." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Tere tulemast Ubuntusse" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1816,7 +1838,7 @@ "%s vaba ruumi seadmel '%s'. Tühjenda prügikast ja eemalda eelmiste " "paigalduste ajutised pakid käsuga 'sudo apt-get clean'." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1824,23 +1846,23 @@ "Uuenduste paigaldamise lõpetamiseks tuleb arvuti taaskäivitada. Palun " "salvesta enne jätkamist pooleliolevad tööd." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Paketiloendi lugemine" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Ühendumine..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "Võib-olla sa ei saa uuendusi kontrollida või alla laadida." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Paketiloendi lähtestamine polnud võimalik" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1853,7 +1875,7 @@ "Palun raporteeri sellest kui paki 'update-manager' veast ning lisa raportile " "järgnev teade:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1865,31 +1887,31 @@ "Palun raporteeri sellest kui paki 'update-manager' veast ning lisa raportile " "järgnev teade:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (uus paigaldus)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Suurus: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Versioonilt %(old_version)s versioonile %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Versioon %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Väljalaskele uuendamine ei ole praegu võimalik" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1898,21 +1920,21 @@ "Väljalaskele uuendamine ei ole praegu võimalik, proovi hiljem uuesti. Server " "teatas: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Väljalaske uuendamise tööriista allalaadimine" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Saadaval on uus Ubuntu väljalase '%s'" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Tarkvaraindeks on katki" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1922,6 +1944,17 @@ "kasuta palun paketihaldur Synaptic'ut või terminalis käsku \"sudo apt-get " "install -f\"." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Uus väljalase '%s' on saadaval." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Katkesta" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Otsi uuendusi" @@ -1931,22 +1964,18 @@ msgstr "Paigalda kõik saadaval olevad uuendused" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Katkesta" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Uuenduste loendi koostamine" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1970,20 +1999,20 @@ " * Mitteametlikud pakid, mida ei jaga Ubuntu\n" " * Ubuntu eelväljalaske tavapärased muutused" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Muudatuste logi allalaadimine" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Teised uuendused (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "See uuendus ei pärine muudatuste logisid toetavast allikast." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -1991,7 +2020,7 @@ "Muudatuste nimekirja allalaadimine nurjus. \n" "Palun kontrolli oma võrguühendust!" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2004,7 +2033,7 @@ "Saadaval olev versioon: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2017,7 +2046,7 @@ "Senikaua, kuni muudatused logisse ilmuvad, oota natukene \n" "või vaata http://launchpad.net/ubuntu/+source/%s/%s/+changelog" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2030,52 +2059,43 @@ "Senikaua, kuni muudatused logisse ilmuvad, oota natukene \n" "või vaata http://launchpad.net/ubuntu/+source/%s/%s/+changelog" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Distributsiooni tuvastamine nurjus" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Sinu kasutatava süsteemi kindlakstegemisel esines viga '%s'." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Tähtsad turvauuendused" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Soovitatavad uuendused" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Pakutud uuendused" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backport'id" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Distributsiooniuuendused" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Muud uuendused" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Uuendamishalduri käivitamine" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Tarkvarauuendused parandavad vigu, kõrvaldavad turvaauke ja lisavad uusi " -"funktsioone." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "Uuenda _osaliselt" @@ -2145,37 +2165,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Tarkvara uuendused" +msgid "Update Manager" +msgstr "Uuendamishaldur" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Tarkvara uuendused" +msgid "Starting Update Manager" +msgstr "Uuendushalduri käivitamine" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Uuenda" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "uuendused" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Paigalda" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Muudatused" +msgid "updates" +msgstr "uuendused" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Kirjeldus" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Uuenduse kirjeldus" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2183,23 +2193,33 @@ "Oled ühendatud läbi roaming-võrgu ja sulle võidakse esitada suur arve " "uuenduse käigu allalaaditavate andmete suure mahu järgi." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Sa oled ühendatud juhtmeta modemi kaudu." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "On ohutum ühendada arvuti enne uuendamist vooluvõrku." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Paigalda uuendused" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Muudatused" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Seadistused" +msgid "Description" +msgstr "Kirjeldus" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Paigalda" +msgid "Description of update" +msgstr "Uuenduse kirjeldus" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Seadistused" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2222,9 +2242,8 @@ msgstr "Sa keeldusid uuele Ubuntu versioonile uuendamisest" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Sa võid uuendada ka hiljem avades uuenduste halduri ja klõpsates nupule " @@ -2238,57 +2257,57 @@ msgid "Show and install available updates" msgstr "Näita ja paigalda saadaolevad uuendused" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Näitab versiooni ja väljub" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Kataloog, mis sisaldab andmefaile" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Vaata, kas uus Ubuntu väljalase on saadaval" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Kontrollib, kas viimasele arendusväljalaskele uuendamine on võimalik" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "Uuendab väljalaskeuuendaja pakutud viimasele versioonile" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Käivitumisel ei ole fookus kaardil" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Üritatab käivitada dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Käivitamisel ei kontrollita uuendusi" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Testuuendus aufs-liivakastis" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Osalise uuendamise käivitamine" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Proovib uuendada viimasele versioonile kasutades $distro-proposed uuendajat" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2298,11 +2317,11 @@ "Praegu on toetatud 'desktop' tavalistele töölauaarvutitele ja 'server' " "serversisüsteemide jaoks." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Käivita määratud liides" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2310,11 +2329,11 @@ "Kontrollitakse ainult, kas uus distributsiooniväljalase on saadaval ja " "teatatakse sellest väljumiskoodi kaudu" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2322,168 +2341,211 @@ "Versiooniuuenduse info saamiseks külastage:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Uut väljalaset ei leitud" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Uus väljalase '%s' on saadaval." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Sellele uuendamiseks käivita 'do-release-upgrade'." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Ubuntu %(version)s uuendus saadaval" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Sa keeldusid Ubuntu uuendamisest versioonile %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Teostamata meetod: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Fail kettal" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb pakett" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Puuduva paki paigaldamine." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Tuleks paigaldada pakett %s." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb pakett" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s tuleb märkida käsitsipaigalduseks." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"Kui uuendamise ajal on kdelibs4-dev paigaldatud, tuleb paigaldada ka " -"kdelibs5-dev. Täpsemalt aadressil bugs.launchpad.net, viga nr 279621." - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "Olekufailis on %i aegunud kirjet" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Dpkg olekus on aegunud kirjeid" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Dpkg olekukirjed on aegunud" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" -msgstr "Eemalda lilo, kuna ka grub on paigaldatud. (Vaata vearaportit #314004)" +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"Kui uuendamise ajal on kdelibs4-dev paigaldatud, tuleb paigaldada ka " +"kdelibs5-dev. Täpsemalt aadressil bugs.launchpad.net, viga nr 279621." -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "Valitud on %(count)s uuendus." -#~ msgstr[1] "Valitud on %(count)s uuendust." +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s tuleb märkida käsitsipaigalduseks." -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +msgstr "Eemalda lilo, kuna ka grub on paigaldatud. (Vaata vearaportit #314004)" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Tere tulemast Ubuntusse" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Uuendamishaldur" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "Starting Update Manager" -#~ msgstr "Uuendushalduri käivitamine" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Sa oled ühendatud juhtmeta modemi kaudu." +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "_Paigalda uuendused" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "Checking for a new ubuntu release" #~ msgstr "Uue Ubuntu väljalaske kontrollimine" @@ -2521,6 +2583,11 @@ #~ msgid "Your system is up-to-date" #~ msgstr "Süsteem on värske" +#~ msgid "The update has already been downloaded, but not installed" +#~ msgid_plural "The updates have already been downloaded, but not installed" +#~ msgstr[0] "See uuendus on juba alla laaditud, kuid pole paigaldatud" +#~ msgstr[1] "Need uuendused on juba alla laaditud, kuid pole paigaldatud" + #~ msgid "There are no updates to install" #~ msgstr "Pole ühtegi uuendust, mida paigaldada" @@ -2547,6 +2614,9 @@ #~ msgid "1 kB" #~ msgstr "1 kB" +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Ubuntu uuendamine 11.10 versioonile" + #~ msgid "" #~ "The system was unable to get the prerequisites for the upgrade. The " #~ "upgrade will abort now and restore the original system state.\n" diff -Nru update-manager-17.10.11/po/eu.po update-manager-0.156.14.15/po/eu.po --- update-manager-17.10.11/po/eu.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/eu.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-11 21:16+0000\n" "Last-Translator: Ibai Oihanguren \n" "Language-Team: Basque \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "'%s'(e)rako zerbitzaria" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Zerbitzari nagusia" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Zerbitzari pertsonalizatuak" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Ezin izan da sources.list sarrera kalkulatu" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Ezin izan da pakete-fitxategirik aurkitu, agian hau ez da Ubuntu disko bat " "edo okerreko arkitekturarentzako da?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Huts egin du CDa gehitzeak" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,13 +83,13 @@ "Errorearen mezua:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Egoera txarrean dagoen paketea kendu" msgstr[1] "Egoera txarrean dauden paketeak kendu" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -109,15 +110,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Zerbitzaria gainkargatuta egon liteke" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Hautsitako paketeak" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -126,7 +127,7 @@ "honekin. Lehenbailehen konpon itzazu synaptic edo apt-get erabiliz." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -148,13 +149,13 @@ "baten erruz\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Arazo iragankor bat izango da hau ziurrekin, saia zaitez berriro " "beranduxeago." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -162,16 +163,16 @@ "Hauetako bat ere ez bada kasua, eman errore honen berri terminalean agindu " "hau erabiliz: 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Ezin izan da eguneraketa kalkulatu" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Errorea pakete batzuk egiaztatzerakoan" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -181,29 +182,29 @@ "daiteke. Saiatu berriro beranduago. Begiratu azpian egiaztatu ezin izan " "diren paketeen zerrenda." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" "Kentzeko markatuta dago '%s' paketea, baina kentze-zerrenda beltzan dago." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Kentzeko markatuta dago funtsezko '%s' paketea." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Zerrenda beltzeko '%s' bertsioa instalatzen saiatzen" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Ezin da '%s' instalatu" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -212,11 +213,11 @@ "terminalean agindu hau erabiliz: 'ubuntu-bug update-manager'." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Ezin izan da meta-paketea zehaztu" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -230,15 +231,15 @@ " Mesedez, jarraitu aurretik, aurreko paketeetakoren bat instalatu ezazu " "synaptic edo apt-get erabiltzen." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Cache-a irakurtzen" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Ezin izan da blokeo esklusiboa lortu" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -246,11 +247,11 @@ "Baliteke paketeak kudeatzeko beste aplikazio bat (apt-get edo aptitude " "gisakoa) exekutatzen aritzea. Mesedez, itxi ezazu aplikazio hori." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Ezin da urruneko konexio baten bidez bertsio-berritu" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -264,11 +265,11 @@ "\n" "Bertsio-berritzea bertan behera geldituko da. Saiatu ssh gabe." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "SSH erabiliz jarraitu nahi al duzu?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -286,11 +287,11 @@ "atakan.\n" "Jarraitu nahi duzu?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Aparteko sshd abiarazten" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -301,7 +302,7 @@ "abiaraziko da '%s' atakan. Orain martxan dagoen ssh konexioarekin arazoren " "bat badago, aipatutako bigarren horretara konekta zaitezke.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -314,29 +315,29 @@ "adibidea:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Ezin da bertsio-berritu" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Ezin da '%s'(e)tik '%s'(e)ra bertsio-berritu tresna hau erabiliz." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Sandbox-en konfigurazioak huts egin du" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Ezin izan da sandbox ingurunea sortu." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Sandbox modua" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -346,18 +347,18 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Zure python instalazioa oker dago. Mesedez, zuzendu ezazu '/usr/bin/python' " "esteka sinbolikoa." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Instalatuta dago 'debsig-verify' paketea" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -368,12 +369,12 @@ "Synaptic edo 'apt-get remove debsig-verify' erabil ezazu pakete hori " "ezabatzeko, eta abiarazi berriro bertsio-berritzea." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Ezin izan da '%s'(e)n idatzi" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -381,11 +382,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Internet bidez azken eguneraketak barne hartu?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -405,16 +406,16 @@ "azken eguneraketak.\n" "'Ez' erantzuten baduzu, sarea ez da ezertarako erabiliko." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "ezgaituta %s(e)ra bertsio-berritzean" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Ez da baliozko ispilurik aurkitu" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -434,11 +435,11 @@ "'Ez' aukeratzen baduzu bertsio-berritzea bertan behera utziko da." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Lehenetsitako jatorriak sortu?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -452,21 +453,21 @@ "Nahi al duzu '%s'(r)entzako jatorri lehenetsiak gehitzea? 'Ez' aukeratzen " "baduzu, bertsio-berritzea bertan behera utziko da." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Errepositorio-informazio baliogabea" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Hirugarrengoen jatorriak ezgaituta" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -476,13 +477,13 @@ "Berriro gaitu ditzakezu bertsio-berritzearen ondoren, 'software-properties' " "tresna edo zure pakete-kudeatzailea erabiliz." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Paketea egoera ezegonkorrean" msgstr[1] "Paketeak egoera ezegonkorrean" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -501,11 +502,11 @@ "ezin dira haien artxiboak aurkitu. Instalatu pakete horiek eskuz edo ezabatu " "sistematik." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Errorea eguneraketan" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -513,13 +514,13 @@ "Arazo bat gertatu da eguneraketan zehar. Gehienetan sareko arazoren baten " "ondorio izaten da, egiaztatu ezazu zure sare-konexioa eta saiatu berriro." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Ez dago behar beste leku libre diskoan" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -533,32 +534,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Aldaketak kalkulatzen" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Bertsio-berritzea abiarazi nahi al duzu?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Bertsio-berritzea ezeztatuta" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Ezin izan dira bertsio-berritzeak deskargatu" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -566,27 +567,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Errorea egiaztapenean" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Sistemaren jatorrizko egoera berreskuratzen" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Ezin izan dira bertsio-berritzeak instalatu" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -595,7 +596,7 @@ "egoeran geldituko zen agian. Sistema berreskuratzen saiatuko gara oraintxe " "bertan (dpkg --configure -a)" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -606,7 +607,7 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -614,20 +615,20 @@ "Eguneraketa bertan behera gelditu da. Egiaztatu zure Internet konexioa edo " "instalazioa egiteko erabili duzun euskarria eta saiatu berriro. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Zaharkitutako paketeak ezabatu?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Mantendu" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Ezabatu" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -637,37 +638,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Beharrezko menpekotasunen bat ez dago instalatua" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Beharrezko '%s' menpekotasuna ez dago instalatua. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Pakete-kudeatzailea egiaztatzen" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Huts egin du bertsio-berritzea prestatzeak" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Huts egin du bertsio-berritzerako aurrebaldintzak eskuratzeak" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -675,68 +676,68 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Errepositorio-informazioa eguneratzen" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Errorea cdrom-a gehitzean" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Barkatu, cdrom-a gehitzea ez da arrakastatsua izan" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Pakete-informazio baliogabea" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Eskuratzen" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Bertsio-berritzen" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Bertsio-berritzea burututa" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "Bertsio-berritzea burutu da, baina prozesuan erroreak egon dira." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Software zaharkitua bilatzen" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Sistemaren bertsio-berritzea burutu da." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Bertsio-berritze partziala burutu da." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms erabilpean" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -746,11 +747,11 @@ "ez dago 'evms' softwarearentzako sostengurik; mesedez, itzali ezazu eta " "eguneraketa berrabiarazi ezazu." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -758,9 +759,9 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -768,8 +769,8 @@ "Bertsio-berritzeak mahaigaineko efektuak murriztu dezake, edo jokoen eta " "grafikoen erabilera intentsibodun programen errendimendua gutxitu." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -783,7 +784,7 @@ "\n" "Jarraitu nahi duzu?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -797,11 +798,11 @@ "\n" "Jarraitu nahi duzu?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Ez da i686 PUZa¡" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -812,11 +813,11 @@ "Pakete guztiak i686 behar duten optimizazioak eginez sortu dira. Ez da " "posible zure sistema Ubuntu banaketa berrira eguneratzea." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Ez dago ARMv6 PUZik" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -828,11 +829,11 @@ "ziren. Ezin da sistema Ubunturen bertsio berri batera bertsio-berritu " "hardware honekin." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Ez dago init-ik" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -848,17 +849,17 @@ "\n" "Ziur al zaude jarraitu nahi duzula?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Sandbox eguneratu aufs erabiliz" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Erabili emandako bide-izena pakete bertsio-berrigarriak dituen CDROMa " "bilatzeko" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -866,57 +867,57 @@ "Erabiltzaile-interfazea erabili. Orain erabilgarriak: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "Bertsio-berritze partziala bakarrik (ez da sources.list berridatziko)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Datu-karpeta ezarri" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Mesedez, sartu '%s' '%s' unitatean" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Deskarga amaitu da" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "%li / %li fitxategia eskuratzen %sB/s abiaduran" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "%s inguru falta da" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "%li / %li fitxategia eskuratzen" @@ -926,27 +927,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Aldaketak aplikatzen" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "menpekotasun arazoak - konfiguratu gabe utzi da" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Ezin izan da '%s' instalatu" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -958,7 +959,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -969,7 +970,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -977,20 +978,20 @@ "Konfigurazio-fitxategi honi egindako aldaketa guztiak galduko dituzu bertsio " "berriago batekin ordezkatzen baduzu." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Ez da 'diff' agindua aurkitu" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Errore larria gertatu da" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1003,13 +1004,13 @@ "Zure jatorrizko sources.list fitxategia /etc/apt/sources.list.distUpgrade-n " "gorde dugu." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ktrl+C sakaturik" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1018,136 +1019,136 @@ "utz dezake. Ziur zaude hori egitea nahi duzula?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Datuen galera saihesteko, itxi itzazu irekitako aplikazio eta dokumentu " "guztiak." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Canonicalek ez du sostengatzen (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Atzerantz-eguneratu (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Ezabatu (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Ez da gehiago behar (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Instalatu (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Eguneratu (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Euskarri aldaketa" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Ezberdintasunak erakutsi >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Ezberdintasunak ezkutatu" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Errorea" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Utzi" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Itxi" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Terminala erakutsi >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Terminala ezkutatu" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Informazioa" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Xehetasunak" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Ez dago sostengatuta %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "%s ezabatu" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "%s ezabatu (automatikoki instalatu zen)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "%s instalatu" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "%s bertsio-berritu" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Berrabiaraztea beharrezkoa" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Berrabiarazi sistema bertsio-berritzea burutu dadin" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Berrabiarazi orain" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1159,32 +1160,32 @@ "Sistema erabili ezineko moduan gera daiteke bertsio-berritzea bertan behera " "uzten baduzu. Bertsio-berritzearekin jarraitzea biziki gomendatzen dizugu." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Bertsio-berritzea ezeztatu?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "Egun bat" msgstr[1] "%li egun" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "ordubete" msgstr[1] "%li ordu" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "minutu bat" msgstr[1] "%li minutu" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1200,7 +1201,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s eta %(str_hours)s" @@ -1214,14 +1215,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s eta %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1231,34 +1232,32 @@ "modem batekin." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Deskarga honek %s inguru iraungo du zure konexioarekin. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Bertsio-berritzeko prestatzen" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Software-kanal berriak eskuratzen" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Pakete berriak eskuratzen" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Bertsio-berritzeak instalatzen" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Garbitzen" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1275,28 +1274,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "Pakete %d ezabatuko da." msgstr[1] "%d pakete ezabatuko dira." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "Pakete berri %d instalatuko da." msgstr[1] "%d pakete berri instalatuko dira." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "Pakete %d bertsio-berrituko da." msgstr[1] "%d pakete bertsio-berrituko dira." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1307,28 +1306,28 @@ "\n" "%s deskargatu beharko dituzu guztira. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Ordenagailu honetako softwarea eguneratuta dago." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1336,72 +1335,72 @@ "Ez dago bertsio-berritzerik zure sistemarako. Bertsio-berritzea bertan " "behera utziko da." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Berrabiaraztea beharrezkoa" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Bertsio-berritzea burutu da eta ordenagailua berrabiarazteko beharra dago. " "Orain egin nahi al duzu?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "'%s' erauzten" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Ezin izan da bertsio-berritzeko tresna abiarazi" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Bertsio-berritzeko tresnaren sinadura" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Bertsio-berritzeko tresna" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Errorea eskuratzean" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "Ezin izan da bertsio-berritzea eskuratu. Sarearekin arazoren bat egon " "liteke. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Autentifikazioak huts egin du" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1409,13 +1408,13 @@ "Ezin izan da bertsio-berritzea autentifikatu. Sarearekin edo " "zerbitzariarekin arazoren bat egon liteke. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Erauzteak huts egin du" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1423,13 +1422,13 @@ "Ezin izan da bertsio-berritzea erauzi. Sare edo zerbitzariarekin arazoren " "bat egon liteke. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Egiaztapenak huts egin du" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1437,27 +1436,27 @@ "Ezin izan da bertsio-berritzea egiaztatu. Sarearekin edo zerbitzariarekin " "arazoren bat egon liteke. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Ezin da bertsio-berritzea abiarazi" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Hau da errorearen mezua: '%s'" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1470,73 +1469,73 @@ "Zure jatorrizko sources.list fitxategia hemen gorde da: /etc/apt/sources." "list.distUpgrade" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Bertan behera uzten" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Degradatuta:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Jarraitzeko sakatu [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Jarraitu [bE] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Xehetasunak [x]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "b" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "e" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "x" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Ez dago sostengatuta: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "%s ezabatu\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "%s instalatu\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Bertsio-berritu: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Jarraitu [Be] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1603,9 +1602,8 @@ msgstr "Banaketaren bertsio-berritzea" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Ubuntu 11.10 bertsiora eguneratzen" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Ubuntu 12.04 bertsiora eguneratzen" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1623,136 +1621,143 @@ msgid "Terminal" msgstr "Terminala" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Itxoin mesedez, honek denbora behar du." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Eguneraketa burutu da" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Ezin izan dira bertsio-oharrak aurkitu" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Zerbitzaria gainkargaturik egon liteke. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Ezin izan dira bertsio-oharrak deskargatu" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Egiaztatu ezazu zure Internet konexioa, mesedez." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Bertsio-berritu" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Bertsio-oharrak" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Pakete-fitxategi gehigarriak deskargatzen..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "%s fitxategitik %s.a %sB/s abiaduran" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "%s fitxategitik %s.a" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Lotura nabigatzailearekin ireki" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Kopiatu lotura arbelean" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "%(current)li / %(total)li fitxategia deskargatzen - %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "%(current)li / %(total)li fitxategia deskargatzen" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Darabilzun Ubunturen bertsioak ez du sostengurik dagoeneko." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Bertsio-berritu informazioa" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Instalatu" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "%s bertsioa: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Ez da sare konexiorik atzeman, ezin duzu aldaketa-egunkariaren informazioa " "deskargatu." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Aldaketen zerrenda deskargatzen..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Desautatu denak" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Hautatu _denak" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "Eguneraketa %(count)s aukeratu da." +msgstr[1] "%(count)s eguneraketa aukeratu dira." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s deskargatuko dira." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "Eguneraketa dagoeneko deskargatu da, baina ez da instalatu." msgstr[1] "Eguneraketak dagoeneko deskargatu dira, baina ez dira instalatu." @@ -1760,11 +1765,18 @@ msgid "There are no updates to install." msgstr "Ez dago instalatu beharreko eguneraketarik." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Deskarga tamaina ezezaguna." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1772,7 +1784,7 @@ "Pakete informazioaren azken eguneraketa ezezaguna da. Mesedez klikatu " "'Egiaztatu' botoia informazioa eguneratzeko." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1781,14 +1793,14 @@ "Paketeen informazioa duela %(days_ago)s egun eguneratu zen azkenekoz.\n" "Sakatu ondorengo 'Egiaztatu' botoia software-eguneraketa berriak bilatzeko." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "Pakete informazioa orain dela egun %(days_ago)s eguneratu zen." msgstr[1] "Pakete informazioa orain dela %(days_ago)s egun eguneratu zen." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1797,35 +1809,45 @@ msgstr[1] "Paketeen informazioa duela %(hours_ago)s ordu eguneratu da." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Pakete informazioa duela %s minutu eguneratu da azken aldiz." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Pakete informazioa oraintsu eguneratu da." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Software eguneratzeek akatsak eta segurtasun arazoak kentzen dituzte, eta " +"ezaugarri berriak eskaintzen dituzte." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" "Software eguneraketak eskuragarri egon daitezke zure ordenagailuarentzat." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Ongi etorri Ubuntura" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1836,7 +1858,7 @@ "%s '%s' diskoan. Hustu zakarrontzia eta ezabatu instalazio zaharkituen aldi " "baterako paketeak 'sudo apt-get clean' erabiliz." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1844,23 +1866,23 @@ "Ordenagailua berrabiarazi behar da eguneraketen instalazioa burutzeko. Gorde " "zure lanak jarraitu aurretik." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Pakete-informazioa irakurtzen" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Konektatzen..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "Baliteke ez zarela gai izango eguneraketak bilatu edo instalatzeko." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Ezin izan da pakete-informazioa hasieratu" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1873,7 +1895,7 @@ "'update-manager' osagaiaren bug bezala bidali honen informazioa eta bidali " "ondoko errore mezua:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1885,31 +1907,31 @@ "'update-manager' osagaiaren bug bezala bidali honen informazioa eta bidali " "ondoko errore mezua:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Instalazio berria)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Tamaina: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "%(old_version)s bertsiotik %(new_version)s bertsiora" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "%s bertsioa" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Ezin da banaketa une honetan eguneratu" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1918,21 +1940,21 @@ "Banaketa eguneraketa ezin da orain egin, saiatu beranduago. Zerbitzariak " "zera esan du: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Bertsio-berritzeko tresna deskargatzen" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Ubunturen '%s' bertsio berria eskuragarri dago" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Software-indizea hondatuta dago" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1942,6 +1964,17 @@ "kudeatzailea erabili edo terminal batean \"sudo apt-get install -f\" " "exekutatu ezazu arazo hau konpontzeko." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "'%s' bertsio berria eskuragarri dago." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Utzi" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Eguneraketak bilatu" @@ -1951,22 +1984,18 @@ msgstr "Instalatu eskuragarri dauden eguneraketa guztiak" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Utzi" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Aldaketa-egunkaria" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Eguneraketak" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Eguneraketen zerrenda eraikitzen" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1990,20 +2019,20 @@ " *Ubuntu-k ez hornitutako software paketeak\n" " *Aldaketa normalak Ubuntu-ren aurreko bertsio batean" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Aldaketen txostena deskargatzen" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Beste eguneraketak (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "Eguneraketa hau ez dator changelog-ak onartzen dituen jatorri batetik." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2011,7 +2040,7 @@ "Huts egin du aldaketen zerrenda deskargatzeak.\n" "Mesedez, egiaztatu ezazu zure Interneterako konexioa." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2024,7 +2053,7 @@ "Bertsio eskuragarria: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2037,7 +2066,7 @@ "Erabili http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "aldaketak eskuragarri jarri arte edo saiatu beranduago." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2049,54 +2078,45 @@ "Mesedez http://launchpad.net/ubuntu/+source/%s/%s/+changelog erabili\n" "aldaketak eskuragarri egon bitartean edo saiatu berriz beranduago." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Huts egin du banaketaren detekzioak" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" "'%s' errorea gertatu da zein sistema erabiltzen ari zaren antzematen zen " "bitartean" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Segurtasun-eguneratze garrantzitsuak" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Gomendatutako eguneratzeak" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Proposaturiko eguneratzeak" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backport-ak" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Banaketa-eguneraketak" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Beste eguneratzeak" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Eguneraketa-kudeatzailea abiarazten" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Software eguneratzeek akatsak eta segurtasun arazoak kentzen dituzte, eta " -"ezaugarri berriak eskaintzen dituzte." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "Eguneraketa _partziala" @@ -2168,61 +2188,61 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Software-eguneratzeak" +msgid "Update Manager" +msgstr "Eguneraketa-kudeatzailea" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Software-eguneratzeak" +msgid "Starting Update Manager" +msgstr "Eguneraketa kudeatzailea abiarazten" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Bertsio-berritu" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "eguneratze" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Instalatu" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Aldaketak" +msgid "updates" +msgstr "eguneratze" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Deskribapena" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Eguneraketaren deskribapena" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Hari gabeko modem bidez konektatuta zaude." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Seguruagoa da eguneratzen hasi aurretik ordenagailua argi-indar iturri " "batera konektatzea." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Instalatu eguneraketak" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Aldaketak" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Ezarpenak..." +msgid "Description" +msgstr "Deskribapena" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Instalatu" +msgid "Description of update" +msgstr "Eguneraketaren deskribapena" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Ezarpenak..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2247,9 +2267,8 @@ msgstr "Ubuntu berrira bertsio-berritzea baztertu duzu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Beranduago bertsio-berritu dezakezu Eguneraketa-kudeatzailea irekiz eta " @@ -2263,59 +2282,59 @@ msgid "Show and install available updates" msgstr "Eguneratze eskuragarriak erakutsi eta instalatu" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Bertsioa erakutsi, eta irten" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Datu-fitxategiak dituen direktorioa" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Egiaztatu ea Ubuntu bertsio berririk dagoen" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Azken garapen-bertsiora eguneratzea posible den egiaztatu" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Bertsio-berritu eguneraketa-kudeatzaileak proposatutako azken bertsiora" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Ez enfokatu mapan hasten denean." -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "dist-upgrade exekutatzen saiatu" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Ez bilatu eguneraketak abiaraztean" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Bertsio berria probatu sandbox aufs gainjartze batekin" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Bertsio-berritze partziala exekutatzen" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Erakutsi paketearen deskribapena aldaketa-egunkariaren ordez" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Saiatu azken bertsiora bertsio-berritzen $distro-proposed(r)en bertsio-" "berritzailea erabiliz" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2325,11 +2344,11 @@ "Momentuz 'desktop' (mahaigaineko sistema baten ohiko bertsio-" "berritzeentzako) eta 'server' (zerbitzarientzat) jasaten dira." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Zehaztutako erabiltzaile-interfazea exekutatu" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2337,11 +2356,11 @@ "Bakarrik bilatu bertsioaren distribuzio berri bat erabilgarria dagoenean eta " "bidali emaitza irteera-kodigoa erabiliz" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Ubunturen bertsio berri baten bila" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2349,121 +2368,138 @@ "Bertsio-berritzearen informazio gehiago:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Ez da bertsio berririk aurkitu" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "'%s' bertsio berria eskuragarri dago." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Exekutatu 'do-release-upgrade' bertsio-berritzeko." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Ubuntu %(version)s(r)en bertsio-berritzea eskuragarri" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Ubuntu %s bertsio berria ezetsi duzu." -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Dagoeneko ezin da deskargatu:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Sostengurik gabe: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Sostenguduna %s(e)rarte:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Implementatu gabeko metodoa: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Diskoko fitxategi bat" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb paketea" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Falta den paketea instalatu." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "%s paketea instalatu beharko litzateke." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb paketea" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s markatuta izan behar da eskuz instalatuta bezala." +msgid "%i obsolete entries in the status file" +msgstr "%i sarrera zaharkituta egoera-fitxategian" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "Sarrera zaharkitutak dpkg egoeran" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "dpkg egoera-sarrera zaharkitutak" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2472,51 +2508,74 @@ "instalatu behar da. Ikusi bugs.launchpad.net, bug #279621 xehetasun " "gehiagorako." -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "%i sarrera zaharkituta egoera-fitxategian" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "Sarrera zaharkitutak dpkg egoeran" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "dpkg egoera-sarrera zaharkitutak" +msgid "%s needs to be marked as manually installed." +msgstr "%s markatuta izan behar da eskuz instalatuta bezala." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Lilo kendu Grub iada instalatuta dagoelako.(Xehetasun gehiagorako ikusi " "#314004 bug-a)" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Ubuntu 12.04 bertsiora eguneratzen" - -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "Eguneraketa %(count)s aukeratu da." -#~ msgstr[1] "%(count)s eguneraketa aukeratu dira." - -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" - -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Ongi etorri Ubuntura" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Eguneraketa-kudeatzailea" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "Starting Update Manager" -#~ msgstr "Eguneraketa kudeatzailea abiarazten" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Hari gabeko modem bidez konektatuta zaude." +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "_Instalatu eguneraketak" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "Checking for a new ubuntu release" #~ msgstr "Ubuntu bertsio berriak bilatzen" @@ -2577,6 +2636,9 @@ #~ msgid "%.0f kB" #~ msgstr "%.0f kB" +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Ubuntu 11.10 bertsiora eguneratzen" + #~ msgid "" #~ "You will not get any further security fixes or critical updates. Please " #~ "upgrade to a later version of Ubuntu Linux." diff -Nru update-manager-17.10.11/po/fa.po update-manager-0.156.14.15/po/fa.po --- update-manager-17.10.11/po/fa.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/fa.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-05-11 19:17+0000\n" "Last-Translator: MohamadReza Mirdamadi \n" "Language-Team: Persian \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f مگابایت" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "کارگزاران برای %s" @@ -42,31 +43,31 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "کارگزار اصلی" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "کارگزاران سفارشی" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "مدخل sources.list محاسبه نشد" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" "هیچ بسته‌ای پیدا نشد، شاید این لوح اوبونتو نیست و یا معماری آن متفاوت است." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -76,13 +77,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -93,28 +94,28 @@ "but no archives can be found for them. Do you want to remove these packages " "now to continue?" msgstr[0] "" -"بسته(های) '%s' در وضعیتی نا استوار است(هستند) و نیاز به نصب مجدد دارد" -"(دارند) ، اما هیچ بسته ای برای نصب مجدد یافت نمی شود آیا حالا مایل به حذف " -"بسته(ها) برای ادامه هستید؟" +"بسته(های) '%s' در وضعیتی نا استوار است(هستند) و نیاز به نصب مجدد " +"دارد(دارند) ، اما هیچ بسته ای برای نصب مجدد یافت نمی شود آیا حالا مایل به " +"حذف بسته(ها) برای ادامه هستید؟" #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -135,65 +136,65 @@ " *بسته‌های نرم‌افزاری غیر رسمی که توسط اوبوونتو آماده نشده\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "بسته '%s' برای حذف علامتگذاری شده است اما در لیست سیاه حذفیات است." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "بسته حیاتی '%s' برای حذف علامتگذاری شده است." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -202,25 +203,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "ارتقا با اتصال دوردست پشتیبانی نشده است" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -229,11 +230,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -244,11 +245,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -256,7 +257,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -265,29 +266,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "نصب sandbox شکست خورد" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "ایجاد محیط sandbox امکان پذیر نبود." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "حالت sandbox" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -297,28 +298,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -326,11 +327,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -342,16 +343,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "غیر فعال شده بر ارتقا به %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -364,11 +365,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -377,34 +378,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -419,23 +420,23 @@ "آرشیوی برای آن یافت نشد. لطفاً بسته را به صورت دستی مجدد نصب کنید یا از سیستم " "حذفش کنید." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -446,32 +447,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -479,33 +480,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -516,26 +517,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -543,37 +544,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -581,68 +582,68 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms در حال استفاده" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -652,11 +653,11 @@ "'evms' پشتیبانی نیمشود، لطفا آن را خاموش کنید و هنگامی‌که تمام شد دوباره " "ارتقا را اجراکنید." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -664,16 +665,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -682,7 +683,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -691,11 +692,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -703,11 +704,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -715,11 +716,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -729,71 +730,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "ارتقا Sandbox با استفاده از aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -803,27 +804,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -833,7 +834,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -842,26 +843,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -869,147 +870,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1017,32 +1018,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1058,7 +1059,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1072,14 +1073,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1089,34 +1090,32 @@ "می‌انجامد." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1129,28 +1128,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1158,145 +1157,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1304,73 +1303,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1428,7 +1427,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1447,164 +1446,180 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1613,34 +1628,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1648,29 +1671,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1679,7 +1702,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1687,58 +1710,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1748,22 +1781,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1777,26 +1806,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1805,7 +1834,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1814,7 +1843,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1823,47 +1852,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1924,54 +1947,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1996,7 +2022,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -2008,218 +2034,284 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" #~ msgid "" diff -Nru update-manager-17.10.11/po/fil.po update-manager-0.156.14.15/po/fil.po --- update-manager-17.10.11/po/fil.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/fil.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2007. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-10-31 07:20+0000\n" "Last-Translator: JeanAustinR \n" "Language-Team: Filipino \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Mga Server para sa %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Pangunahing server" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Mga pasadyang server" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Hindi makalkula ang nakatala sa sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Walang paketeng natagpuan, maaaring hindi ito Ubuntu Disc o ang arkitektura " "nito ay mali?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Hindi naidagdag ang CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,13 +83,13 @@ "Ang error message ay:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Alisin ang mga paketeng nasa masamang kalagayan" msgstr[1] "Alisin ang mga package na masama ang lagay" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -109,15 +110,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Baka sobrang kargado ang server" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Mga sirang package" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -127,7 +128,7 @@ "get bago magpatuloy." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -148,13 +149,13 @@ " * Hindi opisyal na paketeng software na di mula sa Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Malamang sa malamang, ito ay isang mapaparam na suliraning. Mangyaring " "pakisubukan muli mamaya." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -162,16 +163,16 @@ "Kung wala dito ang nalalapat, iulat ang bug na ito gamit ang command na " "'ubuntu-bug update-manager' sa isang terminal." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Hindi makalkula ang upgrade" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "May problema sa pagkilala sa ibang mga package" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -181,7 +182,7 @@ "problema sa network. Maaari kayong sumubok muli mamaya. Ang mga sumusunod ay " "ang mga package na hindi makilala." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -189,22 +190,22 @@ "Ang paketeng '%s' ay namarkahan upang matanggal ngunit ito ay na sa talaan " "ng mga paketeng hindi maaaring tanggalin." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Ang mahalagang paketeng '%s' ay namarkahan upang matanggal." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Sinusubukang i-install ang naka-blacklist na bersyong '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Hindi ma-install ang '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -214,11 +215,11 @@ "sa isang terminal." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Hindi mahulaan ang meta-package" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -232,15 +233,15 @@ " Mag-install muna ng isa sa mga nabanggit na package gamit ang synaptic o " "apt-get bago magtuloy." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Binabasa ang cache" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Hindi makuha ang exclusive lock" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -249,11 +250,11 @@ "application (tulad ng apt-get o aptitude) ang tumatakbo na. Paki-sara muna " "ang application na iyon." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Walang suporta para sa pag-upgrade mula sa isang remote connection" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -262,11 +263,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Ituloy ang pagpapatakbo sa ilalim ng SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -277,11 +278,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Nagbubukas ng karagdagang sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -292,7 +293,7 @@ "karagdagang sshd na bubuksan sa port '%s'. Kung may mangyayari mang hindi " "maganda sa tumatakbong ssh, maaari niyong gamitin ang bagong idinagdag.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -301,31 +302,31 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Hindi makapag-upgrade" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" "Ang pag-upgrade mula '%s' patungong '%s' ay hindi suportado ng kagamitang " "ito." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Nagbigo ang pagsasaayos ng Sandbox" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Hindi naging posible ang paggawa ng sandbox environment." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Sandbox mode" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -335,17 +336,17 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Sira ang inyong python install. Paki-ayos ang '/usr/bin/python' symlink." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Ang package na 'debsig-verify' ay naka-install" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -356,12 +357,12 @@ "Paki-alis lamang ito mula sa Synaptic, o kaya 'apt-get remove debsig-verify' " "muna, at gawin muli ang upgrade." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -369,11 +370,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Isama ang pinakabagong update mula sa Internet?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -394,16 +395,16 @@ "install ninyo ang mga pinakabagong update pagkatapos ng upgrade.\n" "Kung 'hindi' ang inyong pipiliin, ang network ay hindi gagamitin." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "disabled sa pag-upgrade patungong %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Walang mirror na natagpuan" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -416,11 +417,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Gumawa ng default sources?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -429,21 +430,21 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Repository information invalid" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Hindi gagamitin ang third party sources" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -453,13 +454,13 @@ "Maaari ninyo itong gamitin pagkatapos ng upgrade gamit ang 'software-" "properties' tool o ang inyong package manager." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Mayroong mali sa package" msgstr[1] "Mayroong mali sa mga package" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -472,11 +473,11 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Problema habang nagu-update" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -485,13 +486,13 @@ "problema sa network, mangyaring tiyakin ang inyong koneksyon sa network at " "subukan muli." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Kulang sa libreng disk space" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -502,21 +503,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Kinakalkula ang mga pagbabago" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Simulan na ba ang upgrade?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Ikinansela ang upgrade" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -524,12 +525,12 @@ "Ang upgrade ay makakansel na ngayon at ang orihinal na kalagayan ng sistema " "ay ibabalik. Ang upgrade ay maaari mong ituloy sa susunod." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Hindi ma-download ang mga upgrade" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -537,33 +538,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Error during commit" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Ibinabalik ang orihinal na kalagayan ng sistema" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Hindi ma-install ang mga upgrade" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -574,26 +575,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Tanggalin ang mga lumang package?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Itago" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Tanggalin" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -603,37 +604,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Ang mga kinakailangang depend ay hindi naka-install" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Ang kinakailangang dependency '%s' ay hindi naka-intall. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Sinusuri ang package manager" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Nabigo sa paghahanda ng upgrade" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Nabigong kunin ang mga pangangailangan para sa pag-upgrade" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -641,68 +642,68 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Ina-update ang repository information" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Invalid package information" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Kinukuha" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Nagu-upgrade" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Tapos na ang upgrade" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Naghahanap ng mga lumang software" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Tapos na ang System upgrade." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Ang bahagyang upgrade ay tapos na." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "Kasalukuyang ginagamit ang evms" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -712,11 +713,11 @@ "software na 'evms' ay hindi na sinusuportahan, pakipatay lamang ito at " "muling simulan ang upgrade." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -724,9 +725,9 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -734,8 +735,8 @@ "Maaaring mabawasan ng pag-upgrade ang desktop effects, at mapabagal ang mga " "laro at mga programang magamit sa graphic." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -744,7 +745,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -753,11 +754,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -765,11 +766,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -777,11 +778,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -791,17 +792,17 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Sandbox upgrade gamit ang aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Gamitin ang nabanggit na path para hanapin ang cdrom na may mga upgradable " "package" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -809,59 +810,59 @@ "Gamitin ang frontend. Mga maaaring gamitin: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Magsagawa ng bahagyang pagsasangayon (update) lamang (no sources.list " "rewriting)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "I-set ang datadir" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Pakipasok ang '%s' sa loob ng drive '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Ang pagkuha ay tapos na" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Kinukuha ang file %li ng %li sa bilis na %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Mga %s ang nalalabi" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Kinukuha ang file %li ng %li" @@ -871,27 +872,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Ginagawa ang mga pagbabago" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Hindi ma-install ang '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -901,7 +902,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -912,7 +913,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -920,20 +921,20 @@ "Mawawala ang mga pagbabagong ginawa ninyo dito sa configuration file na ito " "kung pipiliin ninyong palitan ito ng mas bagong bersyon." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Ang 'diff' command ay hindi natagpuan" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Isang fatal error ang nangyari" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -941,13 +942,13 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Pinindot ang Ctrl-c" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -956,136 +957,136 @@ "Sigurado ba kayong nais niyong gawin ito?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Para maiwasan ang pagkawala ng data, isara ang mga nakabukas na application " "at mga dokumento." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Pagpapalit ng Media" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Ipakita ang Pagkakaiba >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Itago ang Pagkakaiba" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Pagkakamali" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Kanselahin" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Isara" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Ipakita ang Terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Itago ang Terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Impormasyon" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Mga detalye" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Tanggalin %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Install %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Upgrade %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Kinakailangang mag-restart" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "I-restart ang sistema para tapusin ang upgrade" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Mag-restart Ngayon" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1097,32 +1098,32 @@ "Maaaring masira ang sistema kung ikakansela ang upgrade. Ipinapayong " "ipagpatuloy ang upgrade." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Itigil ang Upgrade?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li araw" msgstr[1] "%li mga araw" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li oras" msgstr[1] "%li mga oras" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minuto" msgstr[1] "%li mga minuto" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1138,7 +1139,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1152,14 +1153,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1169,35 +1170,33 @@ "gamit ang 56k modem." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" "Ang download na ito ay magtatagal ng mga %s gamit ang inyong koneksyon. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Naghahanda sa pag-upgrade" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Kinukuha ang mga bagong software channel" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Kinukuha ang mga bagong pakete" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Ini-install ang mga upgrade" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Naglilinis" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1210,28 +1209,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d package ay tatanggalin." msgstr[1] "%d mga package ay tatanggalin." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d bagong package ang ii-install." msgstr[1] "%d mga baong package ang ii-install." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d package ang iu-upgrade." msgstr[1] "%d mga package ang iu-upgrade." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1242,96 +1241,96 @@ "\n" "Ang kabubuhan niyong kinakailangang i-download ay %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "Wala pang upgrade na para sa inyong sistema. Ititigil na ang upgrade." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Kailangang mag-reboot" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Tapos na ang upgrade at kailangang mag-reboot. Gusto niyo ba itong gawin na?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Hindi matagpuan ang upgrade tool" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Upgrade tool signature" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Upgrade tool" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Nabigo sa pagkuha" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Nabigo sa pagkuha ng upgrade. Marahil ay may problema sa network. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Nabigo ang authentication" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1339,13 +1338,13 @@ "Nabigo ang authentication ng upgrade. Marahil ay may problema sa network o " "sa server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Nabigo sa pag-extract" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1353,40 +1352,40 @@ "Nabigo sa pag-extract ng upgrade. Marahil ay may problema sa network o sa " "server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" "Nabigo ang verification. Marahil ay may problema sa network o sa server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Hindi mapatakbo ang upgrade" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Ang mensahe ng pagkakamali ay '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1394,73 +1393,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Itinitigil" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Demoted:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Magpatuloy [oH] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Mga detalye [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "o" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "h" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Tanggalin: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "I-install: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "I-upgrade: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Magpatuloy [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1524,7 +1523,7 @@ msgstr "Pag-upgrade ng Distribution" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1543,166 +1542,180 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Maghintay lamang, maaari itong tumagal." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Tapos na ang update" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Hindi matagpuan ang release notes" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Maaaring overloaded ang server. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Hindi ma-download ang release notes" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Suriin ang inyong internet connection." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Upgrade" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Release Notes" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Kumukuha ng mga karagdagang file ng mga pakete..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "File %s ng %s sa bilis na %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "File %s ng %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Buksan ang Link sa Browser" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Kopyahin ang Link tungo sa Clipboard" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Idina-download ang file %(current)li ng %(total)li sa %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Idina-download ang file %(current)li ng %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "I-install" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Bersyon %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Kinukuha ang listahan ng mga pagbabago" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "Maaaring overloaded ang server. " -msgstr[1] "Maaaring overloaded ang server. " +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1711,34 +1724,44 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Ang software updates ay nagtatama ng mga error, nagtatanggal ng mga security " +"vulnerability at nagbibigay ng mga bagong katangian." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Maligayang pagdating sa Ubuntu" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1746,29 +1769,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Binabasa ang impormasyon tungkol sa pakete" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Hindi ma-initialize ang package information" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1777,7 +1800,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1785,52 +1808,52 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Laki: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Galing sa bersyon %(old_version)s tungong %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Bersyon %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Ang software index ay sira" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1840,6 +1863,16 @@ "lamang gamitin ang \"Synaptic\" package manager o parakbuhin ang \"sudo apt-" "get install -f\" sa loob ng terminal para maayos ang isyung ito." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Itigil" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1849,22 +1882,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Itigil" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Ginagawa ang Talaan ng mga Update" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1878,20 +1907,20 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Kinukuha ang changelog" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -1899,7 +1928,7 @@ "Nabigo ang pagkuha sa listahan ng mga pagbabago. \n" "Suriin ang inyong internet connection." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1908,7 +1937,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1917,7 +1946,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1926,54 +1955,45 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Nabigong alamin ang distribusyon." -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" "Ang error na '% s' ay naganap habang sinisiyasat kung ano ang sistemang " "iyong ginagamit." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Mga mahahalagang security update" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Mga inirerekomendang update" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Mga iminumungkahing update" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Mga backport" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Mga update para sa distribution" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Iba pang mga update" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Binubuksan ang Update Manager" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Ang software updates ay nagtatama ng mga error, nagtatanggal ng mga security " -"vulnerability at nagbibigay ng mga bagong katangian." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Bahagiang Upgrade" @@ -2032,59 +2052,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Mga Software Update" +msgid "Update Manager" +msgstr "Update Manager" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Mga Software Update" +msgid "Starting Update Manager" +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "U_pgrade" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "mga update" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "I-install" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Mga Pagbabago" +msgid "updates" +msgstr "mga update" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Paglalarawan" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Pagsasalarawan ng update" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Mag-install ng mga Update" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Mga Pagbabago" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "" +msgid "Description" +msgstr "Paglalarawan" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "I-install" +msgid "Description of update" +msgstr "Pagsasalarawan ng update" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2108,7 +2128,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -2120,230 +2140,287 @@ msgid "Show and install available updates" msgstr "Ipakita lahat ng maaaring i-install na update" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Ipakita ang bersyon at lumabas" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Tignan kung ang pag-upgrade sa pinakabagong devel release ay maaari" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Subukang magpatakbo ng dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Tumatakbong bahagiang upgrade" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Patakbuhin ang piniling frontend" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Walang nakitang bagong release" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb package" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Ini-install ang nawawalang pakete." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Ang paketeng %s ay dapat i-install." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb package" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s ay kailangang markahan bilang mano-manong nai-install" - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s ay kailangang markahan bilang mano-manong nai-install" + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Tanggalin ang lilo sapagka't naka-install ang grub. (Tignan ang bug #314004 " "para sa karagdagang impormasyon.)" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Maligayang pagdating sa Ubuntu" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Update Manager" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "_Mag-install ng mga Update" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "Checking for a new ubuntu release" #~ msgstr "Tignan kung may bagong Ubuntu release" diff -Nru update-manager-17.10.11/po/fi.po update-manager-0.156.14.15/po/fi.po --- update-manager-17.10.11/po/fi.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/fi.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # Timo Jyrinki , 2005-2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-04-16 05:36+0000\n" "Last-Translator: Aleksi Kinnunen \n" "Language-Team: Finnish \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "%(size).0f kt" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f Mt" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Palvelin maalle %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Pääpalvelin" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Määrittele palvelin" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "sources.list-riviä ei voi laskea" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Pakettitiedostoja ei löydetty. Ehkä tämä ei ole Ubuntu-levy, tai kyseessä on " "väärä arkkitehtuuri?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "CD-levyä ei voitu lisätä" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,13 +83,13 @@ "Virheilmoitus oli:\n" "\"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Poista huonossa tilassa oleva paketti" msgstr[1] "Poista huonossa tilassa olevat paketit" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -109,15 +110,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Palvelin saattaa olla ylikuormitettu" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Rikkinäisiä paketteja" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -127,7 +128,7 @@ "jatkamista." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -148,11 +149,11 @@ " * Ubuntuun kuulumattomien, epävirallisten ohjelmapakettien käyttämisestä\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Tämä on luultavasti hetkellinen ongelma. Yritä myöhemmin uudelleen." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -160,16 +161,16 @@ "Jos mikään näistä ei täsmää, niin ilmoita ohjelmistovirheestä kirjoittamalla " "päätteeseen \"ubuntu-bug update-manager\"." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Tarvittavia päivitykseen liittyviä tarkistuksia ei voitu tehdä" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Joitain paketteja todennettaessa tapahtui virhe" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -179,7 +180,7 @@ "Voit yrittää myöhemmin uudelleen. Alla on luettelo todentamattomista " "paketeista." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -187,22 +188,22 @@ "Paketti \"%s\" on merkitty poistettavaksi, mutta se on poistojen " "estolistalla." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Pakollinen paketti \"%s\" on merkitty poistettavaksi." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Paketista yritetään asentaa mustalla listalla olevaa versiota \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Ei voitu asentaa pakettia \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -211,11 +212,11 @@ "kirjoittamalla päätteeseen \"ubuntu-bug update-manager\"." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Metapakettia ei voitu arvata" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -229,15 +230,15 @@ "Asenna jokin luetelluista paketeista synapticilla tai apt-get-ohjelmalla " "ennen jatkamista." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Luetaan välimuistia" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Ei saatu haluttua lukitusta" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -245,11 +246,11 @@ "Tämä tarkoittaa yleensä, että toinen pakettienhallintaohjelma (kuten apt-get " "tai aptitude) on jo käynnissä. Sulje tämä toinen ohjelma ensin." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Päivittäminen etäyhteyden yli ei ole tuettu" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -264,11 +265,11 @@ "Päivitys sulkeutuu nyt. Jos mahdollista, suorita päivitys käyttämättä ssh-" "yhteyttä." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Jatka käyttäen SSH:ta?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -285,11 +286,11 @@ "Jos jatkat, ylimääräinen ssh-palvelu avataan porttiin '%s'.\n" "Haluatko jatkaa?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Käynnistän ylimääräisen SSH-palvelimen" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -300,7 +301,7 @@ "\"%s\" ylimääräinen SSH-palvelin. Jos jokin menee pieleen nykyisen SSH-" "istunnon kanssa, voit silti yhdistää tähän uuteen.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -313,29 +314,29 @@ "ei avata automaattisesti. Voit avata portin seuraavasti:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Päivitys ei onnistu" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Tämä työkalu ei tue päivitystä \"%s\" -> \"%s\"." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Hiekkalaatikon asettaminen epäonnistui" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Hiekkalaatikkoympäristöä ei ollut mahdollista luoda." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Hiekkalaatikko-tila" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -351,18 +352,18 @@ "*Mitään* muuotoksia ei tallenneta järjestelmähakemistoon tästä hetkestä " "lähtien seuraavaan uudelleenkäynnistykseen" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Python-asennuksesi on viallinen. Korjaa symbolinen linkki \"/usr/bin/python" "\"." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Paketti \"debsig-verify\" on asennettu" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -372,12 +373,12 @@ "Poista paketti Synaptic-ohjelmalla tai komennolla \"apt-get remove debsig-" "verify\" ja käynnistä päivitys uudelleen." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Ei voida kirjoittaa kohteeseen \"%s\"" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -387,11 +388,11 @@ "Hakemistoon '%s' ei voida tehdä muutoksia. Päivitystä ei voida jatkaa.\n" "Varmista, että kansiolla on kirjoitusoikeudet." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Sisällytä uusimmat päivitykset Internetistä?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -411,16 +412,16 @@ "tapauksessa ladata pian päivityksen jälkeen.\n" "Jos vastaat \"ei\" tähän, verkkoa ei käytetä lainkaan." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "otettu pois käytöstä päivitettäessä versioon %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Sopivaa peilipalvelinta ei löytynyt" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -439,11 +440,11 @@ "\", jokainen \"%s\" muutetaan muotoon \"%s\"." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Lisätäänkö oletusohjelmalähteet?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -456,11 +457,11 @@ "Tulisiko lähteen ”%s” oletusrivit lisätä? Jos valitse ”Ei”, päivitys " "keskeytyy." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Virhe ohjelmalähdetiedoissa" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -468,11 +469,11 @@ "Ohjelmistolähdetietojen päivitys tuotti virheellisen tiedoston, joten " "vianilmoitusprosessi käynnistetään." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Kolmannen osapuolen ohjelmalähteet poissa käytöstä" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -482,13 +483,13 @@ "käytöstä. Voit ottaa ne uudelleen käyttöön päivityksen jälkeen " "\"Ohjelmalähteet\"-työkalulla tai pakettienhallintaohjelmalla." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Paketti ristiriitaisessa tilassa" msgstr[1] "Paketteja ristiriitaisessa tilassa" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -507,11 +508,11 @@ "mutta niiden pakettitiedostoja ei löydy. Asenna paketit uudelleen käsin tai " "poista ne järjestelmästä." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Virhe päivitettäessä" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -519,13 +520,13 @@ "Päivitettäessä tapahtui virhe. Tämä on yleensä jonkinlainen verkko-ongelma. " "Tarkista verkkoyhteytesi toiminta ja yritä uudelleen." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Levytilaa ei ole riittävästi" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -540,21 +541,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Lasketaan muutoksia" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Haluatko aloittaa päivityksen?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Päivitys peruttiin" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -562,12 +563,12 @@ "Päivitys perutaan ja järjestelmän alkuperäinen tila palautetaan. Voit jatkaa " "päivitystä halutessasi myöhemmin." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Päivityksiä ei voitu noutaa" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -577,27 +578,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Virhe suoritettaessa" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Palautetaan alkuperäistä järjestelmän tilaa" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Päivityksiä ei voitu asentaa" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -605,7 +606,7 @@ "Päivitys on keskeytynyt. Järjestelmä saattaa olla epävakaassa tilassa. " "Palautuskomento suoritetaan nyt (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -622,7 +623,7 @@ "olevat tiedostot mukaan ilmoitukseen.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -630,20 +631,20 @@ "Päivitys on keskeytynyt. Tarkista Internet-yhteytesi tai asennusmediasi ja " "yritä uudelleen. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Poistetaanko vanhentuneet paketit?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Säilytä" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Poista" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -652,27 +653,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Vaadittuja riippuvuuksia ei ole asennettu" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Vaadittu riippuvuus \"%s\" ei ole asennettu. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Tarkistetaan pakettienhallintaa" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Päivityksen valmistelu epäonnistui" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -680,11 +681,11 @@ "Järjestelmän valmistelu versiopäivitystä varten epäonnistui, joten " "vianilmoitusprosessi käynnistetään." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Päivityksen esivaatimusten nouto epäonnistui" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -696,68 +697,68 @@ "\n" "Virheraportointityökalu käynnistetään." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Päivitetään ohjelmalähdetietoja" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "CD-levyn lisääminen ei onnistunut" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "CD-levyn lisääminen ei onnistunut" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Pakettitiedot viallisia" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Noudetaan" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Päivitetään" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Päivitys on valmis" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "Päivitys valmistui, mutta päivityksen yhteydessä tapahtui virheitä." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Etsitään vanhentuneita ohjelmistoja" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Järjestelmän päivitys on valmis." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Osittainen päivitys valmistui." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms on käytössä" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -767,12 +768,12 @@ "taltionhallinta. evms-ohjelmistoa ei enää tueta, joten ole hyvä ja poista se " "käytöstä ja suorita päivitys uudelleen." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "Näytönohjaimesi ei välttämättä ole täysin tuettu Ubuntu 12.04 LTS -versiossa." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -784,9 +785,9 @@ "https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx - Haluatko jatkaa " "päivitystä?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -794,8 +795,8 @@ "Päivitys saattaa poistaa käytöstä visuaalisia tehosteita ja huonontaa " "joidenkin pelien ja graafisesti raskaiden ohjelmien suorituskykyä." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -809,7 +810,7 @@ "\n" "Haluatko jatkaa?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -823,11 +824,11 @@ "\n" "Haluatko jatkaa?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Ei i686-suoritin" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -839,11 +840,11 @@ "vähintään i686-suorittimen. Nykyistä laitteistoasi ei siis ole mahdollista " "päivittää uudempaan Ubuntu-versioon." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Ei ARMv6-suoritinta" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -855,11 +856,11 @@ "vähintään ARMv6-arkkitehtuuria tukevan suorittimen. Tästä syystä " "järjestelmäsi päivittäminen uuteen Ubuntun julkaisuun ei ole mahdollista." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Init-palvelua ei löydy" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -875,15 +876,15 @@ "\n" "Haluatko varmasti jatkaa?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Hiekkalaatikkopäivitys aufs:ää käyttäen" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Käytä annettua polkua päivitettyjen pakettien etsimiseksi CD-levyltä." -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -891,58 +892,58 @@ "Valitse käyttöliittymä. Tällä hetkellä valittavissa ovat: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*VANHENNETTU* tämä valitsin ohitetaan" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Suorita vain osittainen päivitys (ei sources.list-uudelleenkirjoitusta)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Poista käytöstä GNU screen -tuki" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Aseta datahakemisto" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Aseta \"%s\" asemaan \"%s\"" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Nouto on valmis" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Noudetaan tiedostoa %li/%li nopeudella %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Noin %s jäljellä" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Noudetaan tiedostoa %li/%li" @@ -952,27 +953,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Muutoksia toteutetaan" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "riippuvuusongelmia - jätetään asetukset säätämättä" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Pakettia \"%s\" ei voitu asentaa" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -984,7 +985,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -995,7 +996,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1003,20 +1004,20 @@ "Tähän asetustiedostoon tehdyt muutokset menetetään, jos se korvataan " "uudemmalla versiolla." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Komentoa 'diff' ei löytynyt" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Tapahtui vakava virhe" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1029,13 +1030,13 @@ "Alkuperäinen sources.list tallennettiin nimellä /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c painettu" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1044,137 +1045,137 @@ "tilaan. Haluatko varmasti tehdä sen?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Jottei tietoja häviäisi, sulje kaikki avoinna olevat ohjelmat ja asiakirjat." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Canonical ei enää tue seuraavia (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Varhenna (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Poista (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Ei enää tarpeellinen (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Asenna (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Päivitä (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Median vaihto" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Näytä erot >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Piilota erot" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Virhe" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Peru" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Sulje" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Näytä pääte >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Piilota pääte" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Tiedot" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Yksityiskohdat" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Ei enää tuettu %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Poista %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Poistetaan (oli automaattisesti asennettu) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Asenna %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Päivitä %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Uudelleenkäynnistys vaaditaan" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" "Käynnistä järjestelmä uudelleen päivityksen viimeistelemiseksi" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Uudelleenkäynnistä nyt" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1186,32 +1187,32 @@ "Järjestelmä voi olla käyttökelvottomassa tilassa, jos perut päivityksen. " "Päivityksen jatkaminen on erittäin suositeltavaa." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Peru päivitys?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li päivä" msgstr[1] "%li päivää" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li tunti" msgstr[1] "%li tuntia" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minuutti" msgstr[1] "%li minuuttia" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1227,7 +1228,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1241,14 +1242,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1257,34 +1258,32 @@ "Nouto kestää noin %s 1Mbit-DSL-yhteydellä ja noin %s 56kbit-modeemilla." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Nouto kestää yhteydelläsi noin %s. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Valmistellaan päivitystä" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Noudetaan uusia ohjelmalähteitä" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Haetaan uusia paketteja" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Asennetaan päivityksiä" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Siistitään" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1301,28 +1300,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d paketti tullaan poistamaan." msgstr[1] "%d pakettia tullaan poistamaan." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d uusi paketti asennetaan." msgstr[1] "%d uutta pakettia asennetaan." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d paketti päivitetään." msgstr[1] "%d pakettia päivitetään." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1333,7 +1332,7 @@ "\n" "Noudettavaa yhteensä %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1341,7 +1340,7 @@ "Versiopäivityksen asennus saattaa kestää useita tunteja. Kun lataus on " "valmis, prosessia ei ole mahdollista perua." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1349,53 +1348,53 @@ "Päivitysten lataaminen ja asentaminen voi kestää useita tunteja. Lataamisen " "valmistuttua päivitystä ei voi peruuttaa." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Pakettien poisto saattaa kestää useita tunteja. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Tämän tietokoneen ohjelmistot on päivitetty." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "Päivityksiä ei ole saatavilla järjestelmälle. Päivitys keskeytyy." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Uudelleenkäynnistys vaaditaan" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Päivitys on valmis ja uudelleenkäynnistys vaaditaan. Haluatko käynnistää " "tietokoneen uudelleen nyt?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "todentaa '%(file)s' vastaan '%(signature)s' " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "puretaan \"%s\"" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Päivitystyökalua ei voitu suorittaa" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1403,34 +1402,34 @@ "Todennäköisesti vika päivitystyökalussa. Ilmoita se virheenä komennolla " "\"ubuntu-bug update-manager\"." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Päivitystyökalun allekirjoitus" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Päivitystyökalu" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Nouto epäonnistui" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "Päivityksen noutaminen epäonnistui. Tämä voi johtua verkko-ongelmasta. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Todennus epäonnistui" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1438,13 +1437,13 @@ "Päivityksen todennus epäonnistui. Tämä voi johtua ongelmasta " "verkkoyhteydessä tai palvelimessa. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Purku epäonnistui" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1452,13 +1451,13 @@ "Päivityksen purkaminen epäonnistui. Tämä voi johtua ongelmasta " "verkkoyhteydessä tai palvelimessa. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Varmennus epäonnistui" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1466,15 +1465,15 @@ "Päivityksen tarkistaminen epäonnistui. Tämä voi johtua ongelmasta " "verkkoyhteydessä tai palvelimessa. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Päivitystä ei voi suorittaa" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1482,13 +1481,13 @@ "Tämä johtuu yleensä siitä, että /tmp on liitetty noexec-valintaa käyttäen. " "Liitä /tmp uudelleen ilman noexec-valintaa ja suorita päivitys uudelleen." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Virheviesti oli \"%s\"." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1500,73 +1499,73 @@ "Alkuperäinen sources.list tallennettiin nimellä /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Peruutetaan" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Alennettu:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Jatka painamalla Enter" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Jatka [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Yksityiskohdat [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Ei enää tuettu: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Poista: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Asenna: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Päivitä: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Jatka [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1634,9 +1633,8 @@ msgstr "Jakelupäivitys" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Päivitetään Ubuntu versioon 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Päivitetään Ubuntu versioon 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1654,84 +1652,85 @@ msgid "Terminal" msgstr "Pääte" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Odota, tämä voi kestää jonkin aikaa." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Päivitys on valmis" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Julkaisutietoja ei löytynyt" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Palvelin voi olla ylikuormitettu. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Julkaisutietoja ei voitu noutaa" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Tarkista Internet-yhteytesi toimivuus." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Päivitä" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Julkaisutiedot" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Noudetaan tarvittavia pakettitiedostoja..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Tiedosto %s/%s nopeudella %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Tiedosto %s/%s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Avaa linkki selaimessa" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Kopioi linkki leikepöydälle" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Noudetaan tiedostoa %(current)li/%(total)li nopeudella %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Noudetaan tiedostoa %(current)li/%(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Ubuntu-versiosi ei ole enää tuettu." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1739,51 +1738,57 @@ "Et tule enää saamaan turvallisuuspäivityksiä tai muita tärkeitä päivityksiä. " "Päivitä uudempaan Ubuntu-versioon." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Tietoja päivityksestä" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Asenna" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Nimi" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Versio %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "Verkkoyhteyttä ei havaittu. Muutosluetteloa ei voida noutaa." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Noudetaan muutosluetteloa..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Poista kaikki valinnat" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "_Valitse kaikki" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s päivitys on valittu." +msgstr[1] "%(count)s päivitystä on valittu." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s noudetaan." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "Päivitys on jo ladattu, mutta ei asennettu." msgstr[1] "Päivitykset on jo ladattu, mutta ei asennettu." @@ -1791,11 +1796,18 @@ msgid "There are no updates to install." msgstr "Tietokoneelle ei ole saatavilla päivityksiä." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Tuntematon noudettavan määrä." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1803,7 +1815,7 @@ "Päivitysten viimeisin tarkistusajankohta ei ole tiedossa. Päivitä ne " "napsauttamalla \"Tarkista\"." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1812,14 +1824,14 @@ "Päivitykset tarkistettiin viimeksi %(days_ago)s päivää sitten.\n" "Etsi uusia ohjelmistopäivityksiä napsauttamalla ”Tarkista”." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "Päivitykset tarkistettiin viimeksi %(days_ago)s päivä sitten." msgstr[1] "Päivitykset tarkistettiin viimeksi %(days_ago)s päivää sitten." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1828,34 +1840,45 @@ msgstr[1] "Päivitykset tarkistettiin viimeksi %(hours_ago)s tuntia sitten." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Päivitykset tarkistettiin viimeksi %s minuuttia sitten." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Päivitykset tarkistettiin hetki sitten." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Ohjelmistopäivitykset korjaavat ohjelmistojen mahdollisia virheitä ja " +"tietoturva-aukkoja sekä tarjoavat uusia ominaisuuksia." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Ohjelmistopäivityksiä saattaa olla tarjolla tietokoneellesi." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Tervetuloa Ubuntuun" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Nämä ohjelmistopäivitykset on julkaistu vasta Ubuntun julkaisun jälkeen." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Ohjelmistopäivityksiä on saatavilla tälle tietokoneelle." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1867,7 +1890,7 @@ "väliaikaiset aiempien asennuksien paketit käyttämällä komentoa \"sudo apt-" "get clean\"." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1875,23 +1898,23 @@ "Tietokoneen tulee käynnistyä uudelleen päivityksien asennuksen " "valmistumiseksi. Tallenna työsi ennen jatkamista." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Luetaan pakettitietoja" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Yhdistetään..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "Et ehkä voi tarkistaa päivityksiä tai noutaa uusia päivityksiä." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Pakettitietoja ei voitu alustaa" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1904,7 +1927,7 @@ "Ilmoita tästä virheraportilla paketille \"update-manager\", ja sisällytä " "raporttiin seuraava virheviesti:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1916,31 +1939,31 @@ "Ilmoita tästä virheraportilla paketille \"update-manager\" ja sisällytä " "raporttiin seuraava virheviesti:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (uusi asennus)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Koko: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Versiosta %(old_version)s versioon %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Versio %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Julkaisupäivitystä ei ole mahdollista suorittaa juuri nyt" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1949,21 +1972,21 @@ "Julkaisupäivitystä ei voi suorittaa juuri nyt, koeta myöhemmin uudelleen. " "Palvelimen vastaus: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Noudetaan julkaisupäivitystyökalua" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Uusi Ubuntu-julkaisu ”%s” on saatavilla" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Ohjelmaluettelo on rikkinäinen" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1973,6 +1996,17 @@ "Synaptic-pakettienhallintaa tai komentoa \"sudo apt-get install -f\" " "päätteessä." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Uusi julkaisu ”%s” saatavilla." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Peru" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Tarkista päivitykset" @@ -1982,22 +2016,18 @@ msgstr "Asenna kaikki saatavilla olevat päivitykset" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Peru" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Muutosluettelo" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Päivitykset" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Rakennetaan päivitysluetteloa" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2021,20 +2051,20 @@ " * Käytössä on epävirallisia ohjelmapaketteja, joita Ubuntu ei tarjoa\n" " * Kyse on tavallisista muutoksista Ubuntun esijulkaisuversiossa" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Noudetaan muutosluetteloa" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Muita päivityksiä (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "Tämän päivityksen julkaisija ei tue muutosluettelon esittämistä." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2042,7 +2072,7 @@ "Muutosluettelon nouto epäonnistui. \n" "Tarkista Internet-yhteytesi toimivuus." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2055,7 +2085,7 @@ "Saatavilla oleva versio: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2068,7 +2098,7 @@ "Käytä osoitetta http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "kunnes muutokset tulevat saataville tai yritä myöhemmin uudelleen." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2081,52 +2111,43 @@ "Käytä osoitetta http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "kunnes muutokset tulevat saataville, tai yritä myöhemmin uudelleen." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Jakelun tunnistus epäonnistui" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Järjestelmän tyypin tarkistamista tehtäessä tapahtui virhe \"%s\"." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Tärkeät tietoturvapäivitykset" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Suositellut päivitykset" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Ehdotetut päivitykset" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Takaisinsovitukset" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Jakelupäivitykset" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Muut päivitykset" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Käynnistetään päivitysten hallintaa" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Ohjelmistopäivitykset korjaavat ohjelmistojen mahdollisia virheitä ja " -"tietoturva-aukkoja sekä tarjoavat uusia ominaisuuksia." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Osittainen päivitys" @@ -2197,37 +2218,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Ohjelmistopäivitykset" +msgid "Update Manager" +msgstr "Päivitysten hallinta" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Ohjelmistopäivitykset" +msgid "Starting Update Manager" +msgstr "Käynnistetään päivitysten hallintaa" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Päivitä" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "päivitykset" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Asenna" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Muutokset" +msgid "updates" +msgstr "päivitykset" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Kuvaus" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Päivityksen kuvaus" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2235,25 +2246,35 @@ "Päivityksen käyttämä datansiirto voi olla maksullista, sillä käytät " "langatonta mobiiliyhteyttä." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Langaton mobiiliyhteys on käytössä" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Tietokone suositellaan kytkemään verkkovirtalähteeseen ennen päivityksen " "aloittamista." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Asenna päivitykset" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Muutokset" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Asetukset..." +msgid "Description" +msgstr "Kuvaus" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Asenna" +msgid "Description of update" +msgstr "Päivityksen kuvaus" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Asetukset..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2277,9 +2298,8 @@ msgstr "Valitsin päivittämisen uuteen Ubuntun versioon" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Voit päivittää koska tahansa myöhemmin käynnistämällä Päivitysten hallinta -" @@ -2293,58 +2313,58 @@ msgid "Show and install available updates" msgstr "Näytä ja asenna saatavilla olevat päivitykset" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Näytä versio ja poistu" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Datatiedostoja sisältävä hakemisto" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Tarkista onko uutta Ubuntu-julkaisua saatavilla" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Tarkista onko päivittäminen uusimpaan kehitysversioon mahdollista" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "Päivitä käyttäen uusinta ehdotettua julkaisupäivitysohjelmaa" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Älä kohdista karttaan käynnistettäessä" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Yritä ajaa jakelupäivitys (dist-upgrade)" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Älä tarkista päivityksiä käynnistyksen yhteydessä" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Testaa päivitystä hiekkalaatikossa aufs-peitekerroksella" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Suoritetaan osittaista päivitystä" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Näytä paketin kuvaus muutostietojen sijaan" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Yritä päivittää uusimpaan julkaisuun käyttäen päivitysohjelmaa kohteesta " "$distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2354,11 +2374,11 @@ "Tällä hetkellä tuettuina ovat \"desktop\" työpöytäjärjestelmän ja \"server\" " "palvelinjärjestelmän päivittämiseen." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Aja määritetty edustaohjelma" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2366,11 +2386,11 @@ "Tarkista vain onko uusi jakelujulkaisu saatavilla, ja kerro tulos " "poistumiskoodilla" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Etsitään uutta Ubuntu-julkaisua" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2378,71 +2398,71 @@ "Lisätietoja päivityksestä osoitteessa\n" "%(url)\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Uutta julkaisua ei löytynyt" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Uusi julkaisu ”%s” saatavilla." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Aja \"do-release-upgrade\" päivittääksesi siihen." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Päivitys versioon Ubuntu %(version)s on saatavilla" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Voit valita päivityksen Ubuntun versioon %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Lisää virheenjäljitystiedot" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Näytä tukemattomat paketit tällä laitteella" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Näytä tuetut paketit tällä laitteella" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Näytä kaikki paketit tukitiedon kanssa" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Näytä luettelossa kaikki paketit" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Tukitiedot paketille \"%s\"." -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" "Sinulla on %(num)s pakettia (%(percent).1f%%), jotka ovat tuettuja %(time)s " "saakka." -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" "Sinulla on %(num)s pakettia (%(percent).1f%%) joita ei (enää) voida ladata." -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "Sinulla on %(num)s pakettia (%(percent).1f%%), joita ei tueta." -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2450,54 +2470,71 @@ "Käynnistä valitsimella --show-unsupported, --show-supported tai --show-all " "nähdäksesi lisätietoja" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Ei enää ladattavissa:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Tukematon: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Tuettu %s saakka:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Ei tuettu" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Toteuttamaton metodi: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Tiedosto levyllä" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb-paketti" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Asenna puuttuva paketti." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Paketti %s tulisi asentaa." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb-paketti" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s tulee merkitä käsin asennetuksi." +msgid "%i obsolete entries in the status file" +msgstr "%i vanhentunutta tietoa tilatiedostossa" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "Vanhentuneita kohtia dpkg-tilatiedoissa" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "Vanhentuneita dpkg-tilatietoja" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2506,66 +2543,80 @@ "asennettuna myös paketti kdelibs5-dev. Lisätietoja löytyy osoitteesta bugs." "launchpad.net löytyvästä virheraportista #279621." -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "%i vanhentunutta tietoa tilatiedostossa" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "Vanhentuneita kohtia dpkg-tilatiedoissa" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "Vanhentuneita dpkg-tilatietoja" +msgid "%s needs to be marked as manually installed." +msgstr "%s tulee merkitä käsin asennetuksi." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Poista lilo, koska grub on myös asennettu (katso bugista #314004 lisätietoja)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Pakettitietojen päivittämisen jälkeen oleellista pakettia '%s' ei enää " -#~ "löydy, joten vikailmoitusprosessi käynnistetään." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Päivitetään Ubuntu versioon 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s päivitys on valittu." -#~ msgstr[1] "%(count)s päivitystä on valittu." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Tervetuloa Ubuntuun" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Nämä ohjelmistopäivitykset on julkaistu vasta Ubuntun julkaisun jälkeen." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Ohjelmistopäivityksiä on saatavilla tälle tietokoneelle." - -#~ msgid "Update Manager" -#~ msgstr "Päivitysten hallinta" - -#~ msgid "Starting Update Manager" -#~ msgstr "Käynnistetään päivitysten hallintaa" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Langaton mobiiliyhteys on käytössä" - -#~ msgid "_Install Updates" -#~ msgstr "_Asenna päivitykset" +#~ "Pakettitietojen päivittämisen jälkeen oleellista pakettia '%s' ei enää " +#~ "löydy, joten vikailmoitusprosessi käynnistetään." #~ msgid "Checking for a new ubuntu release" #~ msgstr "Tarkistetaan onko uutta Ubuntu-julkaisua saatavilla" @@ -2652,6 +2703,9 @@ #~ "komennolla 'ubuntu-bug update-manager' päätteessä ja sisällytä kansion /" #~ "var/log/dist-upgrade/ tiedostot vikailmoitukseen." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Päivitetään Ubuntu versioon 11.10" + #~ msgid "" #~ "\n" #~ "\n" diff -Nru update-manager-17.10.11/po/fo.po update-manager-0.156.14.15/po/fo.po --- update-manager-17.10.11/po/fo.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/fo.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2009. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-01-10 17:44+0000\n" "Last-Translator: Gunleif Joensen \n" "Language-Team: Faroese \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Ambætari fyri %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Høvuðs ambætari" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Ser ambætarar" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Kundi ei útrokna keldulistanna skráseting" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Ikki før fyri at finna nakrar pakkfílur, møguliga er hettar ikki ein Ubuntu " "fløga, ella skeivt byggilag?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Var ikki før fyri at leggja fløguna afturat" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -77,13 +78,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Tak burtur pakkar í ringum standi" msgstr[1] "Tak burtur pakka r í ringum standi" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -98,15 +99,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Ambætarin kann vera ovbyrðaður" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Brotnir pakkar" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -116,7 +117,7 @@ "heldur á." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -129,27 +130,27 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Hettar er helst ein bráfeingis trupulleiki, vinarliga royn aftur seinni." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Kundi ikki rokna út uppstiganinna" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Villa við at staðfesta summir pakkar" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -159,40 +160,40 @@ "farandi net trupulleiki. Tygum kunnu royna aftur seinni. Hygg niðanfyri " "eftir einum lista við óstaðfestum pakkum." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" "Pakkin '%s' er merktur til burturtøku, men er á burturtøku svartalista." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Avgerðandi pakkin '%s' er merktur til burturtøku." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Royni at leggja inn svartlistaða útgávu '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Ksnn ikki leggja inn '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Kann ikki gita meta-pakka" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -201,15 +202,15 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Lesi kova" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -217,11 +218,11 @@ "Hettar merkir vanliga at ein onnur pakka-leiðara nýtsluskipan (so sum apt-" "get ella aptitude) longu koyrir. Vinarliga sløkk tí nýtsluskipaninna fyrst." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Uppstigan yvir fjar sambinding ikki undirstyðja" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -230,11 +231,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Halda á undir SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -245,11 +246,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Byrji eyka sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -257,7 +258,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -266,29 +267,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Kann ikki uppstiga" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Ein uppstigan frá '%s' til '%s' er ikki styðja við hesum tóli." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Sandkassa uppsetan miseydnaðist" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Tað lat sewg ikki gera at skapa eitt sandkassa umhvørvi." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Sandkassa standur" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -298,28 +299,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Pakki 'debsig-verify' er lagdur inn" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -327,11 +328,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Tak við tær seinastu dagførslurnar úr Alnetinum?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -343,16 +344,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -365,11 +366,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -378,34 +379,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -418,23 +419,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Brek undir dagføring" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Ikki nokk av tøkum diskplássi" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -445,32 +446,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Rokni út broytingarnar" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Vil tú byrja uppstiganinna?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Uppstigan avlýst" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Kundi ikki taka uppstigingarnar niður" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -478,33 +479,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Endurstovni frum kervis stand" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Kundi ikki leggja inn uppstigingar" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -515,26 +516,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Varðveita" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Tak burtur" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -542,37 +543,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Kanni pakka leiðara" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Fyrireiking av uppstigan miseydanðist" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -580,79 +581,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Uppstigi" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Uppstigan liðug" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Kervis uppstigan er liðug" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -660,16 +661,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -678,7 +679,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -687,11 +688,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -699,11 +700,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -711,11 +712,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -725,71 +726,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -799,27 +800,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -829,7 +830,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -838,26 +839,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -865,147 +866,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1013,32 +1014,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1054,7 +1055,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1068,14 +1069,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1083,34 +1084,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1123,28 +1122,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1152,145 +1151,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1298,73 +1297,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1422,7 +1421,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1441,133 +1440,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1575,31 +1582,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1608,34 +1622,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1643,29 +1665,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1674,7 +1696,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1682,58 +1704,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1743,22 +1775,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1772,26 +1800,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1800,7 +1828,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1809,7 +1837,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1818,47 +1846,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1919,54 +1941,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1991,7 +2016,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -2003,218 +2028,284 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" #~ msgid "%.0f kB" diff -Nru update-manager-17.10.11/po/fr.po update-manager-0.156.14.15/po/fr.po --- update-manager-17.10.11/po/fr.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/fr.po 2017-12-23 05:00:38.000000000 +0000 @@ -4,11 +4,12 @@ # Jean Privat , 2005. # Vincent Carriere , 2005 # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager 0.37.2\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-04-17 11:35+0000\n" "Last-Translator: Olivier FEBWIN \n" "Language-Team: French \n" @@ -21,7 +22,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -29,13 +30,13 @@ msgstr[1] "%(size).0f ko" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f Mio" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Serveur pour %s" @@ -43,20 +44,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Serveur principal" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Serveurs personnalisés" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Impossible d'évaluer la ligne de source.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -64,11 +65,11 @@ "Impossible de localiser les fichiers des paquets. Ce n'est peut-être pas un " "disque Ubuntu ou alors il est prévu pour une autre architecture." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Impossible d'ajouter le CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -83,13 +84,13 @@ "Le message d'erreur est :\n" "« %s »" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Supprimer le paquet endommagé" msgstr[1] "Supprimer les paquets endommagés" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -110,15 +111,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Le serveur est peut-être surchargé" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Paquets cassés" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -128,7 +129,7 @@ "avant de continuer." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -150,12 +151,12 @@ " * un paquet logiciel non officiel, non fourni par Ubuntu.\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Cela ressemble fort à un problème temporaire. Veuillez réessayer plus tard." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -163,16 +164,16 @@ "Si rien de tout cela s'applique, merci de signaler ce bogue en utilisant la " "commande « ubuntu-bug update-manager » dans un terminal." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Impossible d'évaluer la mise à niveau" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Erreur lors de l'authentification de certains paquets" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -183,7 +184,7 @@ "ultérieurement. Vous trouverez ci-dessous une liste des paquets non " "authentifiés." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -191,22 +192,22 @@ "Le paquet « %s » est marqué pour suppression mais il est dans la liste noire " "des suppressions." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Le paquet essentiel « %s » est marqué pour suppression." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Tentative d'installation de la version en liste noire « %s »" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Impossible d'installer « %s »" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -215,11 +216,11 @@ "problème en saisissant « ubuntu-bug update-manager » dans un terminal." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Impossible de déterminer le méta-paquet" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -233,15 +234,15 @@ " Veuillez d'abord installer l'un des paquets ci-dessus en utilisant Synaptic " "ou apt-get avant de continuer." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Lecture du cache" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Impossible d'obtenir un verrou exclusif" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -250,11 +251,11 @@ "(telle que apt-get ou aptitude) est déjà en cours d'exécution. Veuillez " "d'abord fermer cette application." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "La mise à niveau via une connexion distante n'est pas prise en charge" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -268,11 +269,11 @@ "\n" "La mise à niveau va maintenant être annulée. Veuillez essayer sans SSH." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Continuer dans une session SSH ?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -289,11 +290,11 @@ "Si vous continuez, un nouveau service SSH va être lancé sur le port « %s ».\n" "Voulez-vous continuer ?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Lancement d'un processus sshd supplémentaire" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -304,7 +305,7 @@ "supplémentaire sera lancé sur le port « %s ». En cas de problème avec le SSH " "existant, vous pourrez toujours vous connecter avec l'autre.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -317,33 +318,33 @@ "Vous pouvez ouvrir le port avec par exemple :\n" "« %s »" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Mise à niveau impossible" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" "La mise à niveau de « %s » vers « %s » n'est pas prise en charge par cet " "outil." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "La configuration de l'espace protégé (sandbox) a échoué" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" "La création de l'environnement pour l'espace protégé (sandbox) n'a pas été " "possible." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Mode espace protégé (sandbox)" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -357,18 +358,18 @@ "Entre maintenant et le prochain redémarrage, *aucun* changement écrit dans " "un dossier système ne sera permanent." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Votre installation de Python est endommagée. Veuillez réparer le lien " "symbolique « /usr/bin/python »." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Le paquet « debsig-verify » est installé" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -378,12 +379,12 @@ "Veuillez le supprimer avec Synaptic ou avec « apt-get remove debsig-" "verify », puis relancez la mise à jour." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Impossible d'écrire dans '%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -394,11 +395,11 @@ "peut pas continuer.\n" "Veuillez vous assurer que le dossier système est accessible en écriture." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Inclure les dernières mises à jour en provenance d'Internet ?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -420,16 +421,16 @@ "après la mise à jour.\n" "Si vous répondez « non », le réseau ne sera pas utilisé du tout." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "désactivé pour la mise à niveau vers %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Aucun miroir valable trouvé" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -449,11 +450,11 @@ "« non », la mise à niveau sera annulée." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Générer les sources par défaut ?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -467,11 +468,11 @@ "Les entrées par défaut pour « %s » doivent-elles être ajoutées ? Si vous " "choisissez « non », la mise à niveau sera annulée." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Informations sur les dépôts non valables" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -479,11 +480,11 @@ "La mise à niveau des informations des dépôts a renvoyé un fichier invalide, " "un rapport de bug va être envoyé." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Sources provenant de tiers désactivées" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -493,13 +494,13 @@ "parties, ont été désactivées. Vous pouvez les réactiver après la mise à " "niveau avec l'outil « Sources de logiciels » ou avec Synaptic." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Paquet dans un état incohérent" msgstr[1] "Paquets dans un état incohérent" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -518,11 +519,11 @@ "mais aucune archive les contenant n'a été trouvée. Veuillez réinstaller ces " "paquets manuellement ou les supprimer de votre système." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Erreur lors de la mise à jour" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -531,13 +532,13 @@ "un problème de réseau. Veuillez vérifier votre connexion au réseau et " "réessayer." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Espace libre insuffisant sur le disque" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -554,21 +555,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Évaluation des modifications" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Voulez-vous commencer la mise à niveau ?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Mise à niveau annulée" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -576,12 +577,12 @@ "La mise à niveau va maintenant être annulée et l’état originel du système " "restauré. Vous pouvez la reprendre plus tard." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Impossible de télécharger les mises à jour" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -592,27 +593,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Erreur pendant la soumission" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Restauration du système dans son état d'origine" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Impossible d'installer les mises à niveau" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -620,7 +621,7 @@ "La mise à niveau a échoué. Votre système pourrait être inutilisable. Une " "tentative de récupération va maintenant avoir lieu (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -637,7 +638,7 @@ "rapport les fichiers contenus dans le dossier /var/log/dist-upgrade/.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -645,20 +646,20 @@ "La mise à niveau a échoué. Veuillez vérifier votre connexion Internet et le " "support d'installation avant de réessayer. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Supprimer les paquets obsolètes ?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Conserver" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Supprimer" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -668,27 +669,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Dépendance nécessaire non installée" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "La dépendance nécessaire « %s » n'est pas installée. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Vérification du gestionnaire de paquets" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Échec lors de la préparation de la mise à niveau" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -696,11 +697,11 @@ "La préparation du système pour la mise à niveau a échoué. Un processus de " "rapport d'incident est donc initialisé." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Impossible d'obtenir les pré-requis nécessaires à la mise à niveau" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -711,70 +712,70 @@ "mise à niveau va s'arrêter et restaurer le système dans son état initial.\n" "En complément, un processus de rapport d'incident est initialisé." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Mise à jour des informations sur les dépôts" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Impossible d'ajouter le CD" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Désolé, l'ajout du CD a échoué." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Informations sur les paquets non valables" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Récupération" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Mise à niveau" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Mise à niveau terminée" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "La mise à niveau est terminée, mais des erreurs se sont produites lors de ce " "processus." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Recherche de logiciels obsolètes" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "La mise à niveau du système est terminée." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "La mise à niveau partielle est terminée." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms est en cours d'utilisation" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -784,13 +785,13 @@ "Le logiciel « evms » n’est plus pris en charge. Veuillez le désactiver avant " "d'exécuter à nouveau la mise à niveau." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "Il est possible que votre carte graphique ne soit pas entièrement prise en " "charge par Ubuntu 12.04 LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -802,9 +803,9 @@ "Pour plus d'information, rendez-vous sur https://wiki.ubuntu.com/X/Bugs/" "UpdateManagerWarningForI8xx Voulez-vous poursuivre la mise à niveau ?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -813,8 +814,8 @@ "performances pour les jeux et autres programmes exigeants au niveau " "graphique." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -828,7 +829,7 @@ "\n" "Voulez-vous continuer ?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -842,11 +843,11 @@ "\n" "Voulez-vous continuer ?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Pas de processeur i686" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -859,11 +860,11 @@ "impossible de mettre à niveau votre système vers une nouvelle version " "d'Ubuntu avec votre matériel actuel." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Pas de processeur ARMv6" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -875,11 +876,11 @@ "nécessitant au minimum une architecture ARMv6. Il est impossible de mettre à " "niveau votre système vers la nouvelle version d'Ubuntu." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Initialisation indisponible" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -895,17 +896,17 @@ "\n" "Voulez-vous vraiment continuer ?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Mise à niveau en espace protégé (sandbox) en utilisant aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Utiliser l'emplacement spécifié pour rechercher un CD-ROM contenant des " "paquets à mettre à niveau" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -913,59 +914,59 @@ "Utiliser une des interfaces actuellement disponibles : \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*OBSOLÈTE* cette option sera ignorée" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Effectuer une mise à niveau partielle uniquement (sources.list ne sera pas " "remplacé)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Désactiver la prise en charge de GNU screen" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Définir l'emplacement des données" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Veuillez insérer « %s » dans le lecteur « %s »" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Récupération des fichiers terminée" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Récupération du fichier %li sur %li à %s octets/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Temps restant : environ %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Téléchargement du fichier %li sur %li" @@ -975,27 +976,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Application des changements" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "problèmes de dépendances - laissé non configuré" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Impossible d'installer « %s »" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -1007,7 +1008,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1018,7 +1019,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1026,20 +1027,20 @@ "Toutes les modifications apportées à ce fichier de configuration seront " "perdues si vous décidez de le remplacer par une version plus récente." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "La commande « diff » n'a pas été trouvée" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Une erreur fatale est survenue" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1052,13 +1053,13 @@ "Votre fichier souce.list original a été enregistré dans /etc/apt/sources." "list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl+C détecté" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1067,136 +1068,136 @@ "état inutilisable. Voulez-vous vraiment faire cela ?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Pour éviter toute perte de données, veuillez fermer toutes les applications " "et documents ouverts." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "N'est plus maintenu par Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Installer en version antérieure (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Supprimer (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "N'est plus nécessaire (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Installer (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Mettre à jour (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Changement de média" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Afficher les différences >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Masquer les différences" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Erreur" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Annuler" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Fermer" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Afficher le terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Masquer le terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Informations" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Détails" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "N'est plus maintenu (%s)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Supprimer %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Supprimer (avait été installé automatiquement) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Installer %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Mettre à niveau %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Redémarrage nécessaire de l'ordinateur" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Redémarrez le système pour terminer la mise à niveau" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Redémarrer maintenant" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1208,32 +1209,32 @@ "Le système pourrait devenir inutilisable suite à l'annulation de la mise à " "niveau. Il vous est fortement recommandé de reprendre celle-ci." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "_Annuler la mise à niveau ?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li jour" msgstr[1] "%li jours" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li heure" msgstr[1] "%li heures" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minute" msgstr[1] "%li minutes" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1249,7 +1250,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1263,14 +1264,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1280,34 +1281,32 @@ "environ %s avec un modem 56 k." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Ce téléchargement prendra environ %s avec votre connexion. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Préparation de la mise à niveau" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Obtention de nouveaux dépôts logiciels" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Obtention de nouveaux paquets" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Installation des mises à niveau" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Nettoyage" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1324,28 +1323,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d paquet va être supprimé." msgstr[1] "%d paquets vont être supprimés." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d nouveau paquet va être installé." msgstr[1] "%d nouveaux paquets vont être installés." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d paquet va être mis à jour." msgstr[1] "%d paquets vont être mis à jour." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1356,7 +1355,7 @@ "\n" "Vous devez télécharger au total %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1364,7 +1363,7 @@ "L'installation de la mise à niveau peut prendre plusieurs heures. Une fois " "le téléchargement terminé, ce processus ne peut être annulé." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1372,16 +1371,16 @@ "Obtenir et installer la mise niveau peut prendre plusieurs heures. Une fois " "le téléchargement terminé, ce processus ne peut être annulé." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Supprimer les paquets peut prendre plusieurs heures. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Les logiciels sur cet ordinateur sont à jour." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1389,38 +1388,38 @@ "Aucune mise à niveau n'est disponible pour votre système. La mise à niveau " "va maintenant être annulée." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Redémarrage nécessaire de l'ordinateur" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "La mise à niveau est terminée et l'ordinateur doit être redémarré. Voulez-" "vous le faire dès maintenant ?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "authentification de '%(file)s' avec '%(signature)s' " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "extraction de '%s'" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Impossible de lancer l'outil de mise à niveau" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1429,35 +1428,35 @@ "signaler ce bogue en saisissant « ubuntu-bug update-manager » dans un " "terminal." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Signature de l'outil de mise à niveau" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Outil de mise à niveau" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Récupération impossible" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "La récupération de la mise à niveau à échoué. Il y a peut-être un problème " "de réseau. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Échec de l'authentification" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1465,13 +1464,13 @@ "L'authentification de la mise à niveau a échoué. Il y a peut-être un " "problème de réseau ou de serveur. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Extraction impossible" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1479,13 +1478,13 @@ "L'extraction de la mise à niveau a échoué. Il y a peut-être un problème de " "réseau ou de serveur. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "La vérification a échoué" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1493,15 +1492,15 @@ "La vérification de la mise à niveau a échoué. Il y a peut-être un problème " "de réseau ou de serveur. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Impossible de lancer la mise à niveau" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1509,13 +1508,13 @@ "Ceci est habituellement dû a un système ou /tmp est monté en mode noexec. " "Veuillez remonter sans l'option noexec et mettre à jour à nouveau." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Le message d'erreur est « %s »." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1528,73 +1527,73 @@ "Votre fichier souce.list original a été enregistré dans /etc/apt/sources." "list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Annulation" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Rétrogradé :\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Veuillez appuyer sur [Entrée] pour continuer" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "_Continuer [oN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Détails [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "o" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "N'est plus maintenu : %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Supprimer : %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Installer : %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Mettre à niveau : %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Continuer [o/n] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1661,9 +1660,8 @@ msgstr "Mise à niveau de la distribution" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Mise à niveau d'Ubuntu vers la version 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Mise à niveau d'Ubuntu vers la version 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1681,84 +1679,85 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Veuillez patienter, cela peut prendre du temps." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "La mise à jour est terminée" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Impossible de trouver les notes de version" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Le serveur est peut-être surchargé. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Impossible de télécharger les notes de version" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Veuillez vérifier votre connexion Internet." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Mettre à niveau" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Notes de version" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Téléchargement des paquets supplémentaires..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Fichier %s sur %s à %s octets/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Fichier %s sur %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Ouvrir le lien dans un navigateur" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Copier le lien dans le presse-papiers" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Téléchargement du fichier %(current)li sur %(total)li à %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Téléchargement du fichier %(current)li sur %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Votre version d'Ubuntu n'est plus prise en charge." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1767,53 +1766,59 @@ "jour critiques. Veuillez mettre à niveau vers une version plus récente " "d'Ubuntu ." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Informations de mise à niveau" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Installer" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Nom" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Version %s : \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Aucune connexion réseau n'a été détectée. Vous ne pouvez pas télécharger la " "liste de changements." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Téléchargement de la liste des modifications…" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "Tout _désélectionner" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Tout _sélectionner" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s mise à jour a été sélectionnée." +msgstr[1] "%(count)s mises à jour ont été sélectionnées." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s vont être téléchargés." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "La mise à jour a déjà été téléchargée, mais pas encore installée." msgstr[1] "" "Les mises à jour ont déjà été téléchargées, mais pas encore installées." @@ -1822,11 +1827,18 @@ msgid "There are no updates to install." msgstr "Il n'y a pas de mises à jour à installer." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Taille du téléchargement inconnue." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1834,7 +1846,7 @@ "La date de dernière mise à jour des informations de paquets est inconnue. " "Veillez cliquer sur le bouton “Vérifier” pour mettre à jour ces informations." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1844,7 +1856,7 @@ "Cliquez sur le bouton « Vérifier » ci-dessous pour vérifier les nouvelles " "mises à jour des logiciels." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1855,7 +1867,7 @@ "Les informations sur les paquets ont été mises à jour il y a %(days_ago)s " "jours." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1868,34 +1880,46 @@ "heures." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Les informations des paquets ont été mise à jour il y a %s minutes." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Les informations des paquets viennent d'être mises à jour." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Les mises à jour logicielles corrigent des erreurs, éliminent des failles de " +"sécurité et apportent de nouvelles fonctionnalités." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Des mises à jour peuvent être disponibles pour votre ordinateur." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Bienvenue sur Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Ces mises à jour ont été diffusées depuis que cette version d'Ubuntu a été " +"publiée." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Des mises à jour sont disponibles pour cet ordinateur." + +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1907,7 +1931,7 @@ "corbeille et supprimez les paquets temporaires des précédentes installations " "en utilisant « sudo apt-get clean »." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1915,23 +1939,23 @@ "L'ordinateur doit être redémarré pour terminer l'installation des mises à " "jour. Veuillez enregistrer vos travaux avant de poursuivre." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Lecture des informations sur les paquets" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Connexion…" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "Vous ne pouvez peut-être pas vérifier ou télécharger des mises à jour." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Impossible d'initialiser les données sur les paquets" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1945,7 +1969,7 @@ "Veuillez signaler ce bogue du paquet « update-manager » en y joignant le " "message d'erreur suivant :\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1958,31 +1982,31 @@ "Veuillez signaler ce bogue du paquet « update-manager » en y joignant le " "message d'erreur suivant :" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Nouvelle installation)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Taille : %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "De la version %(old_version)s vers la version %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Version %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Mise à niveau impossible dans l'immédiat." -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1991,21 +2015,21 @@ "La mise à niveau de la distribution ne peut s'exécuter pour le moment. " "Veuillez réessayer plus tard. Le serveur a renvoyé : « %s »" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Téléchargement de l'outil de mise à niveau de distribution" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "La nouvelle version « %s » d'Ubuntu est disponible" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "La liste des logiciels est corrompue" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -2015,6 +2039,17 @@ "d'abord utiliser le gestionnaire de paquets « Synaptic » ou lancer « sudo " "apt-get install -f » dans un terminal pour corriger ce problème." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Nouvelle version « %s » disponible." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Annuler" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Vérifier si des mises à jour sont disponibles" @@ -2024,22 +2059,18 @@ msgstr "Installer toutes les mises à jour disponibles" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Annuler" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Liste des modifications" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Mises à jour" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Construction de la liste des mises à jour" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2063,22 +2094,22 @@ " * des paquets non officiels, non fournis par Ubuntu ;\n" " * des modifications normales liées à une pré-version d'Ubuntu." -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Téléchargement de l'historique de développement" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Autres mises à Jour (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" "Cette mise à jour provient d'une source ne fournissant pas de notes de " "version." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2086,7 +2117,7 @@ "Échec lors du téléchargement de la liste des modifications. \n" "Veuillez vérifier votre connexion Internet." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2099,7 +2130,7 @@ "Version disponible : %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2113,7 +2144,7 @@ "Veuillez utiliser http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "jusqu'à ce que les modifications soient disponibles ou réessayez plus tard." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2126,54 +2157,45 @@ "Consultez http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "en attendant qu'elle soit disponible ou réessayez plus tard." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Impossible de détecter la distribution" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" "Une erreur « %s » s'est produite en essayant de déterminer le système que " "vous utilisez." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Mises à jour de sécurité importantes" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Mises à jour recommandées" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Mises à jour proposées" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Rétro-portages" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Mises à jour de la distribution" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Autres mises à jour" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Démarrage du gestionnaire de mises à jour" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Les mises à jour logicielles corrigent des erreurs, éliminent des failles de " -"sécurité et apportent de nouvelles fonctionnalités." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "Mise à niveau _partielle" @@ -2246,63 +2268,63 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Mises à jour des logiciels" +msgid "Update Manager" +msgstr "Gestionnaire de mises à jour" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Mises à jour des logiciels" +msgid "Starting Update Manager" +msgstr "Démarrage du gestionnaire de mises à jour" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "M_ettre à niveau" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "mises à jour" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Installer" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Changements" +msgid "updates" +msgstr "mises à jour" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Description" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Description de la mise à jour" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "" -"Vous êtes connecté(e) via une opérateur mobile et vous pouvez être facturé" -"(e) pour les données envoyées par cette mise à jour." +"Vous êtes connecté(e) via une opérateur mobile et vous pouvez être " +"facturé(e) pour les données envoyées par cette mise à jour." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Vous êtes connecté(e) avec un modem sans fil." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Il est plus sûr de brancher l'ordinateur sur une alimentation secteur avant " "la mise à jour." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Installer les mises à jour" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Changements" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Paramètres..." +msgid "Description" +msgstr "Description" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Installer" +msgid "Description of update" +msgstr "Description de la mise à jour" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Paramètres..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2327,9 +2349,8 @@ msgstr "Vous avez refusé la mise à niveau vers la nouvelle version d'Ubuntu." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Vous pouvez mettre à niveau ultérieurement en lançant le « Gestionnaire de " @@ -2343,62 +2364,62 @@ msgid "Show and install available updates" msgstr "Afficher et installer les mises à jour disponibles" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Afficher le numéro de version et fermer" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Dossier contenant les fichiers de données" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Vérifier si une nouvelle version d'Ubuntu est disponible" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "Vérifier si la mise à niveau vers la dernière version de développement est " "possible" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Mettre à niveau en utilisant la dernière version proposée de l'assistant de " "mise à niveau de la distribution" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Ne pas capturer le focus au démarrage" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Essayer d'exécuter un « dist-upgrade »" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Ne pas vérifier les mises à jour au démarrage" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Tester la mise à niveau dans un environnement protégé (sandbox aufs)" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Lancement d'une mise à niveau partielle" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Voir la description du paquet au lieu de la liste des modifications" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Essayer de mettre à niveau vers la dernière version disponible en utilisant " "l'outil de mise à niveau de $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2409,11 +2430,11 @@ "standard d'un ordinateur de bureau et « server » pour les installations de " "type serveur." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Lancer l'interface spécifiée" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2421,11 +2442,11 @@ "Vérifier seulement si une nouvelle distribution est disponible et afficher " "le résultat en sortie" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Recherche d'une nouvelle version d'Ubuntu" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2433,59 +2454,59 @@ "Pour plus d'informations sur la mise à jour, veuillez visiter :\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Aucune nouvelle version trouvée" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Nouvelle version « %s » disponible." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Lancer « do-release-upgrade » pour mettre à niveau vers celle-ci." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Mise à niveau vers Ubuntu %(version)s disponible" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Vous avez refusé la mise à niveau vers Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Ajouter la sortie de débogage" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Afficher les paquets non pris en charge présents sur cette machine" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Afficher les paquets pris en charge présents sur cette machine" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Voir tous les paquets avec leur statut" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Afficher tous les paquets en liste" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Résumé de l'état du support de '%s':" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -"Vous avez %(num)s paquets (%(percent).1f%%) pris en charge jusqu'à %(temps)s" +"Vous avez %(num)s paquets (%(percent).1f%%) pris en charge jusqu'à %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" @@ -2493,12 +2514,12 @@ "Vous avez %(num)s paquets (%(percent).1f%%) qui ne peuvent pas ou plus être " "téléchargés" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -"Vous avez %(num)s paquets (%(pour cent).1f%%) qui ne sont pas pris en charge" +"Vous avez %(num)s paquets (%(percent).1f%%) qui ne sont pas pris en charge" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2506,54 +2527,71 @@ "Exécuter avec --show-unsupported, --show-supported ou --show-all pour voir " "plus de détails" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "N'est plus téléchargeable:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Non pris en charge: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Pris en charge jusqu'en %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Non pris en charge" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Méthode non implémentée : %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Un fichier sur disque" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "paquet .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Installation du paquet manquant." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Le paquet %s devrait être installé." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "paquet .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s doit être marqué pour une installation manuelle." +msgid "%i obsolete entries in the status file" +msgstr "%i entrées obsolètes dans le fichier « status »" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "Entrées obsolètes dans le fichier « status » du paquet" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "Entrées obsolètes dans le fichier « status »" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2562,69 +2600,82 @@ "mise à niveau. Consultez le rapport de bogue #279621 sur Launchpad.net pour " "plus de renseignements." -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "%i entrées obsolètes dans le fichier « status »" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "Entrées obsolètes dans le fichier « status » du paquet" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "Entrées obsolètes dans le fichier « status »" +msgid "%s needs to be marked as manually installed." +msgstr "%s doit être marqué pour une installation manuelle." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Supprimer Lilo puisque Grub est déjà installé. (Voir bogue #314004 pour plus " "de renseignements.)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Après la mise à jour de l'information de votre paquet, le paquet " -#~ "essentiel '%s' n'a pu être retrouvé. Un processus de rapport d'incident " -#~ "est donc initialisé." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Mise à niveau d'Ubuntu vers la version 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s mise à jour a été sélectionnée." -#~ msgstr[1] "%(count)s mises à jour ont été sélectionnées." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Bienvenue sur Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Ces mises à jour ont été diffusées depuis que cette version d'Ubuntu a " -#~ "été publiée." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Des mises à jour sont disponibles pour cet ordinateur." - -#~ msgid "Update Manager" -#~ msgstr "Gestionnaire de mises à jour" - -#~ msgid "Starting Update Manager" -#~ msgstr "Démarrage du gestionnaire de mises à jour" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Vous êtes connecté(e) avec un modem sans fil." - -#~ msgid "_Install Updates" -#~ msgstr "_Installer les mises à jour" +#~ "Après la mise à jour de l'information de votre paquet, le paquet " +#~ "essentiel '%s' n'a pu être retrouvé. Un processus de rapport d'incident " +#~ "est donc initialisé." #~ msgid "Checking for a new ubuntu release" #~ msgstr "" @@ -2682,6 +2733,9 @@ #~ "jour critiques. Veuillez mettre à niveau vers une version plus récente " #~ "d'Ubuntu Linux." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Mise à niveau d'Ubuntu vers la version 11.10" + #~ msgid "" #~ "The support in Ubuntu 11.04 for your intel graphics hardware is limited " #~ "and you may encounter problems after the upgrade. Do you want to continue " diff -Nru update-manager-17.10.11/po/fur.po update-manager-0.156.14.15/po/fur.po --- update-manager-17.10.11/po/fur.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/fur.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2010-11-29 03:25+0000\n" "Last-Translator: Marco Londero \n" "Language-Team: Friulian \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Servidôr par %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Servidôr princpâl" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Servidôrs personalitâts" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "No pues calcolâ la vôs sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "No puedi cjatà nissun file dai pachets, forsit no isal un Disc Ubuntu o le " "architeture sbaliade ?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "No rivât a zontà al CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,13 +83,13 @@ "Al messaç di erôr e jere:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Gjave il pacut ravuinât" msgstr[1] "Gjave i pacuts ravuinâts" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -109,15 +110,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Al servidôr pôl jessi sorecjariât" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "pacuts ravuinâts" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -127,7 +128,7 @@ "comedilu cun synaptic o cun apt-get prime di la indenant" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -149,27 +150,27 @@ " * Pachets di software no ufiziâi no furnîts di Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Chest al è a la plui un probleme momentani, riprove par plasè plui tart." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "No si pues calcolâ l'avançament" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Erôr tal autenticà un pôcs di pachets" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -179,40 +180,40 @@ "momentani probleme di ret. Pôl jessi che tu vuelis riprovà plui tart. Ciale " "sote par une liste dai pachets no autenticâts." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" "Il pachet '%s' al è segnât di rimovilu ma al è ta liste nere di rimozion." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Il pachet indispensabil '%s' al è segnât pa rimozion." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Cirint di instalà la version '%s' in liste nere" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "No si pues instalâ '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -221,15 +222,15 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Daûr a lei la cache" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "No si pues vê il bloc esclusîf" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -238,11 +239,11 @@ "(par esempli apt-get o aptitude) e je in esecuzion. Siere prime chê " "aplicazion." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -251,11 +252,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -266,11 +267,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -278,7 +279,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -287,29 +288,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "No si pues inzornâ" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -319,28 +320,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -348,11 +349,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Vuelistu includi i ultins inzornaments di Internet?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -364,16 +365,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Nissun mirror valit cjatât" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -386,11 +387,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -399,34 +400,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Informazions sul dipuesit no validis" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Risultivis di tierce part disativadis" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -439,23 +440,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Erôr dilunc l'inzornament" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Nol è vonde spazi libar sul disc" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -466,32 +467,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Daûr a calcolâ i cambiaments" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Vuelistu scomençâ l'inzornament?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "No si pues discjamâ i inzornaments" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -499,33 +500,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Daûr a tornâ al stât origjinâl dal sisteme" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "No si pues instalâ i inzornaments" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -536,26 +537,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Vuelistu gjavâ i pacuts vecjos?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Ten" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Gjave" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -563,37 +564,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Lis dipendencis necessaris no son instaladis" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "La dipendence necessarie '%s' no je instalade. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Daûr a controlâ il gjestôr di pacuts" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Preparazion dal avançament di version falide" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -601,79 +602,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Daûr a inzornâ lis informazions dal dipuesit" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Informazions di pacut no validis" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Daûr a recuperâ" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Daûr a inzornâ" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Avançament di version finît" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Avançament di version dal sistem finît." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -681,16 +682,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -699,7 +700,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -708,11 +709,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -720,11 +721,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -732,11 +733,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -746,71 +747,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "A mancjin cirche %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Daûr a recuperâ il file %li su %li" @@ -820,27 +821,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Daûr a aplicâ i cambiaments" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "No si pues instalâ '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -850,7 +851,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -859,26 +860,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Comant 'diff' no cjatât" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -886,147 +887,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Mostre difarencis >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Plate difarencis" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Mostre terminâl >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Plate terminâl" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Detais" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Gjave %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Instale %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Avanze %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Covente tornâ a inviâ l'ordenadôr" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1034,32 +1035,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Scancelâ l'avançament di version?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1075,7 +1076,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1089,14 +1090,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1104,34 +1105,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Daûr a recuperâ i gnûfs pacuts" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Daûr a instalâ i inzornaments" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1144,28 +1143,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d pacut al sta par jessi gjavât." msgstr[1] "%d pacuts a stan par jessi gjavâts." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d gnûf pacut al sta par jessi instalât." msgstr[1] "%d gnûfs pacuts a stan par jessi instalâts." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d pacut al sta par jessi inzornât." msgstr[1] "%d pacuts a stan par jessi inzornâts." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1176,147 +1175,147 @@ "\n" "Tu scugnis discjamâ un totâl di %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Covente tornâ a inviâ l'ordenadôr" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "L'inzornament al è finît e si scugne tornâ a inviâ l'ordenadôr. Vuelistu " "fâlu cumò?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Imprest pal inzornament" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Autenticazion falide" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1324,73 +1323,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Detais [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Gjave: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Instale: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Inzorne: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1448,7 +1447,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1467,133 +1466,141 @@ msgid "Terminal" msgstr "Terminâl" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Inzornament completât" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Daûr a discjamâ la liste dai cambiaments..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1601,31 +1608,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1634,34 +1648,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1669,29 +1691,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Daûr a lei lis informazions sui pacuts" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1700,7 +1722,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1708,58 +1730,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Dimension: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1769,22 +1801,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1798,26 +1826,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1826,7 +1854,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1835,7 +1863,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1844,50 +1872,43 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Inzornaments di sigurece impuartants" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Inzornaments racomandâts" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Altris inzornaments" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Inviament dal Gjestôr dai inzornaments" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "Inzornament _parziâl" @@ -1946,59 +1967,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Inzornaments software" +msgid "Update Manager" +msgstr "Gjestôr dai inzornaments" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Inzornaments software" +msgid "Starting Update Manager" +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Inzorne" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "inzornaments" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Instale %s" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Cambiaments" +msgid "updates" +msgstr "inzornaments" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Descrizion" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Descrizion dal inzornament" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "I_nstale inzornaments" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Cambiaments" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "" +msgid "Description" +msgstr "Descrizion" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Instale %s" +msgid "Description of update" +msgstr "Descrizion dal inzornament" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2022,7 +2043,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -2034,225 +2055,285 @@ msgid "Show and install available updates" msgstr "Mostre e instale i inzornaments disponibii" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Mostre la version e va fûr" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Prove a eseguî un dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Esecuzion di un avançament di version parziâl" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Invie il frontend specificât" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Nissune gnove version cjatade" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Gjestôr dai inzornaments" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "I_nstale inzornaments" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "Checking for a new ubuntu release" #~ msgstr "Daûr a controlâ la presince di une gnove version di Ubuntu" diff -Nru update-manager-17.10.11/po/fy.po update-manager-0.156.14.15/po/fy.po --- update-manager-17.10.11/po/fy.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/fy.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2009. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-20 16:31+0000\n" "Last-Translator: Sense Egbert Hofstede \n" "Language-Team: Frisian \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Tsjinner foar %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Haadtsjinner" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Oanpaste tsjinners" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Koe sources.list ynfier net berekkenje" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Koe gjin pakket-triemen fine, miskien is dit gjin Ubuntu skiif of de " "ferkearde arsjitektuer?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Tafoegjen fan de skiif mislearre" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,13 +83,13 @@ "It flater berjocht wie:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Pakket yn minne tastân fuortsmite." msgstr[1] "Pakketten yn minne tastân fuortsmite." -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -108,22 +109,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "De tsjinner kin oerbelêstige wêze" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Brutsen pakketten" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -136,33 +137,33 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Dit is wierskynlik" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Koe de opwurdearing net berekkenje" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Flater bei it bepalen fan de echtheid fan sommige pakketten" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -170,33 +171,33 @@ "It pakket '%s' is markearre foar ferwiderje, mar it stjit op de swarte list " "foar ferwiderje." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "It nedige pakket '%s' is markearre foar ferwiderjen." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Kin '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Kin it meta-pakket net riede" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -205,25 +206,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Tydlike opslach ynlêze" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Kin gjin eksklusyfe fêstsetting krije" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -232,11 +233,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -247,11 +248,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -259,7 +260,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -268,29 +269,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -300,28 +301,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -329,11 +330,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -345,16 +346,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -367,11 +368,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -380,34 +381,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -420,23 +421,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -447,32 +448,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -480,33 +481,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -517,26 +518,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -544,37 +545,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -582,79 +583,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -662,16 +663,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -680,7 +681,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -689,11 +690,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -701,11 +702,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -713,11 +714,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -727,71 +728,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -801,27 +802,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -831,7 +832,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -840,26 +841,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -867,147 +868,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1015,32 +1016,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1056,7 +1057,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1070,14 +1071,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1085,34 +1086,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1125,28 +1124,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1154,145 +1153,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1300,73 +1299,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1424,7 +1423,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1443,133 +1442,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1577,31 +1584,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1610,34 +1624,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1645,29 +1667,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1676,7 +1698,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1684,58 +1706,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1745,22 +1777,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1774,26 +1802,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1802,7 +1830,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1811,7 +1839,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1820,50 +1848,43 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Bywurking Behearder is oan it begjinne" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "" @@ -1922,56 +1943,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Bywurking Behearder is oan it begjinne" +msgid "Update Manager" +msgstr "Bywurking Behearder" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Bywurking Behearder is oan it begjinne" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1996,7 +2018,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -2008,219 +2030,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Bywurking Behearder" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" diff -Nru update-manager-17.10.11/po/ga.po update-manager-0.156.14.15/po/ga.po --- update-manager-17.10.11/po/ga.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/ga.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2010-09-27 23:18+0000\n" "Last-Translator: Launchpad Translations Administrators \n" "Language-Team: Irish \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "" @@ -42,30 +43,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -75,13 +76,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -96,22 +97,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Pacáistí Briste" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -124,65 +125,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -191,25 +192,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -218,11 +219,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -233,11 +234,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -245,7 +246,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -254,29 +255,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -286,28 +287,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -315,11 +316,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -331,16 +332,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -353,11 +354,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -366,34 +367,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -406,23 +407,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -433,32 +434,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -466,33 +467,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -503,26 +504,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -530,37 +531,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -568,79 +569,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -648,16 +649,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -666,7 +667,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -675,11 +676,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -687,11 +688,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -699,11 +700,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -713,71 +714,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -787,27 +788,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -817,7 +818,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -826,26 +827,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -853,147 +854,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1001,32 +1002,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1042,7 +1043,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1056,14 +1057,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1071,34 +1072,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1111,28 +1110,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1140,145 +1139,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1286,73 +1285,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1410,7 +1409,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1429,166 +1428,180 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1597,34 +1610,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1632,29 +1653,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1663,7 +1684,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1671,58 +1692,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1732,22 +1763,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1761,26 +1788,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1789,7 +1816,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1798,7 +1825,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1807,47 +1834,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1908,54 +1929,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1980,7 +2004,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1992,216 +2016,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/gd.po update-manager-0.156.14.15/po/gd.po --- update-manager-17.10.11/po/gd.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/gd.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2011. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-30 13:47+0000\n" "Last-Translator: alasdair caimbeul \n" "Language-Team: Gaelic; Scottish \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -29,13 +30,13 @@ msgstr[2] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Frithealaiche son %s" @@ -43,20 +44,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Prìomh frithealaiche" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Frithealaichean gnàthach" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Cha b' urrainn ionnrain sources.list innteart" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -64,11 +65,11 @@ "Cha b' urrainn lorg faidhlichean pacaid sam bith, 's docha nach e Diosg " "Ubuntu tha seo no ailtearachd ceàrr?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Dh'fhailig an MC a chur ris" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -83,14 +84,14 @@ "Seadh teachdaireachd a' mhearachd:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Gluasad pacaid ann an droch staid" msgstr[1] "Gluasad pacaid ann an droch staid" msgstr[2] "Gluasad pacaidean ann an droch staid" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -115,15 +116,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Dh'fhaodadh an-luchdachadh am frithealaiche" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Pacaidean briste" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -133,7 +134,7 @@ "apt-get roimh leantainn air adhart." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -154,13 +155,13 @@ " *Pacaidean bathar-bog neo-oifigeil nach do thabhairt Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Tha seo mar as trice na trioblaid diombuan, nach feuch sibh a-rithist nas " "anmoch." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -168,16 +169,16 @@ "Ma 's nach eil càil dhan seo iomchaidh, nach dèan sibh aithris air a' bhuga " "seo leis an àithne 'ubuntu-bug update-manager' ann an tèirmineal." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Cha b' urrainn àireamhachadh an ùrachadh" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Mearachd dearbhadh cuid pacaidean" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -187,7 +188,7 @@ "trioblaid lìonra diombuan. 'S mathaid gun iarraidh tu feuchainn a-rithist " "nas anmoch. Faic gu h- ìseal airson liosta pacaidean neo-dhearbhte." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -195,22 +196,22 @@ "Tha am pacaid '%s' a chomharrachadh son gluasad ach tha e air an dubh-liosta " "gluasad." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Tha pacaid deatamach '%s' a chomharrachadh son gluasad." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Feuchainn a stàlachadh tionndaidh dubh-liostadh '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Chan urrainn stàlachadh '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -220,11 +221,11 @@ "tèirmineal." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Chan urrainn tomhais pacaid-meta" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -238,15 +239,15 @@ " Nach stàlaich sibh aon den phacaidean gu h-àrd a tòiseach cleachdadh " "synaptic no apt-get roimh leantainn air adhart." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Leughadh tasgadan" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Chan fhaigheadh glais toirmisgeach" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -255,11 +256,11 @@ "eile (mar apt-get no aptitude) a ruith mar thràth. Nach dùin sibh am prògram " "sin an tòiseach." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Chan eil taic ann airson ùrachadh thairis ceangal iomallach" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -273,11 +274,11 @@ "\n" "Bidh caisg a chur air an ùrachadh a-nis. Feuch sibh a-rithist às aonais ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Lean a' ruith fo SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -294,11 +295,11 @@ "Ma tha leanas tu, tòiseachadh daemon ssh a bharrachd aig port '%s'.\n" "Bheil thu ag iarraidh leantainn?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Tòiseachadh sshd a bharrachd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -310,7 +311,7 @@ "Ma thèid càil ceàrr le a' ruith ssh faodaidh tu fhathast ceangal ris an " "fhear a' bharrachd.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -323,29 +324,29 @@ "air dhèanamh gu fèin-obrachail, Faodaidh tu fosgail am port le m.e.;\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Chan urrainn ùrachadh" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Chan eil taic ann leis an inneal seo ag ùrachadh bhon '%s' gu '%s'." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "D'fhailig stèidheachadh suas Sandbox" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Chan eil e comasach cruthachadh àrainneachd sandbox." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Modh Sandbox" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -361,18 +362,18 @@ "*Chan eil* tha na atharrachaidhean gan sgrìobadh don eòlaire siostam bhon " "an dràsta gus an ath bùtaich a-rithist buan." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Tha stàlachadh python agad truaillte. Càraich sibh an ceangal-samhlach - " "symlink '/usr/bin/python'." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Tha pacaid 'debsig-verify' stàlaichte" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -382,12 +383,12 @@ "Gluasad sibh e le synaptic no 'apt-get remove debsig-verify' an tòiseach " "agus ruith an ùrachadh a-rithist" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Chan urrainn sgrìobhadh gu'%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -398,11 +399,11 @@ "Chan urrainn an leasachadh leantainn.\n" "Dèanaibh cinnteach gu bheil comas sgrìobhadh aig an eòlaire siostam agaibh." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Gabh a-steach ùrachadh ùr nodha bhon eadar-lìon?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -424,16 +425,16 @@ "dèidh leasachadh.\n" "Ma fhreagairt tu 'chan eil' an seo, cha bhith an lìonra ga chleachdadh idir." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "bacadh air ùrachadh gu %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Gun sgàthan dligheach air lorg" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -454,11 +455,11 @@ "Ma thaghas tu 'chan eil' sguireadh an leasachadh." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Cruthaich bunan gnàthach?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -472,11 +473,11 @@ "Am bu chòir innteartan gnàthach a chur ris son '%s' ? Ma thaghas tu 'chan " "eil' sguireadh an leasachadh." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Fiosrachadh taisgeadan neo-dligheach" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -484,11 +485,11 @@ "Le leasachadh an ionad-tasgaidh fiosrachadh bha faidhle neo-dhligheach mar " "thoradh, mar sin tha am pròiseas iomradh buga a thòiseachadh." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Bunan an treas com-pàirteach neo-chomasach" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -498,14 +499,14 @@ "chomasaichte. Faodaidh tu ath-chomasaich iad às dèidh an leasachadh leis an " "inneal 'software-properties' anns am manaidsear pacaid agad." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Pacaid ann an staid mì-chòrdail" msgstr[1] "Pacaid ann an staid mì-chòrdail" msgstr[2] "Pacaidean ann an staid mì-chòrdail" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -528,11 +529,11 @@ "stàlachadh, ach chan eil lorg air tasglann dha. Ath-stàlaich sibh am pacaid " "le làimh no gluasad e bhon t-siostam." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Mearachd nuair ùrachadh" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -541,13 +542,13 @@ "lìonra a choreigin tha seo, sgrùd sibh a cheangal lìonra agaibh agus feuch a-" "rithist." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Chan eil gu leòr rùm diosg saor" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -562,21 +563,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Àireamhachadh na atharraichean" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Bheil thu ag iarraidh tòiseachadh an leasachadh?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Leasachadh chur dheth" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -584,12 +585,12 @@ "Bithidh an leasachadh chur dheth an dràsta agus an staid siostam tùsail a " "thoirt air ais. Faodaidh tu togail an-àirde às ùr aig àm nas anmoch." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Cha b' urrainn luchdachadh a-nuas na leasachaidhean" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -600,27 +601,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Mearachd nuair cuir an comas" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "A' toirt air ais staid siostam tùsail" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Cha b' urrainn stàlachadh na leasachaidhean" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -629,7 +630,7 @@ "staid gun fheum. Ruithe ath-shlànachadh \r\n" "a-nis (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -646,7 +647,7 @@ "log/dist-upgrade/ an cois an iomradh buga.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -654,20 +655,20 @@ "Chaidh an leasachadh a bhacadh. Sgrùd sibh a cheangal lìonra no meadhanan " "stàlachadh agaibh agus feuch a-rithist. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Gluasad pacaidean o fheum?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Glèidh" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Thoir às" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -677,27 +678,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Chan eil an eismealachd deatamach stàlaichte" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Chan eil an eismealachd deatamach '%s' stàlaichte. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Sgrùdadh manaidsear pacaid" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "D'fhàilig ullachadh an leasachadh" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -705,11 +706,11 @@ "Dh'fhàgail ullachadh an t-siostam airson leasachadh mar sin thathar a " "tòiseachadh am pròiseas iomradh buga." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "D' fhàilig fhaighinn leasachadh ro-ghoireasan" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -722,70 +723,70 @@ "\n" "A bharrachd, tha pròiseas iomradh buga a tòiseachadh." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Leasachadh fiosrachadh taisgeadan" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "D' fhàilig cuir ris an cdrom - mccla" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Duilich, neo-shoirbheachail cuir ris cdrom - mccla" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Fiosrachadh pacaid neo-dligheach" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Faighinn" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Leasachadh" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Leasachadh crìochnaichte" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "Chaidh an leasachadh a' chrìochnachadh ach bha mearachdan. fad a` phròiseas " "leasachadh." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Sireadh airson bathar-bog o fheum" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Tha an leasachadh crìochnaichte." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Bha an leasachadh leth-phàirteach crìochnaichte." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "tha evms chleachdadh" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -795,13 +796,13 @@ "mounts. Chan eil taic ann tuilleadh son bathar-bog 'evms' , cuir sibh dheth " "e, agus ruith sibh an leasachadh a-rithist às dèidh seo a dhèanamh." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "Dh'fhaodadh nach fhaigh do bhathar-cruaidh grafaigeach làn taic ann an " "Ubuntu 12.04 LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -814,9 +815,9 @@ "UpdateManagerWarningForI8xx Bheil thu ag iarraidh leantainn leis an " "leasachadh?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -824,8 +825,8 @@ "Dh'fhaodadh leasachadh lughdachadh buaidhean a' bhàrr-deasc, agus dèanadas " "ann an geamannan agus prògraman dian grafaigeach eile." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -839,7 +840,7 @@ "\n" "Bheil thu ag iarraidh leantainn?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -853,11 +854,11 @@ "\n" "Bheil thu ag iarraidh leantainn?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Gun i686 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -869,11 +870,11 @@ "i686 mar bu lugha ailteireachd. Chan eil e comasach leasachadh an t-siostam " "agad gu tionndaidh ùr Ubuntu leis a' bhathar-cruaidh seo." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Gun ARMv6 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -886,11 +887,11 @@ "leasachadh an t-siostam agad gu tionndaidh ùr Ubuntu leis a' bhathar-cruaidh " "seo." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Gun init ri fhaighinn" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -904,17 +905,17 @@ "staigh seòrsa àrainneachd seo, tha iarratas ùrachadh an rian-coimpiutair mas " "fhìor agad an thòiseach." -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Leasachadh Sandbox cleachdadh aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Cleachd an t-slighe thabhairt a' sireadh airson mccla-cdrom le pacaidean " "gabh leasachadh" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -922,58 +923,58 @@ "Cleachd beul-chrìoch. Ri làimh an dràsta: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*TÀIREALACHD* bidh roghainn seo air leigeil seachad" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Dèan leasachadh leth-phàirteach a-mhàin (gun ath-sgrìobhadh sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Neo-chomasaich taic sgrìn GNU" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Stèidhte datadir" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Cuir sibh a-steach '%s' dhan dràibh '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Tha faighinn crìochnaichte" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Faighinn faidhle %li de %li aig %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Mu dhèidhinn %s air fhàgal" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Faighinn faidhle %li de %li" @@ -983,27 +984,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Builich atharraichean" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "trioblaidean eismealachd – fàgail neo-rianail" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Cha b' urrainn stàlachadh '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -1015,7 +1016,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1026,7 +1027,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1034,20 +1035,20 @@ "Caillidh tu atharraichean sam bith a rinn thu ri rian-faidhle seo ma 's e " "do roghainn cuir tionndaidh ùr an àite." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Cha robh àithne 'diff' air lorg" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Thachair mearachd marbhteach" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1060,13 +1061,13 @@ "Bha an sources.list tùsail a shàbhail ann an /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Brùthadh Ctrl-c" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1075,137 +1076,137 @@ "agad ann an staid briste. Cinnteach gu bheil thu ag iarraidh sin a dhèanamh?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Son a cuir bac air call dàta dùin na h-uile prògraman agus sgrìobhainnean " "fosgailte." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Às aonais taic tuilleadh bho Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Beagachadh (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Gluasad (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Gun iarraidh tuilleadh (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Stàlaich (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Leasachadh (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Atharraichean Meadhanan" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Seall An Diofar >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Falaich An Diofar" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Mearachd" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "%Cuir dheth" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Dùin" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Seall Tèirmineal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Falaich Tèirmineal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Fiosrachadh" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Mion-chunntas" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Gun taic tuilleadh %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Gluasad %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Gluasad (bha fhèin stàlaichte) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Stàlaich %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Leasachadh %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Iarrtas ath-thòiseachadh" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" "Ath-thòisich an t-siostam son crìochnachadh an leasachadh" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Ath-thòisich an dràsta" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1218,11 +1219,11 @@ "leasachadh. Tha thu air do chomhairleachadh gu làidir togail an-àirde às ùr " "an leasachadh a-rithist." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Sguir Leasachadh?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" @@ -1230,7 +1231,7 @@ msgstr[1] "%li làtha" msgstr[2] "%li làithean" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" @@ -1238,7 +1239,7 @@ msgstr[1] "%li uair" msgstr[2] "%li uairean" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" @@ -1246,7 +1247,7 @@ msgstr[1] "%li mionaid" msgstr[2] "%li mionaidean" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1263,7 +1264,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1277,14 +1278,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1294,34 +1295,32 @@ "mòdam 56c." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Bheireadh luchdachadh a-nuas seo mu %s le do cheangal. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Ag ullachadh son leasachadh" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Faighinn sianalan ùr bathar-bog" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Faighinn pacaidean ùr" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Stàlachadh na leasachaidhean" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Glanadh an àirde" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1341,7 +1340,7 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." @@ -1349,7 +1348,7 @@ msgstr[1] "Bithidh pacaid %d a' gluasad." msgstr[2] "Bithidh pacaidean %d nan gluasad." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." @@ -1357,7 +1356,7 @@ msgstr[1] "Bithidh pacaid ùr %d ga stàlachadh" msgstr[2] "Bithidh pacaidean ùr %d nan stàlachadh" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." @@ -1365,7 +1364,7 @@ msgstr[1] "Bithidh pacaid %d ga leasachadh" msgstr[2] "Bithidh pacaidean %d nan leasachadh" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1376,7 +1375,7 @@ "\n" "Feumaidh tu luchdachadh a-nuas suim de %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1384,7 +1383,7 @@ "Dh’fhaodadh stàlachadh an leasachadh gabhail iomadaidh uairean. An t-àm a' " "chrìochnaicheas an luchdadh a-nuas, chan urrainn cuir dheth am pròiseas." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1392,16 +1391,16 @@ "Dh'fhaodadh faigh agus stàlachadh an leasachadh toirt iomadaidh uairean. Aon " "uair a chrìochnaich a luchdaich a-nuas, chan urrainn a chur dheth." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Dh’fhaodadh toirt na pacaidean às gabhail iomadaidh uairean. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Tha a' bhathar-bog air a' choimpiutair seo a dh'ionnsaigh an là." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1409,38 +1408,38 @@ "Chan eil leasachaidhean ri làimh airson an t-siostam agad. Bithidh bacadh " "air an leasachadh a-nis." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Ath-bhùtaich riatanach" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Tha an leasachadh deiseil agus tha ath-bhùtaich riatanach. Bheil thu ag " "iarraidh seo a dhèanamh an dràsta?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "dèan cinnteach '%(file)s' an aghaidh '%(signature)s' " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "tarraing '%s'" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Cha b'urrainn ruith an t-inneal leasachadh" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1448,35 +1447,35 @@ "Tha seo nas dualtach bhith na bhuga anns an t-inneal leasachadh. Dèan sibh " "aithris air mar buga cleachdadh an àithne 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Leasaich ainm-sgrìobhte an t-inneal" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Inneal leasaich" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "D'fhàilig ri fhaighinn" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "D'fhàilig faighinn an leasachadh. D' fhaodadh gu bheil trioblaid leis an " "lìonra. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Dh'fhàillig dearbhachadh" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1484,13 +1483,13 @@ "Dh'fhàillig le dearbhachadh an leasachadh. Dh' fhaodadh gu bheil trioblaid " "leis an lìonra no leis am frithealaiche. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Dh'fhàillig a tharraing" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1498,13 +1497,13 @@ "Dh'fhàillig a' tarraing an leasachadh. Dh' fhaodadh gu bheil trioblaid leis " "an lìonra no leis am frithealaiche. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Dh'fhàillig dearbhachadh" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1512,15 +1511,15 @@ "Dh'fhàillig dearbhadh an leasachadh. Dh' fhaodadh gu bheil trioblaid leis an " "lìonra no leis am frithealaiche. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Chan urrainn ruith an leasachadh" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1528,13 +1527,13 @@ "Mar as trice an adhbhar son seo se siostam le /tmp ga àrdachadh noexec. Ath-" "àrdaich sibh às aonais noexec agus ruith sibh an leasachadh a-rithist." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "'S e teachdaireachd a' mhearachd '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1547,73 +1546,73 @@ "Chaidh sources.list tùsail a' shàbhaladh ann an /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "An-torrachadh" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Dh' ìslicheadh:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Gu leantainn brùth sibh [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Lean [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Mion-chunntasan [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "t" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "C" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "m" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Gun taic tuilleadh: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Gluasad: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Stàlaich: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Leasaich: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Lean [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1681,9 +1680,8 @@ msgstr "Leasachadh Sgaoileadh" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Leasachadh Ubuntu gu tionndaidh 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Leasachadh Ubuntu gu tionndaidh 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1701,84 +1699,85 @@ msgid "Terminal" msgstr "Tèirmineal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Fuirichibh, bheireadh seo greis mhath." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Tha leasachadh crìochnichte" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Cha b'urrainn lorg na nòtaichean sgaoilidh" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Dh'fhaodadh am frithealaiche bhith an-luchdachadh. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Cha b' urrainn luchdachadh a-nuas na nòtaichean sgaoilidh" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Sgrùd sibh a'cheangal eadar-lìon agaibh." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Leasachadh" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Nòtaichean Sgaoilidh" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Luchdachadh a-nuas faidhlichean pacaid a' bharrachd..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Faidhle %s de %s aig %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Faidhle %s de %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Fosgail Ceangal ann am Brabhsair" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Copaig Ceangal gu Bòrd-chliopaichean" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Luchdachadh a-nuas faidhle %(current)li de %(total)li le %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Luchdachadh a-nuas faidhle %(current)li de %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Chan eil taic dhan sgaoileadh Ubuntu agad ann tuilleadh." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1786,53 +1785,60 @@ "Chan fhaigh thu tuilleadh càiridhean tèarainteachd no ùrachaidhean " "èiginneach. Leasaich sibh gu tionndaidh nas anmoch de Ubuntu." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Fiosrachadh Leasachadh" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Stàlaich" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Ainm" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Tionndaidh %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Cha robh ceangal lìonra air lorg, chan urrainn dhut luchdachadh a-nuas " "fiosrachadh clàr-atharraich." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Luchdachadh a-nuas liosta de atharrachaidhean..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Neo-thaghte Na H-Uile" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Tagh _Na H-Uile" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s ùrachadh taghte." +msgstr[1] "%(count)s ùrachadh taghte." +msgstr[2] "%(count)s ùrachaidhean taghte." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s Bithidh a luchdachadh a-nuas." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "Chaidh an ùrachadh luchdadh a-nuas mar thà, ach gun a stàladh." msgstr[1] "Chaidh an ùrachadh luchdadh a-nuas mar thà, ach gun a stàladh." msgstr[2] "Chaidh na ùrachaidhean luchdadh a-nuas mar thà, ach gun stàladh." @@ -1841,11 +1847,18 @@ msgid "There are no updates to install." msgstr "Chan eil ùrachaidhean ann son stàladh." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Meud luchdachadh a-nuas neo-aithnichte." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1853,7 +1866,7 @@ "Tha e neo-aithnichte cuin a bha am fiosrachadh pacaid air ùrachadh mu " "dheireadh. Briog sibh am putan 'Sgrùd' son ùrachadh am fiosrachadh." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1863,7 +1876,7 @@ "Brùth am putan 'Sgrùd' gu ìseal son sgrùdadh airson ùrachaidhean bathar-bog " "ùr." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1874,7 +1887,7 @@ msgstr[2] "" "Bha fiosrachadh pacaid ùrachadh mu dheireadh %(days_ago)s làithean air ais." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1887,35 +1900,47 @@ "Bha fiosrachadh pacaid ùrachadh mu dheireadh %(hours_ago)s uairean air ais." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Bha fiosrachadh pacaid ùrachadh mu dheireadh %s mionaidean air ais." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Chaidh fiosrachadh pacaid dìreach a dh' ùrachadh." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Tha ùrachaidhean bathar-bog a' ceartachadh mearachdan, cuir as laigsean agus " +"a' solarachadh feartan ùr." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" "'S docha gu bheil ùrachaidhean bathar-bog ri làimh son a' choimpiutair agad." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Fàilte gu Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Chaidh na ùrachaidhean bathar-bog seo a chur a-mach o chionn an tionndaidh " +"seo de Ubuntu ga sgaoileadh." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Tha ùrachaidhean bathar-bog ri fhaighinn son a' choimpiutair seo." + +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1926,7 +1951,7 @@ "co dhiù an thuilleadh %s de rùm diosg air '%s'. Taom do sgudal agus gluais " "pacaidean sealach de sean stàlaidhean cleachdadh 'sudo apt-get clean'." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1934,25 +1959,25 @@ "Feumaidh a' choimpiutair ath-thòiseachadh gu crìothnachadh ùrachaidhean. " "Sàbhail sibh an obair agaibh mus lean sibh air adhart." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Leughadh fiosrachadh pasgan" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "A' Ceangal.." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "'S docha nach urrainn dhut sgrùdadh son ùrachaidhean no luchdachadh a-nuas " "ùrachaidhean nuadh." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Cha b' urrainn ath-shuidhich fiosrachadh pacaid" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1966,7 +1991,7 @@ "Dèan sibh aithris air a' bhuga seo an aghaidh am 'manaidsear-ùrachadh' agus " "bheir a-steach an teachdaireachd mearachd a leanas.\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1978,31 +2003,31 @@ "Dèan sibh aithris air a' bhuga seo an aghaidh am 'manaidsear-ùrachadh' agus " "bheir a-steach a teachdaireachd mearachd a' leanas." -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Stàladh ùr)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Meud: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "bhon tionnaidh %(old_version)s gu %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Tionnaidh %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Chan urrainn leasaich a sgaoileadh an dràsta." -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -2011,21 +2036,21 @@ "Chan urrainn leasaich a sgaoileadh an dràsta. Feuchaibh a-rithist nas " "anmoch. Dh'aithris am frithealaiche: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Luchdachadh a-nuas an inneal-leasachadh ùrachadh" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Tionndaidh Ubuntu ùr '%s' ri làimh" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Tha clàr-amais a' bhathar-bog briste" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -2035,6 +2060,17 @@ "manaidsear pacaid \"Synaptic\" no ruith \"sudo apt-get install -f\" ann an " "tèirmineal son càradh a' chuis an tòiseach." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Sgaoileadh ùr '%s' ri làimh." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Sguir" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Sgrùd son Ùrachaidhean" @@ -2044,22 +2080,18 @@ msgstr "Stàladh Na H-Uile Ùrachaidhean Ri Làimh" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Sguir" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Clàr-atharraich" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Ùrachaidhean" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Togail Liosta Ùrachaidhean" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2083,22 +2115,22 @@ " *Pacaidean bathar-bog neo-oifigeil nach do sholaraich Ubuntu\n" " *Atharrachaidhean àbhaisteach de tionndaidh ro-sgaoileadh Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Luchdachadh a-nuas clàr-atharraich" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Ùrachaidhean eile (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" "Chan eil an ùrachadh seo a tighinn bhon bun a tha thoirt taic do clàr-" "atharraichean." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2106,7 +2138,7 @@ "Dh' fhàilig luchdachadh a-nuas an liosta de atharraichean. \n" "Sgrùd sibh a' cheangal eadar-lìon agaibh." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2119,7 +2151,7 @@ "Tionndaidh ri laimh: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2132,7 +2164,7 @@ "Cleachd sibh http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "gus a bhith na atharraichean ri làimh no feuch a-rithist nas anmoch." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2145,53 +2177,44 @@ "Cleachd sibh http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "gus an d' thig na atharraichean ri làimh no feuch a-rithist às dèidh beagan." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "D'fhàilig lorg a sgaoileadh" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" "Thachair mearachd '%s' nuair sgrùdadh dè an t-siostam tha thu a' chleachdadh." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Ùrachaidhean tèarainteachd cudthromach" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Ùrachaidhean air mholadh" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Ùrachaidhean a tha ann am beachd" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Port-chùl" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Ùrachaidhean Sgaoileadh" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Ùrachaidhean eile" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Tòiseachadh Manaidsear Ùrachadh" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Tha ùrachaidhean bathar-bog a' ceartachadh mearachdan, cuir as laigsean agus " -"a' solarachadh feartan ùr." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "Leasachadh _Leth-phàirteach" @@ -2265,37 +2288,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Ùrachaidhean Bathar-bog" +msgid "Update Manager" +msgstr "Manaidsear Ùrachadh" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Ùrachaidhean Bathar-bog" +msgid "Starting Update Manager" +msgstr "Tòiseachadh Manaidsear Ùrachadh" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "L_easaich" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "ùrachaidhean" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Stàlaich" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Atharraichean" +msgid "updates" +msgstr "ùrachaidhean" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Dealbh-chunntas" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Mion-chunntas de ùrachadh" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2303,25 +2316,35 @@ "Tha thu ceangailte tro shiubhal 's dh'fhaodadh cosgais bualadh airson an " "dàta a chleachd thu leis an ùrachadh seo." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Tha thu ceangailte tro mòdam uèirleas." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Tha e nas sàbhailte ceangal a' choimpiutair gu cumhachd SA-AC os cionn " "ùrachadh." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Stàlaich Ùrachaidhean" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Atharraichean" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Suidheachaidhean..." +msgid "Description" +msgstr "Dealbh-chunntas" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Stàlaich" +msgid "Description of update" +msgstr "Mion-chunntas de ùrachadh" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Suidheachaidhean..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2345,9 +2368,8 @@ msgstr "Tha thu air diùltadh a' leasachadh gu Ubuntu ùr" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Faodaidh tu leasachadh aig àm nas anmoch le fosgladh Manaidsear Ùrachadh " @@ -2361,60 +2383,60 @@ msgid "Show and install available updates" msgstr "Seall agus stàlaich ùrachaidhean ri làimh" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Seall an tionndaidh agus fàg" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Eòlaire tha gleidheadh faidhlichean dàta" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Sgrùd ma tha tionndaidh ùr Ubuntu ri làimh" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Sgrùd ma tha e comasach leasachadh gu sgaoileadh -devel- ùr nodha" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Leasaich cleachdadh an tionndaidh tha air a mholadh den leasaichear " "sgaoileadh" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Na thoir amais air mapa nuair tòiseachadh" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Feuch ri ruith leasachadh-sgaoil" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Na sgrùd airson ùrachaidhean nuair tòiseachadh" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Feuch an leasachadh le tar-chòmhdachadh sandbox aufs" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "A ruith leasachadh leth-phàirteach" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Seall mion-chunntas den pacaid an àite a' chlàr-atharraich" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Feuch leasachadh gu an sgaoileadh ùr nodha cleachdadh an leasaichear bhon " "$distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2424,11 +2446,11 @@ "An dràsta tha 'desktop' son leasachaidhean riaghlach den siostam bàrr-deasc " "agus 'server' son siostaman frithealaiche gan taiceadh." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Ruith a' chùl-beòil àraid" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2436,11 +2458,11 @@ "Sgrùd a-mhàin ma tha sgaoileadh ùr ri làimh agus dèan aithris air an toradh " "tro còd fàgail" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Sgrùdadh son sgaoileadh ùr Ubuntu" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2448,58 +2470,58 @@ "Son fiosrachadh leasachadh, Cèilidh sibh air:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Cha robh sgaoileadh air lorg" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Sgaoileadh ùr '%s' ri làimh." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Ruith 'do-release-upgrade' son leasachadh a dh'ionnsaigh." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Ubuntu %(version)s Leasachadh Ri Làimh" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Tha thu air diùltadh an leasachadh gu Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Cuir ris mach-chur dì-bhugaich" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Seall pacaidean gun taic air an innleachd seo" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Seall pacaidean le taic air an innleachd seo" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Seall na h-uile pacaidean leis an inbhe aca" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Seall na h-uile pacaidean ann a liosta" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Geàrr-chunntas inbhe taic de '%s':" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "Tha agad % (num)s pacaidean (%(percent).1f%%) le taic gu %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" @@ -2507,11 +2529,11 @@ "Tha agad %(num)s pacaidean (%(percent).1f%%) nach urrainn/a thuilleadh bhith " "a' luchdachadh a-nuas" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "Tha agad %(num)s pacaidean (%(percent).1f%%) a tha gun taic" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2519,125 +2541,154 @@ "Ruith le --show-unsupported, --show-supported neo -–show-all son faicinn " "barrachd mion-chunntas" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Cha ghabh a luchdachadh a-nuas tuilleadh:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Gun taic: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Le taic gu %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Gun taic" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Dòigh neo-ghnìomhach: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Faidhle air diosg" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "pacaid .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Stàladh pacaid a dhith" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Bu chòir pacaid %s a stàlachadh" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "pacaid .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "Feumaidh %s bith comharraichte mar stàlachadh a làimh." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"Nuair leasachadh, ma tha kdelibs4-dev stàlaichte, feumaidh kdelibs5-dev a " -"stàlachadh. Faic bugs.launchpad.net, bug #279621 son mion-chunntas." - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i innteartan bho fheum anns am faidhle inbhe" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Innteartan bho fheum ann an inbhe dpkg" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Innteartan bho fheum inbhe dpkg" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"Nuair leasachadh, ma tha kdelibs4-dev stàlaichte, feumaidh kdelibs5-dev a " +"stàlachadh. Faic bugs.launchpad.net, bug #279621 son mion-chunntas." + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "Feumaidh %s bith comharraichte mar stàlachadh a làimh." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Gluais lilo sgath tha grub cuideachd stàlaichte. (Faic bug #314004 son mion-" "chunntas.)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Às dèidh ùrachadh do fhiosrachadh phacaid chan fhaigh lorg tilleadh air " -#~ "am pacaid riatanach '%s' mar sin tha am pròiseas iomradh buga a' " -#~ "tòiseachadh." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Leasachadh Ubuntu gu tionndaidh 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s ùrachadh taghte." -#~ msgstr[1] "%(count)s ùrachadh taghte." -#~ msgstr[2] "%(count)s ùrachaidhean taghte." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Fàilte gu Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Chaidh na ùrachaidhean bathar-bog seo a chur a-mach o chionn an " -#~ "tionndaidh seo de Ubuntu ga sgaoileadh." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Tha ùrachaidhean bathar-bog ri fhaighinn son a' choimpiutair seo." - -#~ msgid "Update Manager" -#~ msgstr "Manaidsear Ùrachadh" - -#~ msgid "Starting Update Manager" -#~ msgstr "Tòiseachadh Manaidsear Ùrachadh" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Tha thu ceangailte tro mòdam uèirleas." - -#~ msgid "_Install Updates" -#~ msgstr "_Stàlaich Ùrachaidhean" +#~ "Às dèidh ùrachadh do fhiosrachadh phacaid chan fhaigh lorg tilleadh air " +#~ "am pacaid riatanach '%s' mar sin tha am pròiseas iomradh buga a' " +#~ "tòiseachadh." #~ msgid "0 kB" #~ msgstr "0 cB" @@ -2747,6 +2798,9 @@ #~ "uairean a thìde. Nuair a chrìochnaicheas an luchdachadh a-nuas, chan " #~ "urrainn a chur stad ris a' phròiseas." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Leasachadh Ubuntu gu tionndaidh 11.10" + #~ msgid "" #~ "You will not get any further security fixes or critical updates. Please " #~ "upgrade to a later version of Ubuntu Linux." diff -Nru update-manager-17.10.11/po/gl.po update-manager-0.156.14.15/po/gl.po --- update-manager-17.10.11/po/gl.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/gl.po 2017-12-23 05:00:38.000000000 +0000 @@ -5,11 +5,12 @@ # 2004 Michiel Sikkes # Mar Castro , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: gl\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-21 11:11+0000\n" "Last-Translator: Fran Diéguez \n" "Language-Team: galician\n" @@ -22,7 +23,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -30,13 +31,13 @@ msgstr[1] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Servidor desde %s" @@ -44,20 +45,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Servidor principal" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Servidores personalizados" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Non e posíbel calcular a entrada do sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -65,11 +66,11 @@ "Non é posíbel localizar ningún ficheiro de paquete; se cadra este non é un " "disco de Ubuntu ou a arquitectura non é a correcta." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Non foi posíbel engadir o CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -84,13 +85,13 @@ "A mensaxe de erro foi:\n" "«%s»" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Retirar o paquete en mal estado" msgstr[1] "Retirar os paquetes en mal estado" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -111,15 +112,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "O servidor quizais estea saturado" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Paquetes rotos" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -129,7 +130,7 @@ "continuar." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -149,11 +150,11 @@ " * Paquetes de software non oficiais non fornecidos por Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Trátase, o máis seguro, dun problema temporal. Ténteo máis tarde." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -161,16 +162,16 @@ "Se non se aplica ningunha opción, informe de este erro usando a orde " "«ubuntu-bug update-manager» desde o seu terminal." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Non foi posíbel calcular a anovación" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Produciuse un erro ao autenticar algúns paquetes" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -180,7 +181,7 @@ "problema transitorio na rede. Probe de novo máis tarde. Vexa abaixo unha " "lista dos paquetes non autenticados." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -188,22 +189,22 @@ "O paquete «%s» está marcado para a súa eliminación pero está na lista negra " "de paquetes eliminábeis." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "O paquete esencial «%s» está marcado para a súa eliminación" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Tentando instalar a versión da lista negra «%s»" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Non foi posíbel instalar «%s»" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -212,11 +213,11 @@ "orde «ubuntu-bug update-manager» desde o seu terminal." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Non foi posíbel determinar o meta-paquete" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -230,15 +231,15 @@ " Instale un dos paquetes mencionados usando synaptic ou apt-get antes de " "continuar." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Lendo a caché" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Foi imposíbel obter un bloqueo exclusivo" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -246,11 +247,11 @@ "Isto normalmente significa que outro xestor de paquetes (como apt-get ou " "aptitude) xa se está executando. Peche este aplicativo antes de continuar." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "A actualización mediante unha conexión remota non é posíbel" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -264,11 +265,11 @@ "\n" "A anovación vai ser cancelada agora. Por favor, ténteo sen ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Continuar a execución con SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -285,11 +286,11 @@ "Se continúa, iniciarase un daemon ssh adicional no porto «%s».\n" "Desexa continuar?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Iniciando un sshd adicional" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -300,7 +301,7 @@ "sshd adicional no porto «%s». Se algo sae mal co ssh en execución, aínda " "poderá conectarse co adicional.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -313,29 +314,29 @@ "porto con, p.ex.:\n" "«%s»" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Non é posíbel anovar" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Con esta ferramenta non se pode anovar de «%s» a «%s»" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "A configuración da zona de probas fallou" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Non foi posíbel crear o contorno da zona de probas." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Modo zona de probas" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -349,18 +350,18 @@ "\n" "Os cambios no sistema de ficheiros serán permanentes ate que reinicie." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "A súa instalación de Python é defectuosa. Arranxe a ligazón simbólica «/usr/" "bin/python»." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "O paquete «debsig-verify» está instalado" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -370,12 +371,12 @@ "Retíreo con synaptic ou «apt-get remove debsig-verify» primeiro e faga a " "anovación de novo." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Non é posíbel escribir en «%s»" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -386,11 +387,11 @@ "actualización non pode continuar.\n" "Comprobe que se pode escribir no directorio do sistema." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Incluír as actualizacións máis recentes desde a Internet?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -410,16 +411,16 @@ "as actualizacións máis recentes antes de actualizar o sistema.\n" "Se dis que «non» aquí, non se usará a conexión para nada." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "desactivado na anovación a %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Non se atopou ningunha réplica correcta" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -439,11 +440,11 @@ "Se seleccionar «Non», cancelarase a actualización." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Xerar as fontes predeterminadas?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -457,11 +458,11 @@ "Deberíanse engadir as entradas por omisión de «%s»? Se escolle «Non», " "anularase a anovación." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "A información do repositorio non é correcta" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -469,11 +470,11 @@ "A anovación da información do respositoriu produciu un ficheiro erróneo, " "polo que se está a iniciar un proceso de informe de erros." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Orixes de terceiros desactivadas" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -483,13 +484,13 @@ "Pódeas volver a activar coa ferramenta «software-properties» ou co xestor de " "paquetes." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Paquete en estado inconsistente" msgstr[1] "Paquetes en estado inconsistente" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -508,11 +509,11 @@ "pero non se atopa ningún ficheiro para facelo. Reinstale os paquete " "manualmente ou elimíneos do sistema." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Produciuse un erro durante a actualización" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -521,13 +522,13 @@ "tipo de problema na rede. Por favor, comprobe a súa conexión de rede e " "vólvao a intentar." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Non hai espazo abondo no disco" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -542,21 +543,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Calculando os cambios" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Desexa comezar a anovación?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Anulouse a anovación" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -564,12 +565,12 @@ "Agora vaise cancelar a anovación e o sistema volverá ao seu estado orixinal. " "Pode retomar a actualización máis adiante." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Non se puideron descargar as anovacións" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -579,27 +580,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Produciuse un erro durante a remisión" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Restaurando o estado orixinal do sistema" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Non se puideron instalar as anovacións" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -607,7 +608,7 @@ "Abortouse a anovación. O seu sistema pode estar nun estado non usábel. Vaise " "executar agora a recuperación (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -624,7 +625,7 @@ "var/log/dist-upgrade/ ao informe de erros.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -632,20 +633,20 @@ "Cancelouse a actualización. Comprobe a súa conexión a Internet ou o " "dispositivo de instalación e volva a tentalo. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Retirar os paquetes obsoletos?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Conservar" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Retirar" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -655,27 +656,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Non está instalado depends, que é necesario" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "A dependencia requirida «%s» non está instalada. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Comprobando o xestor de paquetes" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Fallou a preparación da anovación" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -683,11 +684,11 @@ "Produciuse un fallo ao preparar o sistema para a anovación polo que estase " "iniciando un proceso de informe de erro." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Fallou a preparación da anovación" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -699,68 +700,68 @@ "\n" "Ademais, estase iniciando un proceso de informe de erro." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Actualizando a información do repositorio" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Produciuse un fallo ao engadir o CDROM" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Sentímolo, non foi posíbel engadir o CDROM" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Información de paquete incorrecta" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Obtendo" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Anovando" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Completouse a anovación" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "A actualización completouse mais producíronse erros durante o proceso." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Buscando paquetes obsoletos" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Completouse a anovación do sistema." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Completouse a anovación parcial do sistema." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms en uso" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -769,13 +770,13 @@ "O sistema emprega o xestor de volumes «evms» en /proc/mounts. O software " "«evms» non ten asistencia; apágueo e execute de novo a anovación ao rematar." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "O seu hardware de gráficos non é completamente compatíbel con Ubuntu 12.04 " "LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -787,9 +788,9 @@ "información vexa https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx " "¿Desexa continuar coa anovación?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -797,8 +798,8 @@ "A anovación pode reducir os efectos do escritorio, o rendemento nos xogos e " "noutros programas que fagan un emprego intensivo dos gráficos." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -811,7 +812,7 @@ "\n" "Está seguro de que desexa continuar?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -824,11 +825,11 @@ "\n" "Está seguro de que desexa continuar?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Non é unha CPU i686" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -840,11 +841,11 @@ "arquitectura mínima. Non é posíbel actualizar o seu sistema á nova versión " "de Ubuntu con este hardware." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Non é unha CPU ARMv6" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -856,11 +857,11 @@ "require ARMv6 como arquitectura mínima. Non é posíbel anovar o seu sistema a " "unha versión de Ubuntu con esta arquitectura." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "O «daemon» init non está dispoñíbel" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -876,15 +877,15 @@ "\n" "Está seguro de que desexa continuar?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Anovación da área de probas usando aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Usar a ruta dada para buscar un CD-ROM con paquetes de actualización" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -892,57 +893,57 @@ "Usar a interface gráfica. Dispoñíbeis neste momento: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*OBSOLETO* esta opción será ignorada" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "Realizar só unha anovación parcial (sen reescribir o sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Desactivar a compatibilidade de pantalla GNU" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Estabelecer datadir" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Por favor, introduza «%s» na unidade «%s»" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Rematou a obtención" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Obtendo o ficheiro %li de %li a %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Restan aproximadamente %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Obtendo o ficheiro %li de %li" @@ -952,27 +953,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Aplicando os cambios" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "problemas de dependencias - déixase sen configurar" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Non foi posíbel instalar «%s»" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -984,7 +985,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -995,7 +996,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1003,20 +1004,20 @@ "Perderá as modificacións feitas neste ficheiro de configuración se escolle " "substituílo por unha versión máis nova." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Non se atopou a orde «diff»" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Produciuse un erro fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1029,13 +1030,13 @@ "O seu ficheiro sources.list orixinal foi gardado en /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl+C premido" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1044,134 +1045,134 @@ "que quere facelo?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "Para previr a perda de datos peche todos os aplicativos e documentos." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Sen máis asistencia por parte de Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Desactualizar (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Retirar (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Non se necesita máis (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Instalar (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Anovar (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Cambio de medio" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Mostrar a diferenza >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Agochar a diferenza" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Erro" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Cancelar" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Pechar" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Mostrar o terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Agochar o terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Información" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Detalles" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Sen máis asistencia (%s)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Retirar %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Retirar (instalado automaticamente) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Instalar %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Anovar %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Cómpre reiniciar" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Reinicie o sistema para completar a anovación" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Reiniciar agora" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1183,32 +1184,32 @@ "O sistema podería quedar inutilizado se anula a anovación. Recomendámoslle " "encarecidamente que continúe a anovación." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Anular a anovación?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li día" msgstr[1] "%li días" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li hora" msgstr[1] "%li horas" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minuto" msgstr[1] "%li minutos" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1224,7 +1225,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1238,14 +1239,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1255,34 +1256,32 @@ "nunha conexión de módem a 56k." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Esta descarga levará aproximadamente %s coa súa conexión. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Preparando a anovación" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Obtendo as canles de software novas" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Obtendo os paquetes novos" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Instalando as anovacións" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Limpando" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1299,28 +1298,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "Retirarase %d paquete." msgstr[1] "Retiraranse %d paquetes." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "Instalarase %d paquete novo." msgstr[1] "Instalaranse %d paquetes novos." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "Anovarase %d paquete." msgstr[1] "Anovaranse %d paquetes." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1331,7 +1330,7 @@ "\n" "Ten que descargar un total de %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1339,7 +1338,7 @@ "A instalación da anovación pode levar varias horas. En canto remate a " "descarga, o proceso non se pode cancelar." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1347,52 +1346,52 @@ "Obter e instalar a anovación pode levar varias horas. En canto remate a " "descarga, o proceso non se pode cancelar." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "A eliminación dos paquetes pode levar varias horas. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "O software deste computador está actualizado." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" "Non hai anovacións dispoñíbeis para o seu sistema. Anularase a anovación." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Cómpre reiniciar" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "A anovación finalizou e cómpre reiniciar. Quere facelo agora?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "autenticar «%(file)s» contra «%(signature)s» " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "a extraer «%s»" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Non foi posíbel executar a ferramenta de anovación" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1400,33 +1399,33 @@ "Isto pode ser un erro na ferramenta de actualización Informe de este erro " "usando a orde «ubuntu-bug update-manager» desde o seu terminal." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Sinatura da ferramenta de anovación" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Ferramenta de anovación" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Erro ao obter" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Fallou a obtención da anovación. Pode haber un problema coa rede. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Fallou a autenticación" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1434,13 +1433,13 @@ "Fallou a autenticación da anovación. Pode haber un problema coa rede ou co " "servidor. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Erro ao extraer" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1448,13 +1447,13 @@ "Fallou a extracción da anovación. Pode haber un problema coa rede ou co " "servidor. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Fallou a verificación" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1462,15 +1461,15 @@ "Fallou a verificación da anovación. Pode haber un problema coa rede ou co " "servidor. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Non foi posíbel executar a anovación" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1479,13 +1478,13 @@ "«noexec». Remónte a partición sen o parámetro noexec antes de realizar a " "anovación." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "A mensaxe do erro é «%s»." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1497,73 +1496,73 @@ "O seu ficheiro sources.list orixinal gardouse en /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Interrompendo" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Degradado:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Para continuar prema [INTRO]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Continuar [sN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Detalles [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "s" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Sen máis asistencia: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Retirar: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Instalar: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Anovar: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Continuar [Sn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1630,9 +1629,8 @@ msgstr "Anovación da distribución" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Anovando Ubuntu á versión 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "A actualizar Ubuntu á versión 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1650,84 +1648,85 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Agarde, por favor; isto pode tardar un pouco." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Completouse a actualización" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Non foi posíbel atopar as notas da versión" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Poida que o servidor estea sobrecargado. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Non foi posíbel descargar as notas da versión" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Por favor, comprobe a conexión á Internet." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Anovar" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Notas da versión" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Descargando os ficheiros de paquetes adicionais..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Ficheiro %s de %s a %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Ficheiro %s de %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Abrir a ligazón no navegador" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Copiar a ligazón no portapapeis" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Descargando o ficheiro %(current)li de %(total)li a %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Descargando o ficheiro %(current)li de %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "A súa versión de Ubuntu xa non está asistida." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1735,53 +1734,59 @@ "Non recibirá máis arranxos de problemas de seguranza ou actualizacións " "críticas. Actualice a unha versión posterior de Ubuntu." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Información sobre a anovación" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Instalar" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Nome" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Versión %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Non se detectou ningunha conexión de rede, non pode descargar a información " "do rexistro de cambios." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Descargando a lista de cambios..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Deseleccionar todo" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Seleccionar _todo" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "Seleccionouse %(count)s actualización." +msgstr[1] "Seleccionáronse %(count)s actualizacións." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "Vanse descargar %s." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "Xa se descargou a actualización, mais non se instalou." msgstr[1] "Xa se descargaron as actualizacións, mais non se instalaron." @@ -1789,11 +1794,18 @@ msgid "There are no updates to install." msgstr "Non hai actualizacións que instalar." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Tamaño da descarga descoñecida." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1801,7 +1813,7 @@ "Non se sabe cando se actualizou a última vez esta información. Prema no " "botón «Comprobar» para actualizar a información." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1812,7 +1824,7 @@ "Prema o botón «Comprobar» de embaixo para consultar se hai novas " "actualizacións de software." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1820,7 +1832,7 @@ "A información sobre os paquetes foi actualizada hai %(days_ago)s día." msgstr[1] "A información dos paquetes foi actualizada hai %(days_ago)s días." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1833,34 +1845,46 @@ "horas." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "A información dos paquetes foi actualizada hai %s minutos." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "A información sobre os paquetes foi actualizada hai un intre." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"As actualizacións de software corrixen erros, eliminan fallos de seguranza e " +"fornecen funcionalidades novas." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "É posíbel que haxa actualizacións dispoñíbeis para o seu computador." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Benvida/o a Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Estas actualizacións de software foron publicadas despois de que o fose esta " +"versión de Ubuntu." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Existen actualizacións de software dispoñíbeis para este computador." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1872,7 +1896,7 @@ "paquetes temporais de instalacións anteriores utilizando «sudo apt-get " "clean»." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1880,25 +1904,25 @@ "O computador precisa reiniciarse para rematar a instalación das " "actualizacións. Garde o seu traballo antes de continuar." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Lendo a información do paquete" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Conectando…" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Vostede non pode comprobar as actualizacións ou descargar novas " "actualizacións." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Non foi posíbel inicializar a información do paquete" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1911,7 +1935,7 @@ "Por favor, informe deste erro do paquete «update-manager» e inclúa a " "seguinte mensaxe de erro:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1923,31 +1947,31 @@ "Por favor, informe deste erro do paquete «update-manager» e inclúa a " "seguinte mensaxe de erro:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Instalación nova)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Tamaño: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Desde a versión %(old_version)s á %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Versión %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Non é posíbel actualizar a versión neste momento" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1956,21 +1980,21 @@ "Non é posíbel realizar a actualización de versión neste momento, probe de " "novo máis tarde. O servidor informou: «%s»" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Descargando a ferramenta de anovación" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Existe unha nova versión de Ubuntu «%s» dispoñíbel" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "O índice de software está roto" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1980,6 +2004,17 @@ "xestor de paquetes «Synaptic» ou execute «sudo apt-get install -f» nun " "terminal para corrixir este problema primeiro." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Unha versión nova «%s» dispoñíbel" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Cancelar" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Comprobar actualizacións" @@ -1989,22 +2024,18 @@ msgstr "Instalar tódalas actualizacións dispoñíbeis" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Cancelar" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Rexistro de cambios" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Actualizacións" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Construíndo a lista de actualizacións" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2028,22 +2059,22 @@ " * Paquetes de software non oficiais non fornecidos por Ubuntu\n" " * Alteracións normais dunha versión de prelanzamento de Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Descargando o informe de cambios" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Outras actualizacións (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" "Esta actualización non pertence a unha orixe que admite ficheiros de " "cambios (changelog)." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2051,7 +2082,7 @@ "Non foi posíbel descargar a lista de cambios.\n" "Comprobe a súa conexión á Internet." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2064,7 +2095,7 @@ "Versión dispoñíbel: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2078,7 +2109,7 @@ "Utilice http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "ata que os cambios estean dispoñíbeis ou probe máis tarde." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2091,52 +2122,43 @@ "Por favor, utilice http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "ata que os cambios estean dispoñíbeis ou probe máis tarde." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Non foi posíbel detectar a distribución" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Produciuse un erro «%s» ao comprobar o que está a usar o seu sistema." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Actualizacións de seguranza importantes" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Actualizacións recomendadas" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Actualizacións aconselladas" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Adaptacións regresivas (backports)" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Actualizacións da distribución" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Outras actualizacións" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Iniciando o Xestor de actualizacións" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"As actualizacións de software corrixen erros, eliminan fallos de seguranza e " -"fornecen funcionalidades novas." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "Anovación _Parcial" @@ -2208,37 +2230,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Actualizacións de software" +msgid "Update Manager" +msgstr "Xestor de actualizacións" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Actualizacións de software" +msgid "Starting Update Manager" +msgstr "Iniciando o Xestor de actualizacións" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "A_novar" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "actualizacións" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Instalar" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Cambios" +msgid "updates" +msgstr "actualizacións" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Descrición" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Descrición da actualización" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2246,23 +2258,33 @@ "Agora está conectado en itinerancia e poden producirse cargos polos datos " "consumidos nesta actualización." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Está conectado a través dun módem sen fíos." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "Por seguridade, conecte o equipo á toma eléctrica antes de actualizar." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Instalar as actualizacións" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Cambios" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Opcións..." +msgid "Description" +msgstr "Descrición" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Instalar" +msgid "Description of update" +msgstr "Descrición da actualización" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Opcións..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2285,9 +2307,8 @@ msgstr "Vostede rexeitou a anovación ao novo Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Pode anovar máis tarde abrindo o Xestor de actualizacións e premendo " @@ -2301,59 +2322,59 @@ msgid "Show and install available updates" msgstr "Mostrar e instalar as actualizacións dispoñíbeis" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Mostrar a versión e saír" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Directorio que contén os ficheiros de datos" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Comprobar se hai unha nova versión de Ubuntu dispoñíbel" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "Comprobar se resulta posíbel anovar á versión en desenvolvemento máis recente" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Anovación usando a última versión aconsellada polo anovador de versións." -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Non enfocar o mapa ao comezar" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Tente executar dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Non comprobar no inicio se hai actualizacións" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "O test de anovación con área de probas aufs devolve superposición" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Executando unha anovación parcial" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Mostrar a descrición do paquete no canto do rexistro de cambios" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Tente anovarse á última versión usando o anovador desde $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2363,11 +2384,11 @@ "Actualmente existen «desktop» para actualizacións normais dun sistema de " "escritorio e «server» para sistemas servidores." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Execute a interface gráfica indicada" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2375,11 +2396,11 @@ "Comprobar só se está dispoñíbel unha nova versión da distribución e informar " "do resultado mediante o código de saída." -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Buscando novas publicacións de Ubuntu" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2387,69 +2408,69 @@ "Para obter máis información sobre esta anovación, visite:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Non se atopou unha versión nova" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Unha versión nova «%s» dispoñíbel" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Execute «do-release-upgrade» para anovarse." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Está dispoñíbel unha anovación á %(version)s de Ubuntu" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Vostede rexeitou a anovación a Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Engadir a saída de depuración" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Mostrar os paquetes non compatíbeis con este equipo" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Mostrar os paquetes non compatíbeis con esta máquina" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Mostrar todos os paquetes co seu estado" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Mostrar todos os paquetes nunha lista" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Resumo do estado de compatibilidade de «%s»:" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" "Ten %(num)s paquetes (%(percent).1f%%) con asistencia técnica até %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "Ten %(num)s paquetes (%(percent).1f%%) que non poden descargarse máis" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "Ten %(num)s paquetes (%(percent).1f%%) que non teñen asistencia" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2457,54 +2478,71 @@ "Execute con --show-unsupported, --show-supported ou --show-all para ver máis " "información" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Xa non se poden descargar:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Sen asistencia: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Con asistencia até %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Sen asistencia" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Método non implementado: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Un ficheiro nun disco" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "paquete .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Instalar o paquete que falta." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Habería que instalar o paquete %s." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "paquete .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "Hai que marcar %s como instalado manualmente." +msgid "%i obsolete entries in the status file" +msgstr "%i entradas obsoletas no ficheiro de status" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "Entradas obsoletas no status de dpkg" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "Entradas obsoletas no status de dpkg" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2513,70 +2551,82 @@ "kdelibs5-dev. Vexa o erro núm. 279621 de bugs.launchpad.net para máis " "detalles." -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "%i entradas obsoletas no ficheiro de status" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "Entradas obsoletas no status de dpkg" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "Entradas obsoletas no status de dpkg" +msgid "%s needs to be marked as manually installed." +msgstr "Hai que marcar %s como instalado manualmente." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Eliminar lilo, pois grub tamén está instalado. (Ver o erro #314004 para " "máis detalles)." -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Despois de actualizar a información de paquetes, non é posíbel atopar o " -#~ "paquete esencial «%s» polo que estase iniciando un proceso de informe de " -#~ "erro." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "A actualizar Ubuntu á versión 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "Seleccionouse %(count)s actualización." -#~ msgstr[1] "Seleccionáronse %(count)s actualizacións." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Benvida/o a Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." -#~ msgstr "" -#~ "Estas actualizacións de software foron publicadas despois de que o fose " -#~ "esta versión de Ubuntu." - -#~ msgid "Software updates are available for this computer." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Existen actualizacións de software dispoñíbeis para este computador." - -#~ msgid "Update Manager" -#~ msgstr "Xestor de actualizacións" - -#~ msgid "Starting Update Manager" -#~ msgstr "Iniciando o Xestor de actualizacións" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Está conectado a través dun módem sen fíos." - -#~ msgid "_Install Updates" -#~ msgstr "_Instalar as actualizacións" +#~ "Despois de actualizar a información de paquetes, non é posíbel atopar o " +#~ "paquete esencial «%s» polo que estase iniciando un proceso de informe de " +#~ "erro." #~ msgid "Your system is up-to-date" #~ msgstr "O sistema está actualizado" @@ -2657,6 +2707,9 @@ #~ "limitada e pode encontrar erros logo da anovación. Ten certeza que quere " #~ "realizar a anovación?" +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Anovando Ubuntu á versión 11.10" + #~ msgid "" #~ "These software updates have been issued since this version of Ubuntu was " #~ "released. If you don't want to install them now, choose \"Update Manager" diff -Nru update-manager-17.10.11/po/gu.po update-manager-0.156.14.15/po/gu.po --- update-manager-17.10.11/po/gu.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/gu.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2009. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2009-06-29 02:46+0000\n" "Last-Translator: BKD \n" "Language-Team: Gujarati \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s નુ સર્વર" @@ -42,30 +43,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "મુખ્ય સર્વર" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "અન્ય સર્વરો" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -75,13 +76,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "ખરાબ હાલતમાં હોય તેવું પેકેજ કાઢી નાખો" msgstr[1] "ખરાબ હાલતમાં હોય તેવા પેકેજ કાઢી નાખો" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -96,15 +97,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "તુટેલા પેકેજ" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -113,7 +114,7 @@ "પહેલા તેમને સિનેપ્ટીક અથવા એપ્ટ-ગેટ વડે ઠીક કરી લો." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -133,65 +134,65 @@ " * ઉબુન્ટુ દ્વારા પ્રદાન ન કરાયેલ હોય તેવા અનધિકૃત સોફ્ટવેર પેકેજ દ્વારા\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -200,25 +201,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -227,11 +228,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -242,11 +243,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -254,7 +255,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -263,29 +264,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -295,28 +296,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -324,11 +325,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -340,16 +341,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -362,11 +363,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -375,34 +376,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -415,23 +416,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -442,32 +443,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -475,33 +476,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -512,26 +513,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -539,37 +540,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -577,79 +578,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -657,16 +658,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -675,7 +676,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -684,11 +685,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -696,11 +697,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -708,11 +709,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -722,71 +723,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "અદ્યતન બનાવી શકાય તેવા પેકેજ ધરાવતી સીડી-રોમ શોધવા આપેલો પથ વાપરો." -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "આંશિક અદ્યતનીકરણ કરો. (સ્તોત્રની યાદી પાછી લખવામાં નહી આવે." -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "માહિતીનુ સ્થાન (datadir) નક્કી કરો" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -796,27 +797,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -826,7 +827,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -835,26 +836,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -862,147 +863,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1010,32 +1011,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1051,7 +1052,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1065,14 +1066,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1080,34 +1081,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1120,28 +1119,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1149,145 +1148,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1295,73 +1294,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1419,7 +1418,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1438,133 +1437,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1572,31 +1579,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1605,34 +1619,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1640,29 +1662,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1671,7 +1693,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1679,58 +1701,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1740,22 +1772,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1769,26 +1797,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1797,7 +1825,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1806,7 +1834,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1815,47 +1843,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1916,54 +1938,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1988,7 +2013,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -2000,216 +2025,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/gv.po update-manager-0.156.14.15/po/gv.po --- update-manager-17.10.11/po/gv.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/gv.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2010. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-12-06 06:42+0000\n" "Last-Translator: Reuben Potts \n" "Language-Team: Manx \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Serveryn son %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Server cadjin" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "serveryn lesh reihghyn" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Cha noddym co`earroodaghey enmys rolley.bunneyn" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Cha noddym feddyn coadanyn bundeilyn er chor erbee, foddee cha nel shoh ny " "disk Ubuntu ny fodee cha nel yn troggal kiart echey?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Cha doddym cur er CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -77,13 +78,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -98,22 +99,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -126,65 +127,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -193,25 +194,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -220,11 +221,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -235,11 +236,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -247,7 +248,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -256,29 +257,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -288,28 +289,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -317,11 +318,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -333,16 +334,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -355,11 +356,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -368,34 +369,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -408,23 +409,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -435,32 +436,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -468,33 +469,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -505,26 +506,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -532,37 +533,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -570,79 +571,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -650,16 +651,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -668,7 +669,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -677,11 +678,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -689,11 +690,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -701,11 +702,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -715,71 +716,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -789,27 +790,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -819,7 +820,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -828,26 +829,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -855,147 +856,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1003,32 +1004,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1044,7 +1045,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1058,14 +1059,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1073,34 +1074,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1113,28 +1112,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1142,145 +1141,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1288,73 +1287,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1412,7 +1411,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1431,166 +1430,180 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1599,34 +1612,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1634,29 +1655,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1665,7 +1686,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1673,58 +1694,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1734,22 +1765,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1763,26 +1790,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1791,7 +1818,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1800,7 +1827,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1809,47 +1836,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1910,54 +1931,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1982,7 +2006,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1994,216 +2018,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/he.po update-manager-0.156.14.15/po/he.po --- update-manager-17.10.11/po/he.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/he.po 2017-12-23 05:00:38.000000000 +0000 @@ -6,11 +6,12 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. # Yuval Tanny, 2005. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-21 08:57+0000\n" "Last-Translator: Yaron \n" "Language-Team: Hebrew \n" @@ -23,7 +24,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -31,13 +32,13 @@ msgstr[1] "%(size).0f ק״ב" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f מ״ב" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "שרת עבור %s" @@ -45,20 +46,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "השרת הראשי" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "שרתים מותאמים" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "לא ניתן לחשב את הרשומה בקובץ sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -66,11 +67,11 @@ "לא ניתן לאתר כלל קובצי חבילות, היתכן שזהו אינו התקליטור של אובונטו או " "שהארכיטקטורה שגויה?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "הוספת התקליטור נכשלה" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -85,13 +86,13 @@ "הודעת השגיאה הייתה:\n" "\"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "הסרת חבילה במצב רע" msgstr[1] "הסרת חבילות במצב רע" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -110,15 +111,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "יתכן שהשרת נתון תחת עומס יתר" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "חבילות פגומות" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -127,7 +128,7 @@ "synaptic או apt-get לפני המשך התהליך." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -148,11 +149,11 @@ " * חבילות תכנה לא רשמיות שאינן מסופקות על ידי אובונטו\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "כנראה שזוהי בעיה זמנית, נא לנסות שוב מאוחר יותר." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -160,16 +161,16 @@ "אם אף אחד מתנאים אלה אינו מתקיים, נא לדווח על כך כתקלה באמצעות הקלדת הפקודה " "'ubuntu-bug update-manager' במסוף." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "לא ניתן לחשב את השדרוג" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "שגיאה באימות חלק מהחבילות" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -178,28 +179,28 @@ "לא ניתן היה לאמת מספר חבילות. יתכן כי מדובר בבעיית רשת זמנית. ניתן לנסות שוב " "במועד מאוחר יותר. רשימת החבילות שלא אומתו מופיעה להלן." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "החבילה '%s' מסומנת להסרה אך חבילה זו נמצאת ברשימה הצנזורה להסרות." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "החבילה החיונית '%s' מסומנת להסרה." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "מתבצע ניסיון להתקנת גרסה מצונזרת '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "לא ניתן להתקין את '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -208,11 +209,11 @@ "הפקודה 'ubuntu-bug update-manager' במסוף." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "לא ניתן לזהות מהי חבילת העל" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -224,15 +225,15 @@ "מותקנת במערכת שלך, לכן לא ניתן לזהות באיזו גרסה של אובונטו נעשה שימוש.\n" "נא להתקין אחת מהחבילות הנ״ל בעזרת Synaptic או apt-get לפני המשך התהליך." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "המטמון נקרא" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "לא ניתן להשיג נעילה בלעדית" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -240,11 +241,11 @@ "בדרך כלל משמעות הדבר היא שמנהל חבילות אחר (למשל apt-get או aptitude) כבר " "פועל. נא לסגור היישום הנ״ל תחילה." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "לא קיימת תמיכה לשדרוג מחיבור מרוחק" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -257,11 +258,11 @@ "\n" "השדרוג יבוטל כעת. נא לנסות ללא SSH." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "להמשיך לרוץ תחת SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -277,11 +278,11 @@ "אם תמשיך, יופעל סוכן SSH נוסף בפתחה '%s'.\n" "האם ברצונך להמשיך?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "sshd נוסף מופעל" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -291,7 +292,7 @@ "כדי להקל על השחזור במקרה של כשל, יופעל סוכן ssh נוסף בפתחה '%s'. במידה שמשהו " "משתבש עם התחברות ה־ssh הנוכחית עדיין ניתן להשתמש בהתחברות הנוספת.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -304,29 +305,29 @@ "עם פקודה כגון:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "לא ניתן לשדרג" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "לא ניתן לשדרג מ־'%s' ל־'%s' על ידי כלי זה." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "הגדרת Sandbox נכשלה" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "לא ניתן ליצור את סביבת ה־sandbox." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "מצב Sandbox" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -341,16 +342,16 @@ "*שום* שינוי שיתבצע בתיקיית המערכת מעתה ועד להפעלת המחשב מחדש בפעם הבאה יישאר " "קבוע." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "התקנת ה־python שלך פגומה. נא לתקן את הקישור הסימבולי '‎/usr/bin/python'" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "החבילה 'debsig-verify' מותקנת" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -360,12 +361,12 @@ "נא להסיר אותה קודם לכן באמצעות synaptic או 'apt-get remove debsig-verify' " "ולהפעיל את השדרוג מחדש." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "לא ניתן לכתוב אל '%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -375,11 +376,11 @@ "לא ניתן לכתוב אל תיקיית המערכת '%s' שבמערכת שלך. השדרוג יופסק.\n" "נא לוודא שניתן לכתוב אל תיקיית המערכת." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "האם לכלול עדכונים חדשים מהאינטרנט?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -399,16 +400,16 @@ "האפשרית מיד לאחר השדרוג.\n" "אם לא יתקבל אישור, לא יעשה כלל שימוש ברשת." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "בוטל בשדרוג ל־%s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "לא נמצא אתר מראה תקין" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -428,11 +429,11 @@ "אם יבחר 'לא' השדרוג יבוטל." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "לייצר את מקורות בררת המחדל?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -444,21 +445,21 @@ "\n" "האם להוסיף את רשומות בררת המחדל עבור '%s'? אם 'לא' יבחר, השדרוג יבוטל." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "נתוני המאגרים לא תקינים" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "שדרוג נתוני המאגרים גרם לקובץ פגום ולכן החל תהליך של דיווח על תקלה." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "מקורות של ספקי צד שלישי בוטלו" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -467,13 +468,13 @@ "כמה מקורות צד שלישי ברשימת ה־sources.list נוטרלו. ניתן לאפשר אותם שוב לאחר " "השדרוג באמצעות הכלי 'software-properties' או בעזרת מנהל החבילות שלך." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "חבילה במצב לא רציף" msgstr[1] "חבילות במצב לא רציף" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -490,11 +491,11 @@ "החבילות'%s' הנן במצב בלתי רציף ויש להתקינן מחדש, אך לא ניתן למצוא עבורן " "ארכיון. יש להתקין חבילות אלו מחדש ידנית או להסיר אותן מהמערכת." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "שגיאה במהלך העדכון" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -502,13 +503,13 @@ "התעוררה בעיה בתהליך העדכון. בדרך כלל זוהי בעיית רשת, נא לבדוק את חיבור הרשת " "שלך ולנסות שנית." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "אין די שטח בכונן הקשיח" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -522,21 +523,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "השינויים מחושבים" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "האם ברצונך להתחיל את השדרוג?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "השדרוג בוטל" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -544,12 +545,12 @@ "השדרוג יבוטל כעת והמערכת תחזור למצבה המקורי. ניתן להמשיך את השדרוג במועד " "מאוחר יותר." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "לא ניתן להוריד את השדרוג" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -559,27 +560,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "שגיאה במהלך הביצוע" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "המערכת מוחזרת למצבה המקורי" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "לא ניתן להתקין את השדרוגים" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -587,7 +588,7 @@ "השדרוג בוטל. המערכת שלך עלולה להיות בלתי שמישה. כעת תתבצע פעולת שחזור (dpkg " "--configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -604,26 +605,26 @@ "לדיווח על התקלה.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "השדרוג בוטל. נא לבדוק את החיבור לאינטרנט ואת אמצעי ההתקנה ולנסות שוב. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "האם להסיר חבילות מיושנות?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_שמירה" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "ה_סרה" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -631,37 +632,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "החבילות הדרושות להתקנה אינן מותקנות" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "החבילה '%s' הדרושה להתקנה אינה מותקנת " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "מנהל החבילות נבדק" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "תהליך הכנת השדרוג נכשל" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "תהליך הכנת המערכת לשדרוג נכשל ולכן יופעל תהליך דיווח על תקלה." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "קבלת דרישות הקדם לשדרוג נכשלה" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -673,68 +674,68 @@ "\n" "בנוסף על כך, יופעל תהליך הדיווח על תקלות." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "נתוני המאגרים מתעדכנים" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "אירע כשל בהוספת כונן התקליטורים" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "הוספת התקליטור לא הצליחה, עמך הסליחה" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "פרטי החבילה אינם תקינים" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "מתקבל" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "בשדרוג" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "השדרוג הושלם" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "השדרוג הושלם אך צצו שגיאות במהלך השדרוג." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "מתבצע חיפוש אחר תכנה מיושנת" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "שדרוג המערכת הושלם." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "השדרוג החלקי הושלם." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms נמצא בשימוש" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -743,13 +744,13 @@ "המערכת שלך משתמשת במנהל הכרכים 'evms' תחת ‎/proc/mounts. התוכנה 'evms' אינה " "נתמכת עוד, נא לכבות אותה ולהפעיל שוב את השדרוג עם סיום הפעולה." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "חומרת הגרפיקה שלך אינה נתמכת במלואה על ידי אובונטו 12.04 עם תמיכה לטווח ארוך " "(LTS)." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -760,9 +761,9 @@ "בעיות לאחר השדרוג. למידע נוסף יש לעיין בכתובת https://wiki.ubuntu.com/X/Bugs/" "UpdateManagerWarningForI8xx האם ברצונך להמשיך בשדרוג?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -770,8 +771,8 @@ "שדרוג עלול לפגוע באפקטים של שולחן העבודה ובביצועים של משחקים ותכניות עמוסות " "מבחינה גרפית." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -784,7 +785,7 @@ "\n" "האם ברצונך להמשיך?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -797,11 +798,11 @@ "\n" "האם ברצונך להמשיך?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "המעבד אינו מסוג i686" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -812,11 +813,11 @@ "החבילות נבנו עם שיפורים הדורשים לכל הפחות את האכיטקטורה i686. לא ניתן לשדרג " "את המערכת שלך להפצה חדשה יותר של אובונטו עם חומרה זו." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "אין מעבד מסוג ARMv6" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -827,11 +828,11 @@ "החבילות ב־Karmic נבנו עם שיפורים מיוחדים הדורשים את ARMv6 כארכיטקטורה " "מינימלית. לא ניתן לשדרג את המערכת להפצת אובונטו חדשה עם חומרה זו." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "אין init זמין" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -846,15 +847,15 @@ "\n" "האם ברצונך להמשיך?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "שידרוג Sandbox בעזרת aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "יש להשתמש בנתיב הנתון כדי לחפש אחר תקליטור עם חבילות הניתנות לשדרוג" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -862,57 +863,57 @@ "שימוש במנשק גרפי. זמינים נכון לעכשיו: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*נפסקה* אפשרות זו לא תילקח בחשבון" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "ביצוע שדרוג חלקי בלבד (ללא שכתוב הקובץ sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "ביטול התמיכה ב־GNU screen" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "הגדרת תיקיית נתונים" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "נא להכניס את '%s' לכונן '%s'." #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "ההורדה הושלמה" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "מתקבל קובץ %li מתוך %li ב־%s בתים לשנייה." #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "נותרו כ־%s." #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "מתקבל קובץ %li מתוך %li" @@ -922,27 +923,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "השינויים חלים" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "בעיות תלות - נותר בלתי מוגדר" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "לא ניתן להתקין את \"%s\"" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -954,7 +955,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -965,26 +966,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "שינויים שבוצעו בקובץ תצורה זה יאבדו אם יוחלט להחליפו בגרסה חדשה יותר." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "הפקודה 'diff' לא נמצאה" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "אירעה שגיאה חמורה" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -996,13 +997,13 @@ "קובץ ה־sources.list המקורי שלך נשמר תחת השם ‎/etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "נלחץ Ctrl-c" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1011,134 +1012,134 @@ "זאת?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "כדי למנוע אבדן מידע יש לסגור את כל המסמכים והיישומים הפתוחים." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "לא נתמכת עוד על ידי קנוניקל (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "הורדת גרסה (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "הסרה (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "לא נחוצות עוד (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "התקנה (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "שדרוג (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "החלפת מדיה" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "הצגת שינויים >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< הסתרת השינויים" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "שגיאה" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&ביטול" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "ס&גירה" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "הצגת מסוף >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< הסתרת מסוף" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "פרטים" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "פרטים" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "לא נתמך עוד %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "הסרת %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "הסרת (הותקנה אוטומטית) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "התקנת %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "שדרוג %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "נדרשת הפעלה מחדש" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "האם להפעיל מחדש את המערכת כדי להשלים את השדרוג?" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "ה_פעלה מחדש כעת" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1149,32 +1150,32 @@ "\n" "המערכת עלולה להיות בלתי שמישה אם השדרוג יבוטל. מומלץ ביותר להמשיך בשדרוג." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "האם לבטל את השדרוג?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "יום אחד" msgstr[1] "%li ימים" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "שעה אחת" msgstr[1] "%li שעות" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "דקה אחת" msgstr[1] "%li דקות" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1190,7 +1191,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1204,14 +1205,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1221,34 +1222,32 @@ "56 קסל״ש." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "ההורדה תארוך בערך %s עם מהירות החיבור שלך. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "השדרוג בהכנות" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "מתקבלים ערוצי תכנה חדשים" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "מתקבלות חבילות חדשות" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "השדרוגים מותקנים" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "מתבצע סדר וניקיון" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1265,28 +1264,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "חבילה אחת תוסר." msgstr[1] "%d חבילות יוסרו." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "תותקן חבילה אחת חדשה." msgstr[1] "%d חבילות חדשות יותקנו." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "חבילה אחת תשודרג." msgstr[1] "%d חבילות תשודרגנה." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1297,14 +1296,14 @@ "\n" "יש להוריד %s בסך הכול. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" "התקנת השדרוג עלולה לארוך מספר שעות. לאחר השלמת ההורדה לא ניתן לבטל את התהליך." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1312,51 +1311,51 @@ "הקבלה וההתקנה של השדרוג יכולים לארוך מספר שעות. לאחר שההורדה מסתיימת, לא " "ניתן לבטל את התהליך." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "הסרת החבילות עלולה להימשך מספר שעות. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "התכניות במחשב זה עדכניות." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "אין שדרוגים זמינים למערכת שלך. השדרוג יתבטל כעת." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "נדרשת הפעלה מחדש" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "השדרוג הסתיים ונדרשת הפעלה מחדש. האם ברצונך לעשות זאת כעת?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "אימות '%(file)s' כנגד '%(signature)s' " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "'%s' מחולץ" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "לא ניתן להפעיל את כלי השדרוג" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1364,71 +1363,71 @@ "כפי הנראה זוהי תקלה בכלי השדרוג. נא לדווח על כך כתקלה באמצעות הרצת הפקודה " "'ubuntu-bug update-manager' במסוף." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "חותמת כלי השדרוג" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "כלי השדרוג" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "ההורדה נכשלה" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "הורדת השדרוג נכשלה. יתכן שישנה תקלה ברשת. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "האימות נכשל" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "אימות השדרוג נכשל. יתכן שישנה בעיה ברשת או בשרת. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "החילוץ נכשל" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "חילוץ השדרוג נכשל. עלולה להיות בעיה עם הרשת או השרת. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "האימות נכשל" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "אימות השדרוג נכשל. יתכן שישנה תקלה ברשת או בשרת. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "לא ניתן לבצע את השדרוג" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1436,13 +1435,13 @@ "תקלה זו נגרמת לרוב כאשר במערכת התיקייה ‎/tmp מוגדרת כ־noexec. נא לעגון שוב " "ללא noexec ולהריץ את השדרוג פעם נוספת." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "הודעת השגיאה היא '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1454,73 +1453,73 @@ "aborted.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Aborting" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Demoted:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "To continue please press [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Continue [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Details [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "No longer supported: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Remove: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Install: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Upgrade: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Continue [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1586,9 +1585,8 @@ msgstr "שדרוג ההפצה" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "שדרוג אובונטו לגרסה 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "גרסת אובונטו משודרגת ל־12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1606,84 +1604,85 @@ msgid "Terminal" msgstr "מסוף" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "נא להמתין, פעולה זו עלולה לארוך זמן מה." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "העדכון הושלם" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "הערות השחרור הנוכחי לא נמצאו" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "יתכן שהשרת עמוס מדי. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "לא ניתן להוריד את הערות השחרור" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "נא לבדוק את החיבור לאינטרנט." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "שדרוג" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "הערות השחרור" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "מתקבלים קובצי חבילות נוספים..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "קובץ %s מתוך %s ב־%s ב/ש׳" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "קובץ %s מתוך %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "פתיחת הקישור בדפדפן" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "העתקת הקישור ללוח הגזירים" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "מתקבל קובץ %(current)li מתוך %(total)li במהירות %(speed)s/ש׳" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "מתקבל קובץ %(current)li מתוך %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "גרסת האובונטו שלך אינה נתמכת עוד." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1691,51 +1690,57 @@ "לא יתקבלו עוד תיקוני אבטחה או עדכונים חשובים. נא לשדרג לגרסה עדכנית יותר של " "אובונטו." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "נתוני השדרוג" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "התקנה" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "שם" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "גרסה %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "לא זוהה חיבור לרשת, לא ניתן להוריד נתונים על השינויים שחלו בחבילות." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "רשימת השינויים מתקבלת כעת..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_ביטול כל הבחירות" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "ב_חירת הכול" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "נבחר עדכון אחד." +msgstr[1] "נבחרו %(count)s עדכונים." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s יתקבלו." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "העדכון כבר התקבל אך לא הותקן עדיין." msgstr[1] "העדכונים כבר התקבלו אך לא הותקנו עדיין." @@ -1743,11 +1748,18 @@ msgid "There are no updates to install." msgstr "אין עדכונים להתקנה." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "גודל ההורדה אינו ידוע." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1755,7 +1767,7 @@ "המועד האחרון בו עודכנו נתוני החבילות אינו ידוע. נא ללחוץ על הלחצן 'בדיקה' " "כדי לעדכן את הנתונים." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1764,14 +1776,14 @@ "פרטי החבילה עודכנו לאחרונה לפני %(days_ago)s ימים.\n" "נא ללחוץ על הלחצן 'בדיקה' שלהלן כדי לבדוק האם ישנם עדכוני תכנה חדשים." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "פרטי הגרסה עודכנו לאחרונה אתמול." msgstr[1] "פרטי הגרסה עודכנו לאחרונה לפני %(days_ago)s ימים." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1780,34 +1792,43 @@ msgstr[1] "פרטי החבילות עודכנו לאחרונה לפני %(hours_ago)s שעות." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "נתוני החבילה עודכנו לאחרונה לפני %s דקות." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "נתוני החבילות עודכנו לפני זמן קצר." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"עדכוני תכנה מתקנים שגיאות, מסייעים בפתרון חולשות אבטחה ומספקים תכונות חדשות." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "יתכן שאין עדכוני תכנה זמינים עבור המחשב שלך." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "ברוך בואך לאובונטו" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" -msgstr "" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "עדכוני תוכנות אלו הונפקו מאז הפצתה של גרסה זו של אובונטו." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "קיימים עדכונים תכנה עבור מחשב זה." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1818,7 +1839,7 @@ "'%s'. ניתן לרוקן את האשפה שלך ולהסיר חבילות זמניות של התקנות שבוצעו בעבר " "באמצעות הפקודה 'sudo apt-get clean'." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1826,23 +1847,23 @@ "יש להפעיל את המחשב מחדש כדי לסיים את התקנת העדכונים. נא לשמור את עבודותיך " "בטרם המשך הפעולה." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "פרטי החבילות נקראים" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "בהתחברות..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "לא ניתן לבדוק אחר עדכונים או להוריד עדכונים חדשים." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "אירע כשל בהכנות הראשוניות של פרטי החבילה" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1855,7 +1876,7 @@ "נא לדווח על באג זה כנגד החבילה 'update-manager' ולכלול את הודעת השגיאה " "הבאה:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1866,31 +1887,31 @@ "\n" "נא לדווח על באג זה כנגד החבילה 'update-manager' ולכלול את הודעת השגיאה הבאה:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (התקנה חדשה)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(גודל: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "מגרסה %(old_version)s לגרסה %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "גרסה %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "שדרוג ההפצה אינו זמין כעת" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1899,21 +1920,21 @@ "לא ניתן לבצע בשלב זה את שדרוג ההפצה, נא לנסות שוב במועד מאוחר יותר. השרת " "דיווח: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "מתבצעת הורדת כלי שדרוג ההפצה" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "ישנה גרסה חדשה '%s' של אובונטו" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "אינדקס התוכנות פגום" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1922,6 +1943,17 @@ "אי אפשר להתקין או להסיר אף תכנה. יש להשתמש במנהל החבילות \"Synaptic\" או " "להפעיל את הפקודה \"sudo apt-get install -f\" במסוף כדי לתקן בעיה זו." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "הפצה חדשה '%s' זמינה." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "ביטול" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "בדיקה אחר עדכונים" @@ -1931,22 +1963,18 @@ msgstr "התקנת כל העדכונים הזמינים" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "ביטול" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "יומן שינויים" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "עדכונים" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "רשימת העדכונים נבנית" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1970,20 +1998,20 @@ " * חבילות תכנה לא רשמיות שלא מסופקות על ידי אובונטו\n" " * שינויים סדירים בגרסת טרום הפצה של אובונטו" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "יומן השינויים מתקבל" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "עדכונים אחרים (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "עדכון זה אינו מגיע ממקור התומך ביומני שינויים." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -1991,7 +2019,7 @@ "הורדת רשימת השינויים נכשלה.\n" "נא לבדוק את חיבור האינטרנט שלך." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2004,7 +2032,7 @@ "גרסה זמינה: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2017,7 +2045,7 @@ "נא להשתמש ב־http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "עד שיומן השינויים יהיה זמין או לנסות שוב במועד מאוחר יותר." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2030,51 +2058,43 @@ "ניתן להשתמש ב־http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "עד שיומן השינויים יהיה זמין או לנסות שוב במועד מאוחר יותר." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "אירע כשל בזיהוי ההפצה" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "אירעה השגיאה '%s' במהלך בדיקת המערכת שבשימושך." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "עדכוני אבטחה חשובים" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "עדכונים מומלצים" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "עדכונים מוצעים" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "חבילות תמיכה" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "עדכוני הפצה" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "עדכונים אחרים" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "מנהל העדכונים נפתח" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"עדכוני תכנה מתקנים שגיאות, מסייעים בפתרון חולשות אבטחה ומספקים תכונות חדשות." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "שדרוג _חלקי" @@ -2144,60 +2164,60 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "עדכוני תכנה" +msgid "Update Manager" +msgstr "מנהל העדכונים" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "עדכוני תכנה" +msgid "Starting Update Manager" +msgstr "מנהל העדכונים מופעל" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_שדרוג" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "עדכונים" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "התקנה" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "שינויים" +msgid "updates" +msgstr "עדכונים" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "תיאור" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "תיאור העדכון" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "" "יש לך חיבור לרשת באמצעות נדידה ויתכן שתחוייב על הנתונים שנצרכו במהלך העדכון." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "ישנו חיבור באמצעות מודם אלחוטי." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "עדיף לחבר את המחשב למקור חשמל בטרם התחלת העדכון." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "ה_תקנת עדכונים" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "שינויים" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "ה_גדרות..." +msgid "Description" +msgstr "תיאור" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "התקנה" +msgid "Description of update" +msgstr "תיאור העדכון" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "ה_גדרות..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2220,9 +2240,8 @@ msgstr "דחית את השדרוג לגרסה החדשה של אובונטו" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "ניתן לשדרג במועד מאוחר יותר על ידי פתיחת מנהל העדכונים ולחיצה על \"שדרוג\"." @@ -2235,56 +2254,56 @@ msgid "Show and install available updates" msgstr "הצגה והתקנה של העדכונים הזמינים" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "הצגת הגרסה ויציאה" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "תיקייה המכילה את קובצי הנתונים" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "יש לבדוק האם יש גרסה חדשה יותר של אובונטו" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "יש לבדוק האם שדרוג לגרסת הפיתוח העדכנית ביותר אפשרי" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "שדרוג באמצעות הגרסה העדכנית ביותר של משדרג ההפצה המוצעת" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "אין להתמקד במפה בעת ההפעלה" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "לנסות ולהריץ את dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "אין לבדוק אם ישנם עדכונים בעת ההפעלה." -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "בדיקת השדרוג עם שכבת sandbox aufs" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "השדרוג החלקי פועל" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "הצג תיאור החבילה במקום יומן השינויים" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "מתבצע ניסיון לשדרג להפצה האחרונה בעזרת המעדכן מ־$distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2294,21 +2313,21 @@ "נכון לעכשיו נתמכים המצבים 'desktop' עבור שדרוגים רציפים למערכות שולחניות " "ו־'server' עבור מערכות לשרתים." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "הרצת מנשק המשתמש הנבחר" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "יש לבדוק רק אם זמינה הפצה חדשה ולדווח על התוצאה באמצעות קוד יציאה." -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "מתבצעת בדיקה להימצאות גרסה חדשה של אובונטו" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2316,68 +2335,68 @@ "לפרטים על השדרוג, נא לבקר בכתובת:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "לא נמצאה גרסה חדשה" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "הפצה חדשה '%s' זמינה." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "יש להריץ את הפקודה 'do-release-upgrade' כדי לשדרג אליה." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "שדרוג לאובונטו %(version)s זמין כעת" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "דחית את השדרוג לגרסה %s של אובונטו" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "הוספת פלט לניפוי שגיאות" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "הצגת חבילות שאינן נתמכות במחשב זה" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "הצגת חבילות הנתמכות במחשב זה" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "הצגת כל החבילות עם המצב שלהן" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "הצגת כל החבילות ברשימה" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "תקציר מצב התמיכה של '%s':" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "%(num)s מהחבילות שברשותך (%(percent).1f%%) יקבלו תמיכה עד %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "%(num)s מהחבילות שברשותך (%(percent).1f%%) שלא ניתן עוד להוריד" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "%(num)s מהחבילות שברשותך (%(percent).1f%%) אינן נתמכות" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2385,120 +2404,152 @@ "יש להריץ עם הארגומנטים: ‎--show-unsupported, --show-supported או ‎--show-all " "כדי לצפות בפרטים נוספים" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "בלתי ניתן עוד להוריד:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "ללא תמיכה: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "נתמך עד %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "ללא תמיכה" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "שיטה לא מוטמעת: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "קובץ בכונן" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "חבילת ‎.deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "התקנת חבילה חסרה." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "החבילה %s אמורה להיות מותקנת." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "חבילת ‎.deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "יש לסמן את %s כמותקנת ידנית." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"בעת השדרוג, אם החבילה kdelibs4-dev מותקנת אז יש להתקין את החבילה kdelibs5-" -"dev. ניתן לעיין בתופעה ב־bugs.launchpad.net, דיווח מס׳ 279621 לפרטים נוספים." - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i רשומות שאינן בתוקף בקובץ המצב" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "רשומות שאינן בתוקף במצב ה־dpkg" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "רשומות מצב dpkg שאינן בתוקף" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"בעת השדרוג, אם החבילה kdelibs4-dev מותקנת אז יש להתקין את החבילה kdelibs5-" +"dev. ניתן לעיין בתופעה ב־bugs.launchpad.net, דיווח מס׳ 279621 לפרטים נוספים." + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "יש לסמן את %s כמותקנת ידנית." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "הסרת lilo מאחר שגם grub מותקן. (ניתן לעיין בבאג מס׳ 314004 לפרטים נוספים.)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "לאחר עדכון נתוני החבילות שלך, לא ניתן עוד למצוא את החבילה החיונית '%s' " -#~ "ולכן הופעל תהליך דיווח על תקלה." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "גרסת אובונטו משודרגת ל־12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "נבחר עדכון אחד." -#~ msgstr[1] "נבחרו %(count)s עדכונים." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "ברוך בואך לאובונטו" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." -#~ msgstr "עדכוני תוכנות אלו הונפקו מאז הפצתה של גרסה זו של אובונטו." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "קיימים עדכונים תכנה עבור מחשב זה." - -#~ msgid "Update Manager" -#~ msgstr "מנהל העדכונים" - -#~ msgid "Starting Update Manager" -#~ msgstr "מנהל העדכונים מופעל" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "ישנו חיבור באמצעות מודם אלחוטי." - -#~ msgid "_Install Updates" -#~ msgstr "ה_תקנת עדכונים" +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." +#~ msgstr "" +#~ "לאחר עדכון נתוני החבילות שלך, לא ניתן עוד למצוא את החבילה החיונית '%s' " +#~ "ולכן הופעל תהליך דיווח על תקלה." #~ msgid "Your system is up-to-date" #~ msgstr "המערכת שלך מעודכנת" @@ -2615,6 +2666,9 @@ #~ "נא לדווח על כך כתקלה באמצעות הרצת הפקודה 'ubuntu-bug update-manager' " #~ "במסוף ולכלול את הקבצים שבתיקייה /var/log/dist-upgrade/ בדיווח התקלה." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "שדרוג אובונטו לגרסה 11.10" + #~ msgid "" #~ "The support in Ubuntu 11.04 for your intel graphics hardware is limited " #~ "and you may encounter problems after the upgrade. Do you want to continue " diff -Nru update-manager-17.10.11/po/hi.po update-manager-0.156.14.15/po/hi.po --- update-manager-17.10.11/po/hi.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/hi.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-02-23 19:58+0000\n" "Last-Translator: Manish Kumar \n" "Language-Team: Hindi \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f मे.बा." #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s का सर्वर" @@ -42,30 +43,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "मुख्य सर्वर" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "विनिर्मित सर्वर" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "sources.list प्रविष्टि क़ी गणना नहीँ हो सकी" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "पैकेज संचिकाएँ नहीं मिलीं, संभवत: यह उबुंतू डिस्क नहीं है या स्थापत्य अनुपयुक्त है." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "सी.डी. योजन असफल रहा." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -79,13 +80,13 @@ "त्रुटि संदेश था:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "अवांछित स्थिति के पैकेज हटाएँ." msgstr[1] "अवांछित पैकेजों को हटाएँ" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -104,15 +105,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "हो सकता है की सर्वर अतिभारित है" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "अवांछित पैकेज" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -121,7 +122,7 @@ "आगे बढ़ने से पहले सिनेपटिक या apt-get के साथ ठीक करे |" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -142,11 +143,11 @@ " * गैरकार्यालयी साफ्टवेयर पैकेज जो उबुन्टू द्वारा प्रदत्त नहीं है\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "बहुत सम्भव है कि यह अस्थायी समस्या है, कृपया बाद में पुनः प्रयास करें |" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -154,16 +155,16 @@ "यदि इस में से कोई भी लागू न हो , तो क्रुप्या इस बग को 'ubuntu-bug update-manager' " "आदेश से रिपोर्ट करें" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "नवीनीकरण की गणना नहीं की जा सकी" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "कुछ पैकेज के सत्यापन में त्रुटि" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -172,29 +173,29 @@ "यह सम्भव है कि कुछ पैकेज के प्रामाणित करना सम्भव नहीं है। यह नेटवर्क का अस्थायी समस्या हो " "सकता है | आप बाद में पुनः प्रयास कर सकते है | प्रमाणित पैकेज सूची के लिए नीचे देखें |" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" "पैकेज '%s' को हटाने के लिए चिह्नित किया गया है लेकिन यह हटाए जाने वाली कालीसूची में है |" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "अत्यावश्यक पैकेज '%s' को हटाने हेतु चिह्नित किया गया है |" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "कालीसुचित वर्जन '%s' संस्थापित करने की कोशिश कर रहा है" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "%s संस्थापित नहीं हो सका" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -203,11 +204,11 @@ "से रिपोर्ट करें |" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "मेटा-पैकेज का अनुमान न करें" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -220,15 +221,15 @@ "कृपया प्रक्रिया के पूर्व उपरोक्त में से किसी एक का पहले संस्थापन सिनेपटिक या apt-get का " "उपयोग कर करें |" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "कैची पढ़ रहा है" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "अपवर्जित ताला प्राप्त करने में अक्षम" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -236,11 +237,11 @@ "इसका मतलब यह हुआ कि दूसरा पैकेज प्रबंधक अनुप्रयोग (जैसे apt-get या aptitude) पहले से चल " "रहा है |" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "दूरस्थ संयोजन द्वारा अद्यतन समर्थित नहीं है" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -253,11 +254,11 @@ "\n" "अद्यतन छोड़ रहा है. कृपया बिना ssh के प्रयास करें |" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "SSH के अंतर्गत आगे चलाएं?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -271,11 +272,11 @@ "क्योंकि असफल होने की स्थिति में पुनःप्राप्ति संभव नहीं है |\n" "यदि आप जारी रखते है, तो अतिरिक्त ssh डेमन '%s' पोर्ट पर आरंभ हो जाएगा |" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "अतिरिक्त sshd आरंभ हो रहा है" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -285,7 +286,7 @@ "असफल होने की स्थिति में समुत्थान हेतु, एक अतिरिक्त sshd का आरंभ पोर्ट '%s' पर हो जाएगा " "| यदि चल रहे ssh में कुछ गड़बड़ी होती है तो आप अतिरिक्त एक और के साथ संयोजित रहेगें |\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -298,29 +299,29 @@ "के लिए:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "अद्यतन नहीं हो सका" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "अद्यतन '%s' से '%s' तक इस औजार द्वारा समर्थित नहीं है |" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "सैंडबाक्स सेटअप असफल" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "सैंडबाक्स वातावरण का निर्माण संभव नहीं है" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "सैंडबाक्स विधि" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -330,16 +331,16 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "आपका संस्थापित पायथन विकृत है. कृपया '/usr/bin/python' symlink को ठीक करें |" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "'debsig-verify' पैकेज संस्थापित है" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -349,12 +350,12 @@ "कृपया इसे सिनेपटिक या 'apt-get remove debsig-verify' द्वारा पहले हटाएं तब पुनः " "अद्यतन करें |" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "'%s' में नहीं लिख सकते" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -362,11 +363,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "अंतर्जाल से नवीनतम अद्यतन समाहित करें?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -386,16 +387,16 @@ "संस्थापित करने हेतु चुन सकते हैं |\n" "यदि आपका जबाब यहाँ पर 'नहीं' होता है तो संजाल को पूर्णतः उपयोग नहीं होता |" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "%s को अद्यतन हेतु अशक्त करें" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "वैध मिरर नहीं पाया गया" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -413,11 +414,11 @@ "यदि आपने 'नहीं' चुना तो अद्यतन निरस्त हो जाएगा |" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "डिफाल्ट स्त्रोत बनाएं?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -432,21 +433,21 @@ "क्या '%s' हेतु डिफाल्ट प्रविष्टि जोड़ा जाए? यदि आप 'नहीं' चूनते है तो अद्यतन निरस्त हो " "जाएगा|" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "भण्डार सूचना अवैध है" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "तृतीय पक्ष स्त्रोत अशक्त है" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -455,13 +456,13 @@ "आपके source.list कुछ तृतीय पक्ष प्रविष्टि अशक्त है | आप इसे अद्यतन के पश्चात अपने पैकेज " "प्रबंधक द्वारा या 'software-properties' उपकरण द्वारा पुनःसशक्त कर सकते हैं |" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "पैकेज असंगत स्थिति में है" msgstr[1] "पैकेज असंगत स्थिति में है" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -479,11 +480,11 @@ "प्राप्त नहीं हुआ है | कृपया पैकेज को हस्तगत (मैनुअली) पुनःसंस्थापित करें या इन सबको तंत्र से " "हटा दें |" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "अद्यतन के दौरान त्रुटि" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -491,13 +492,13 @@ "अद्यतन के दौरान एक त्रुटि पाई गयी | यह समान्यतः संजाल समस्या के कारण हो सकता है, कृपया " "संजाल संयोजन की जाँच करें तथा पुनः प्रयास करें |" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "डिस्क प्रयाप्त खाली जगह नहीं है" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -511,21 +512,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "परिवर्तन की गणना कर रहा है" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "आप अद्यतन आरंभ करना चाहते हैं?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "अद्यतन निरस्त" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -533,12 +534,12 @@ "यह उन्नयन अब निरस्त हो जाएगा तथा मूल तंत्र स्थिति लौट आएगा | आप उन्नयन को बाद में कभी " "पुनःशुरु कर सकते हैं |" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "अद्यतन डाउनलोड नहीं कर सका" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -546,27 +547,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "बचनबद्धता के दौरान त्रुटि" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "मूल तंत्र स्थिति को पुनःसंगृहित कर रहा है" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "अद्यतन को संस्थापित नहीं कर सका" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -574,7 +575,7 @@ "उन्नयन निष्फल हो गया. आपका तंत्र अनुपयोगी स्थिति में आ सकता है | एक समुत्थान अब चलेगा " "(dpkg --configure -a) |" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -585,7 +586,7 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -593,20 +594,20 @@ "उन्नयन निष्फल हो गया | कृपया अपने अंतर्जाल संयोजन या संस्थापना मिडिया की जाँच कर लें तथा " "पुनः प्रयास करें | " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "अप्रचलित पैकेज को हटाएं?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "बनाए रखें (_K)" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "हटाएँ (_R)" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -615,37 +616,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "आवश्यक निर्भर संस्थापित नहीं है" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "आवश्यक निर्भरता '%s' संस्थापित नहीं है. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "पैकेज प्रबंधक की जाँच करें" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "अद्यतन की तैयारी असफल" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "पूर्वापेक्षित अद्यतन को प्राप्त करने में असफल" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -653,68 +654,68 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "भण्डार सूचना का अद्यतन हो रहा है" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "सीडीरोम जोड़ने में असफल" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "खेद है, सीडीरोम सफलतापूर्वक नहीं जोड़ा जा सका |" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "पैकेज सूचना अवैध" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "आकर्षित कर रहा है" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "अद्यतन कर रहा है" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "अद्यतन पूर्ण" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "उन्नयन पुरा हुआ लेकिम उन्नयन प्रक्रिया के दौरान त्रुटि हुई |" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "अप्रचलित साफ्टवेयर को खोज रहा है" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "तंत्र का अद्यतन पूर्ण |" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "आंशिक अद्यतन पूर्ण हुआ |" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms का उपयोग हो रहा है" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -723,11 +724,11 @@ "आपका तंत्र /proc/mounts मे 'evms' आयतन प्रबंधन का उपयोग कर रहा है. 'evms' साफ्टवेयर " "अब समर्थित नहीं है, कृपया इसे बंद कर दे तत्पश्चात पुनः अद्यतन करें." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -735,9 +736,9 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -745,8 +746,8 @@ "अद्यतन डेक्सटाप तथा खेल निष्पादन तथा अन्य चित्रादि वाले कार्यक्रम को के प्रभाव को कम कर " "देगा." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -760,7 +761,7 @@ "\n" "क्या आप आगे बढ़ना चाहते हैं?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -773,11 +774,11 @@ "\n" "क्या आप आगे बढ़ना चाहते हैं?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "i686 सीपीयु नहीं" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -788,11 +789,11 @@ "नहीं हैं. सभी पैकेज i686 के आवश्यकता के अनुकूल न्यूनतम स्थापत्य है. यह सम्भव नही है कि आपके " "तंत्र का उन्नयन इस हार्डवेयर के साथ नए प्रकाशित उबुन्टू में किया जा सके." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "ARMv6 सीपीयु नहीं है" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -804,11 +805,11 @@ "आवश्यकता होगी. इन हार्डवेयर के साथ उबुन्टू के नए प्रकाशन द्वारा अपने तंत्र को उन्नत करना " "संभव नहीं है." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "init उपलब्ध नहीं है" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -821,15 +822,15 @@ "है. उबुन्टू 10.04 LTS इस प्रकार के वातावरण में कार्य नहीं कर सकता, पहले अपने आभासी मशीन " "को अद्यतन करने की जरुरत है." -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "सैंंडबाक्स अद्यतन aufs का उपयोग कर रहा है" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "रास्ता (पाथ) प्रदान कर अद्यतन पैकेज वाले सीडीरोम को खोजें" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -837,57 +838,57 @@ "अग्रछोड़ का उपयोग करें. वर्तमान में उपलब्ध: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "केवल आंशिक अद्यतन करें (source.list का पुनःलेखन नहीं)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "GNU स्क्रीन समर्थन असमर्थ करें" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "datadir नियत करें" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "कृपया '%s' को ड्राइव '%s' में डालें" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "आकर्षण समाप्त हुआ" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "आकर्षित संचिका %li है %li का %sB/s की दर से" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "शेष %s के बारे में" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "आकर्षित संचिका %li है %li का" @@ -897,27 +898,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "बदलाव लागू कर रहा है" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "निर्भरता समस्ता- विन्यास छोड़ रहा है" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "'%s' को संस्थापित नहीं कर सका" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -929,7 +930,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -940,7 +941,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -948,20 +949,20 @@ "यदि आपने नए वर्जन से प्रतिस्थापित किया तो इस विन्यास संचिका में किए गए किसी भी " "परिवर्तन को आप खो देंगें." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "'diff' कमांड नहीं पाया गया" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "घातक त्रुटि पायी गई" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -973,13 +974,13 @@ "समाहित करें. उन्नयन निष्फल हुआ.\n" "आपका मुल sources.list को /etc/apt/sources.list.distUpgrade में सहेजा हुआ है." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c दबाएं" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -988,134 +989,134 @@ "करना चाहते हैं?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "आंकड़े को खोने से बचाने हेतु सभी खुले हुए अनुप्रयोगों एंव दस्तावेजों को बंद करें." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "कैनेनिकल (%s) द्वारा अब समर्थित नहीं है" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "अवन्नयन (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "हटाएँ (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "अब और आवश्यकता नहीं है (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "संस्थापित करें (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "उन्नयन (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "मिडिया परिवर्तन" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "अंतर दिखाएं >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< अंतर छुपाएं" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "त्रुटि" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "रद्द करें (&C)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "बंद करें (&C)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "टर्मिनल दिखाएं >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< टर्मिनल छुपाएं" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "सूचना" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "विवरण" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "अब और समर्थित नहीं है (%s)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "%s को हटाएं" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "%s (स्वतः संस्थापित) हटाएं" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "%s को संस्थापित करें" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "%s को अद्यतन करें" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "पुनःआरंभ की जरुरत है" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "अद्यतन पूर्ण करने हेतु तंत्र को पुनःआरंभ करें" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "अभी पुनःआरंभ करें (_R)" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1127,32 +1128,32 @@ "यदि आप अद्यतन को रद्द करते हैं तो तंत्र अस्थायी स्थिति में आ जाएगा. आपसे प्रबल सलाह दि " "जाती है कि अद्यतन को पुनःशुरु करें." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "अद्यतन रद्द करें?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li दिवस" msgstr[1] "%li दिवसों" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li घंटा" msgstr[1] "%li घंटे" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li मिनट" msgstr[1] "%li मिनटों" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1168,7 +1169,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1182,14 +1183,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1198,34 +1199,32 @@ "इसे डाउनलोड करने में 1मे.ब. DSL संयोजन द्वारा %s तथा 56कि. मोडेम द्वारा %s समय लगेगा." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "आपके संयोजन द्वारा इसे डाउनलोड होने में %s समय लगेगा. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "अद्यतन हेतु तैयार हो रहा है" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "नए साफ्टवेयर चैनल प्राप्त कर रहा है" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "नया पैकेज प्राप्त कर रहा है" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "अद्यतन संस्थापित कर रहा है" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "साफ कर रहा है" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1242,28 +1241,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d पैकेज हटाया जा रहा है." msgstr[1] "%d पैकेज हटाया जा रहा है" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d नए पैकेज संस्थापित होने जा रहा है." msgstr[1] "%d नए पैकेज संस्थापित होने जा रहा है." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d पैकेज उन्नत होने जा रहा है." msgstr[1] "%d पैकेज उन्नत होने जा रहा है." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1274,148 +1273,148 @@ "\n" "आप कुल %s डानलोड करेंगें. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "इस कंप्यूटर पर सॉफ्टवेयर अप टू डेट है |" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "आपके तंत्र हेतु अद्यतन उपलब्ध नहीं है. अद्यतन रद्द हो रहा है." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "पुनःबूट की आवश्यकता है" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "अद्यतन पूरा हो गया तथा पुनःबूट की जरुरत है. क्या आप इसे करना चाहते हैं?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "'% s' निकला जा रहा है" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "अद्यतन उपकरण को नहीं चला सका" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "अद्यतन उपकरण हस्ताक्षर" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "अद्यतन उपकरण" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "मिलान करने में असफल" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "अद्यतन का मिलान असफल. यह संजाल समस्या के कारण हो सकता है " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "प्रमाणीकरण असफल" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" "अद्यतन का प्रमाणिकरण निष्फल. यह आपके संजाल या सर्वर के साथ समस्या के काऱण हो सकता है. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "अवतरण करने में असफल" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" "अद्यतन का अवतरण करने में असफल. यह संजाल या सर्वर के साथ समस्या के कारण हो सकता है. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "प्रमाणीकरण असफल" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" "अद्यतन का प्रमाणीकरण असफल. यह संजाल या सर्वर के साथ समस्या के कारण हो सकता है. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "अद्यतन नहीं हो सकता" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "त्रुटि संदेश '%s' है." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1426,73 +1425,73 @@ "log तथा /var/log/dist-upgrade/apt.log को समाहित करें. उन्नयन निष्फल हो गया.\n" "आपका मूल sources.list को /etc/apt/sources.list.distUpgrade में सहेजा गया है." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "निष्फल हो गया" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "पदावनत कियाः\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "जारी रखने के लिए कृपया [ENTER] कुंजी दबाएँ" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "जारी [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "विस्तृत [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "हाँ" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "न" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "विस्तृत" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "अब और समर्थित नहीं: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "हटाएं: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "संस्थापन: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "अद्यतन: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "जारी [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1559,7 +1558,7 @@ msgstr "वितरण अद्यतन" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1578,153 +1577,167 @@ msgid "Terminal" msgstr "टर्मिनल" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "कृपया इंतजार करें. इसमें कुछ समय लगेगा." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "अद्यतन पूर्ण" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "प्रकाशन सूचना नहीं पाया गया" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "सर्वर अतिभारित है. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "प्रकाशन सूचना डाउनलोड नहीं कर सका" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "अंतर्जाल संयोजन की जाँच करें." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "उन्नत बनाएं" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "प्रकाशन सूचना" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "अतिरिक्त पैकेज संचिका को डाउनलोड कर रहा है..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "संचिका %s है %s में से %sB/s की दर से" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "संचिका %s है %s में से" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "ब्राउजर में लिंक खोलें" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "क्लिपबोर्ड में लिंक की प्रतिलिपि करें" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" "संचिका डाउनलोड कर रहा है %(current)li को %(total)li में से %(speed)s/s गति से" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "संचिका डाउनलोड कर रहा है %(current)li का %(total)li में से" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "आपका उबुन्टू प्रकाशन अब और समर्थित नहीं रहा." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "अद्यतन सूचना" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "संस्थापित करे" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "संस्करण %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "संजाल संयोजन नहीं पाया गया, आप चेंजलॉग सूचना नहीं डाउनलोड कर सकते हैं." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "परिवर्तन सूची को डाउनलोड कर रहा है..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "सभी को अचयनित करें (_D)" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "सभी का चुने(_A)" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s अद्यतन चुना गया." +msgstr[1] "%(count)s अद्यतन चुना गया." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s का डाउनलोड होगा." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "अद्यतन डाउनलोड हो चुका है, लेकिन संस्थापित नहीं हुआ है" -msgstr[1] "अद्यतन डाउनलोड हो चुका है, लेकिन संस्थापित नहीं हुआ है" +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "अज्ञात डाउनलोड आकार." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1733,14 +1746,14 @@ "यह पैकेज सूचना अन्तिम बार %(days_ago)s दिनों पहले हुआ है.\n" "नए सॉफ्टवेयर अद्यतन की जाँच हेतु कृपया निचे के 'जाँच' बटन को दबाएँ." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "पैकेज सूचना अंतिम बार %(days_ago)s दिन पहले अद्यतन हुआ है." msgstr[1] "पैकेज सूचना अंतिम बार %(days_ago)s दिनों पहले अद्यतन हुआ है." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1749,34 +1762,43 @@ msgstr[1] "पैकेज सूचना अंतिम बार %(hours_ago)s घंटो पहले अद्यतन हुआ है." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "पैकेज जानकारी का अद्यतन %s मिन्टों पहले किया गया था |" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "पैकेज जानकारी का अद्यतन अभी ही किया गया था |" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"साफ्टवेयर अद्यतन सुधार में त्रुटि, सुरक्षा दोषपूर्णता का उन्मुलन करे तथा नई विशेषता प्रदान करें." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "आपके कंप्यूटर हेतु सॉफ्टवेयर अद्यतन उपलब्ध रहेगा." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "उबुन्टू में स्वागत है" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1787,7 +1809,7 @@ "जगह डिस्क स्थान '%s' में से खाली करें. अपने रद्दी को खाली करें तथा पूर्व संस्थापित पैकेज के " "अस्थायी पैकेज को 'sudo apt-get clean' का इस्तेमाल कर करें." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1795,23 +1817,23 @@ "अद्यतन संस्थापन पूर्ण करने के लिए कंप्यूटर को पुनःआरंभ करने की जरुरत है. आगे बदने के पहले अपने " "कार्य सहेजें." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "पैकेज सूचना पढ़ रहा है" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "संयोजन कर रहा है" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "आप अद्यतन हेतु जाँच या नए अद्यतन को डाउनलोड करने में समर्थ नहीं है." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "पैकेज सूचना को शुरु नहीं कर सका" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1824,7 +1846,7 @@ "कृपया इसे बग के रुप में 'अद्यतन प्रबंधक' पैकेज के विरुद्ध करें तथा निम्न त्रुटि संदेश को संलग्न " "करें:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1835,31 +1857,31 @@ "\n" "कृपया इसे बग के रुप में 'अद्यतन प्रबंधक' पैकेज के विरुद्ध करें तथा निम्न त्रुटि संदेश को संलग्न करें:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (नया संस्थापितl)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(आकार: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "संस्करण %(old_version)s से %(new_version)s तक" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "संस्करण %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "प्रकाशित उन्नयन अब सम्भव नहीं है" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1868,21 +1890,21 @@ "प्रकाशित उन्नयन वर्तमान में नहीं किया जा सकता है, कृपया बाद में पुनः प्रयास करें. सर्वर " "रिपोर्ट कर रहा है: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "प्रकाशित अद्यतन औजार को डाउनलोड करें" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "नया उबुन्टू प्रकाशन '%s' उपलब्ध है" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "साँफ्टवेयर अनुसूची खंडित है" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1892,6 +1914,17 @@ "उपयोग करें या टर्मिनल में जाकर \"sudo apt-get install -f\" को चलाएं ताकि इस समस्या " "को ठीक किया जा सके." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "नया प्रकाशन '%s' उपलब्ध है." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "रद्द करें" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "अद्यतन के लिए जाँचें" @@ -1901,22 +1934,18 @@ msgstr "सभी उपलब्ध अद्यतन स्थापित करें" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "रद्द करें" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "चेंजलॉग" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "अद्यतन" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "अद्यतन सूची बना रहा है" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1940,20 +1969,20 @@ " * गैरकार्यालयी साफ्टवेयर पैकेज जो उबुन्टू द्वारा प्रदत्त नहीं होगा\n" " * उबुन्टू के पूर्व-प्रकाशित संस्करण में सामान्य परिवर्तन के कारण" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "परिवर्तित-सूची का डाउनलोड जारी है." -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "अन्य अद्यतन (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -1961,7 +1990,7 @@ "परिवर्तन की सूची डाउनलोड करने में असफल. \n" "कृपया अपने अंतर्जाल संयोजन की जाँच करें." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1970,7 +1999,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1983,7 +2012,7 @@ "कृपया उपयोग करें http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "जब तक परिवर्तन उपलब्ध न हो या बाद में पुनः प्रयास करें." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1996,52 +2025,44 @@ "कृपया उपयोग करें http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "जब तक परिवर्तन उपलब्ध न हो जाए या बाद में पुनः प्रयास करें." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "वितरण को पहचानने में असफल" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" "आपका कंप्यूटर क्या उपयोग कर रहा है इसकी जाँच के दौरान एक त्रुटि '%s' उतपन्न हुई है." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "महत्वपूर्ण सुरक्षा अद्यतन" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "संस्तुतित अद्यतन" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "प्रस्तावित अद्यतन" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "पिछला पोर्ट" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "वितरण अद्यतन" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "अन्य अद्यतन" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "अद्यतन प्रबंधक आरंभ कर रहा है" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"साफ्टवेयर अद्यतन सुधार में त्रुटि, सुरक्षा दोषपूर्णता का उन्मुलन करे तथा नई विशेषता प्रदान करें." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "आंशिक उन्नत (_P)" @@ -2111,59 +2132,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "सॉफ्टवेयर अद्यतन" +msgid "Update Manager" +msgstr "अद्यतन प्रबंधक" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "सॉफ्टवेयर अद्यतन" +msgid "Starting Update Manager" +msgstr "अद्यतन प्रबंधक आरंभ कर रहा है" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "अद्यतन (_p)" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "अद्यतन" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "संस्थापित करे" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "परिवर्तन" +msgid "updates" +msgstr "अद्यतन" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "विवरण" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "अद्यतन का विवरण" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "आप रोमिंग द्वारा जुड़े हुए हैं तथा इस अद्यतन हेतु उपयोग समंक महँगा पड़ सकता है." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "आप ताररहित मॉडम से जुड़े है." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "अद्यतन करने के पूर्व एसी पावर से कंप्यूटर को जोड़ना ज्यादा सूरक्षित रहेगा." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "अद्यतन संस्थापित करें (_I)" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "परिवर्तन" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "सेटिंग (_S)..." +msgid "Description" +msgstr "विवरण" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "संस्थापित करे" +msgid "Description of update" +msgstr "अद्यतन का विवरण" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "सेटिंग (_S)..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2186,9 +2207,8 @@ msgstr "आपने नए उबुन्टू में उन्नत करने से अस्वीकार कर दिया है" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "आप बाद में अद्यतन प्रबंधक को खोलकर तथा \"उन्नत\" पर क्लिक कर उन्नत कर सकते हैं." @@ -2200,58 +2220,58 @@ msgid "Show and install available updates" msgstr "उपलब्ध अद्यतन दिखाएं और संस्थापित करें" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "संस्करण दिखाएँ और बाहर निकलें" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "निर्देशिका जिसमे आंकड़ा संचिका हो" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "नए उबुन्टू प्रकाशन की उपलब्धता की जाँच करें" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "जाँच करे कि नविनतम डेवेल प्रकाशन में कोटि उन्नयन संभव है या नहीं" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "प्रकाशित उन्नयन में से नविनतम प्रस्तावित संस्करण का उपयोग कर कोटि उन्नयन करें" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "जब आरंभ हो तो मानचित्र पर केंद्रित न करें" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "वितरक-उन्नयन को चलाने की चेष्टा करें" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "जब आरंभ कर रहा हो तो अद्यतन हेतु जाँच नहीं करें" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "सैंडबॉक्स aufs overlay द्वारा उन्नयन करने की जाँच करें" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "आंशिक कोटि-उन्नयन चलाएं" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "$distro-proposed द्वारा उन्नयनक्रर्ता का उपयोग कर नविनतम प्रकाशन में कोटि उन्नयन की " "चेष्टा करें" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2261,22 +2281,22 @@ "डेक्सटॉप तंत्र का नियमित कोटि उन्नयन हेतु वर्तमान में 'डेक्सटॉप' है तथा सर्वर तेत्र हेतु " "'सर्वर' समर्थित है." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "विशिष्ट अग्रछोड़ को चलाएं" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" "जब केवल नया वितरण प्रकाशन उपलब्ध हो तभी जाँच करें तथा परिणाम को exit कोड द्वारा दें" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2284,168 +2304,211 @@ "सूचना उन्नयन हेतु, कृपया देखें:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "नया प्रकाशन नहीं पाया गया" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "नया प्रकाशन '%s' उपलब्ध है." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "कोटि उन्नयन हेतु 'do-release-upgrade' को चलाएं." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "उबुन्टू %(version)s कोटि-उन्नयन हेतु उपलब्ध है" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "आपने उबुन्टू %s का कोटि-उन्नयन का अवनति किया है" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "डिबग आउटपुट जोड़ें" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "इस मशीन पर असमर्थित संकुल दिखाएँ" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "इस मशीन पर समर्थित संकुल दिखाएँ" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "स्थिति के साथ सभी संकुल दिखाएँ" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "एक सूची में सभी संकुल दिखाएँ" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "गैरकार्यान्वित पद्धतिः %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "डिस्क पर एक संचिका है" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb पैकेज" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "छुटे हुए पैकेज संस्थापित करें" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "पैकेज %s को संस्थापित करें." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb पैकेज" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s को स्व-संस्थापित चिह्नित करें" - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"कोटि-उन्नयन के दौरान यदि kdelibs4-dev संस्थापित होता है, तो kdelibs5-dev को भी " -"संस्थापित करना होगा. विस्तृत विवरण हेतु देखे bugs.launchpad.net, bug #279621." - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "स्थिति संचिका में %i अप्रचलित प्रविष्टि है" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "dpkg status में लुप्तप्रयोग प्रविष्टियाँ हैं" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "लुप्तप्रयोग dpkg status प्रविष्टियाँ" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" -msgstr "lilo को हटाएँ क्यों कि grub भी संस्थापित है." +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"कोटि-उन्नयन के दौरान यदि kdelibs4-dev संस्थापित होता है, तो kdelibs5-dev को भी " +"संस्थापित करना होगा. विस्तृत विवरण हेतु देखे bugs.launchpad.net, bug #279621." -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s अद्यतन चुना गया." -#~ msgstr[1] "%(count)s अद्यतन चुना गया." +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s को स्व-संस्थापित चिह्नित करें" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +msgstr "lilo को हटाएँ क्यों कि grub भी संस्थापित है." -#~ msgid "Welcome to Ubuntu" -#~ msgstr "उबुन्टू में स्वागत है" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Update Manager" -#~ msgstr "अद्यतन प्रबंधक" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "Starting Update Manager" -#~ msgstr "अद्यतन प्रबंधक आरंभ कर रहा है" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "You are connected via a wireless modem." -#~ msgstr "आप ताररहित मॉडम से जुड़े है." +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "अद्यतन संस्थापित करें (_I)" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" #~ "This upgrade is running in sandbox (test) mode. All changes are written " @@ -2483,6 +2546,11 @@ #~ msgid "Checking for a new ubuntu release" #~ msgstr "नए उबुन्टू प्रकाशन हेतु जाँच करें" +#~ msgid "The update has already been downloaded, but not installed" +#~ msgid_plural "The updates have already been downloaded, but not installed" +#~ msgstr[0] "अद्यतन डाउनलोड हो चुका है, लेकिन संस्थापित नहीं हुआ है" +#~ msgstr[1] "अद्यतन डाउनलोड हो चुका है, लेकिन संस्थापित नहीं हुआ है" + #~ msgid "There are no updates to install" #~ msgstr "संस्थापना हेतु कोई अद्यतन नहीं है" diff -Nru update-manager-17.10.11/po/hr.po update-manager-0.156.14.15/po/hr.po --- update-manager-17.10.11/po/hr.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/hr.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-04-10 17:51+0000\n" "Last-Translator: Ivan Milićević \n" "Language-Team: Croatian \n" @@ -21,7 +22,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -30,13 +31,13 @@ msgstr[2] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Poslužitelj za %s" @@ -44,20 +45,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Glavni poslužitelj" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Osobni poslužitelji" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Izračun sources.list stavke nije moguć." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -65,11 +66,11 @@ "Nije moguće locirati bilo kakve paketne datoteke. Ovo možda nije Ubuntu " "medij ili se radi o krivoj arhitekturi." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Dodavanje CDa nije uspjelo" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -84,14 +85,14 @@ "Poruka je bila:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Ukloni paket koji je u lošem stanju" msgstr[1] "Ukloni paketa koji su u lošem stanju" msgstr[2] "Ukloni pakete koji su u lošem stanju" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -116,15 +117,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Moguće je da je poslužitelj preopterećen" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Neispravni paketi" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -133,7 +134,7 @@ "programom. Popravite ih koristeći synaptic ili apt-get prije nastavljanja." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -154,11 +155,11 @@ " * neslužbeni softverski paketi koji ne dolaze uz Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Ovo je vjerovatno privremeni problem, pokušajte ponovo kasnije." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -166,16 +167,16 @@ "Ako se ništa od ovoga ne primijenjuje, prijavite grešku pomoću naredbe " "'ubuntu-bug update-manager' u terminalu." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Izračunavanje nadogradnje nije bilo moguće" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Greška pri autentifikaciji nekih paketa" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -185,29 +186,29 @@ "problemu s mrežom, stoga pokušajte ponovno kasnije. Popis neautentificiranih " "paketa dostupan je u nastavku." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" "Paket '%s' je označen za uklanjanje, ali se nalazi na crnoj listi uklanjanja." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Neophodan paket '%s' je označen za uklanjanje." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Pokušaj instalacije inačice '%s' s crne liste" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Ne mogu instalirati '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -216,11 +217,11 @@ "naredbe 'ubuntu-bug update-manager' u terminalu." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Pretpostavljanje meta-paketa nije bilo moguće" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -234,15 +235,15 @@ " Prije nastavka, molim instalirajte jedan od gore navedenih paketa koristeći " "synaptic ili apt-get." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Čitam spremnik" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Isključivo zaključavanje nije uspjelo" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -250,11 +251,11 @@ "Ovo obično znači da je neki drugi program za upravljanje paketima već " "pokrenut (npr. apt-get ili aptitude). Molimo, prvo zatvorite taj program." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Nadogradnja putem udaljene veze nije podržano" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -268,11 +269,11 @@ "\n" "Nadogradnja će se prekinuti. Molim pokušajte bez SSH-a." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Nastaviti rad pod SSHom?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -290,11 +291,11 @@ "'%s'.\n" "Želite li nastaviti?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Pokreni dodatni sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -305,7 +306,7 @@ "portu '%s'. Ukoliko nešto pođe po zlu s pokrenutim SSH-om, tada ćete se moći " "povezati na dodatni.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -318,29 +319,29 @@ "sa npr.:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Nadogradnja nije moguća" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Nadogradnja iz '%s' u '%s' nije podržana ovim alatom." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Podešavanje sandboxa nije uspjelo" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Nije bilo moguće stvoriti sandbox okruženje." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Sandbox način rada" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -356,18 +357,18 @@ "*Nikakve* promjene zapisane u direktorij sustava od ovog trenutka, pa do " "idućeg ponovnog pokretanja nisu trajne." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Vaša instalacija Pythona je neispravna. Popravite simboličku poveznicu '/usr/" "bin/python'." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Paket 'debsig-verify' je instaliran" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -377,12 +378,12 @@ "Molim, najprije ga uklonite uz pomoć synaptica ili naredbe 'apt-get remove " "debsig-verify' i potom ponovno pokrenite nadogradnju." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Nije moguće zapisivati u '%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -393,11 +394,11 @@ "Nadogradnja se ne može nastaviti.\n" "Provjerite da je u sistemski direktorij moguće zapisivati." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Uključi posljednje nadogradnje sa interneta?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -417,16 +418,16 @@ "najnovija ažuriranja odmah po završetku nadogradnje.\n" "Ako ovdje odgovorite 'ne', to znači da se mreža uopće ne koristi." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "onemogućeno kod nadogradnje na %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Nisam našao ispravan zrcalni poslužitelj" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -447,11 +448,11 @@ "Ako odaberete 'Ne', nadogradnja će biti otkazana." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Kreirati uobičajene izvore?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -465,11 +466,11 @@ "Da li bi zadani zapisi za '%s' trebali biti dodani? Ako odaberete 'Ne', " "nadogradnja će biti otkazana." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Podaci repozitorija neispravni" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -477,11 +478,11 @@ "Nadogradnja informacija o repozitorijima je rezultirala neispravnom " "datotekom, stoga se pokreće proces za prijavu greške." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Izvori trećih strana su isključeni" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -491,14 +492,14 @@ "ih uključiti nakon nadogradnje sa 'software-properties' alatom ili sa " "upraviteljem paketa." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Paket u proturječnom stanju" msgstr[1] "Paketi u proturječnom stanju" msgstr[2] "Paketi u proturječnom stanju" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -521,11 +522,11 @@ "nije pronađena nikakva arhiva za njih. Molim, pakete ponovno instalirajte " "ručno ili ih uklonite iz sustava." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Greška prilikom nadogradnje" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -534,13 +535,13 @@ "problemu s mrežom, stoga molim da provjerite svoju vezu na mrežu i pokušate " "ponovno." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Nema dovoljno praznog mjesta na disku" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -555,21 +556,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Analiza promjena" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Želite li pokrenuti nadogradnju?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Nadogradnja otkazana" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -577,12 +578,12 @@ "Nadogradnja će se prekinuti i prijašnje stanje sustava će se vratiti. " "Nadogradnju možete nastaviti kasnije." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Nadogradnje nisu mogle biti preuzete" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -592,27 +593,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Greška prilikom čina" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Vraćam u početno stanje" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Nisam mogao instalirati nadogradnje" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -620,7 +621,7 @@ "Nadogradnja je prekinuta. Vaš sustav bi mogao biti u neupotrebljivom stanju. " "Popravak će upravo biti pokrenut (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -637,27 +638,27 @@ "zapisnike u /var/log/dist-upgrade/.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" "Nadogradnja je prekinuta. Vaš sustav bi mogao biti u neupotrebljivom stanju. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Ukloniti zastarjele pakete?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Zadrži" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Ukloni" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -667,27 +668,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Potrebna zavisnost nije instalirana" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Potrebna zavisnost '%s' nije instalirana. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Provjeravam upravitelja paketima" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Neuspjelo pripremanje nadogradnje" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -695,11 +696,11 @@ "Priprema sustava za nadogradnju nije uspjela, stoga se pokreće proces za " "prijavu greške." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Neuspjelo pripremanje nadogradnje" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -711,70 +712,70 @@ "\n" "Dodatno, pokrenut će se proces za prijavu greške." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Nadograđujem podatke repozitorija" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Neuspjelo dodavanje CD-ROM-a" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Isprike, dodavanje CD-ROM-a nije uspjelo." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Neispravni podaci paketa" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Dohvaćanje" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Nadograđujem" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Nadogradnja dovršena" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "Nadogradnja je dovršena, ali evidentirane su greške prilikom procesa " "nadogradnje." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Tražim zastarjele programe" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Nadogradnja sustava je završena." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Djelomična nadogradnja dovršena" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms u upotrebi" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -784,13 +785,13 @@ "softver više nije podržan, molim isključite gam te ponovno pokrenite " "nadogradnju.." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "Vaš grafički hardver možda neće biti u potpunosti podržan u Ubuntuu 12.04 " "LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -802,9 +803,9 @@ "posjetite https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx Želite " "li nastaviti s nadogradnjom?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -812,8 +813,8 @@ "Nadogradnja može umanjiti efekte radne površine i performanse u igrama i " "ostalim grafički zahtjevnim programima." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -827,7 +828,7 @@ "\n" "Želite li nastaviti?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -841,11 +842,11 @@ "\n" "Želite li nastaviti?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Nema i686 procesora" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -857,11 +858,11 @@ "minimalnu arhitekturu. S ovim hardverom nije moguće obaviti nadogradnju na " "novu inačicu Ubuntua." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Nedostaje ARMv6 procesor" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -873,11 +874,11 @@ "minimalnu arhitekturu. Nadogradnja vašeg sustava na novo izdanje Ubuntua " "nije moguće na ovom hardveru." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Nema dostupnog inita" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -893,15 +894,15 @@ "\n" "Želite li nastaviti?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Sandbox nadogradnja uporabom aufs-a" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Koristi danu putanju za traženje CD-ROM-a s paketima za nadogradnju" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -909,57 +910,57 @@ "Koristi grafičko sučelje. Trenutno su dostupna: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*ZASTARJELO* ova će mogućnost biti ignorirana" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "Izvrši samo djelomičnu nadogradnju (sources.list se ne prepisuje)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Onemogući podršku za GNU screen" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Postavi datadir" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Molim, ubacite '%s' u uređaj '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Preuzimanje je završeno" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Preuzimanje datoteke %li od %li pri %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Otprilike je ostalo %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Preuzimam datoteku %li od %li" @@ -969,27 +970,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Primjenjujem promjene" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "problemi zavisnosti - ostavljam nepodešeno" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Instalacija '%s' nije moguća" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -1001,7 +1002,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1012,7 +1013,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1020,20 +1021,20 @@ "Izgubit ćete sve promjene napravljene na ovoj konfiguracijskoj datoteci ako " "odaberete izmjenu s novijom verzijom programa." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Nisam našao naredbu 'diff'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Pojavila se ozbiljna greška" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1046,13 +1047,13 @@ "Izvorna inačica datoteke sources.list je spremljena u /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Pritisnuta kombinacija tipki Ctrl-c" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1061,136 +1062,136 @@ "Jeste li sigurni da to želite učiniti?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "Da spriječite gubitak podataka zatvorite sve programe i datoteke." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Više ne podržava Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Povratak na stariju inačicu (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Ukloni (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Nepotrebno (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Instaliraj (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Nadogradi (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Promjena medija" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Prikaži razliku >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Sakrij razliku" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Greška" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Odustani" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Zatvori" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Prikaži Terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Sakrij Terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Informacije" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Detalji" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Nepodržano %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Ukloni %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Ukloni (bilo je instalirano automatski) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Instaliraj %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Nadogradi %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Potrebno je ponovno pokretanje" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" "Ponovno pokretanje računala potrebno je za završetak nadogradnje" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "Ponovno pok_reni računalo" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1202,11 +1203,11 @@ "Ako otkažete nadogradnju, sustav može ostati u nestabilnom stanju. " "Savjetujemo vam da nastavite nadogradnju." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Otkazati nadogradnju?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" @@ -1214,7 +1215,7 @@ msgstr[1] "%li dana" msgstr[2] "%li dan" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" @@ -1222,7 +1223,7 @@ msgstr[1] "%li sati" msgstr[2] "%li sat" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" @@ -1230,7 +1231,7 @@ msgstr[1] "%li minuta" msgstr[2] "%li minuta" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1247,7 +1248,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1261,14 +1262,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1278,34 +1279,32 @@ "modemom." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Preuzimanje će trajati oko %s s vašom vezom. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Pripremam za nadogradnju" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Dobivam nove softverske kanale" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Dobivanje novih paketa" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Instalacija nadogradnji" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Čišćenje" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1325,7 +1324,7 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." @@ -1333,7 +1332,7 @@ msgstr[1] "%d paketa će biti uklonjena." msgstr[2] "%d paketa će biti uklonjeno." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." @@ -1341,7 +1340,7 @@ msgstr[1] "%d nova paketa će biti instalirana." msgstr[2] "%d novih paketa će biti instalirano." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." @@ -1349,7 +1348,7 @@ msgstr[1] "%d paketa će biti nadograđena." msgstr[2] "%d paketa će biti nadograđeno." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1360,7 +1359,7 @@ "\n" "Morate preuzeti ukupno %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1368,7 +1367,7 @@ "Instalacija nadogradnje može potrajati nekoliko sati. Nakon što preuzimanje " "završi, proces se ne može otkazati." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1376,53 +1375,53 @@ "Preuzimanje i instalacija nadogradnje može potrajati nekoliko sati. Nakon " "što preuzimanje završi, proces se ne može otkazati." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Uklanjanje paketa može potrajati nekoliko sati. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Softver na ovome računalu je ažuriran." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "Nema nadogradnji za vaš sustav. Nadogradnja će biti otkazana." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Potrebno je ponovno pokretanje računala" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Nadogradnja je završena i potrebno je ponovo pokrenuti računalo. Želite li " "to učiniti sada?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "autentifikacija '%(file)s' protiv '%(signature)s' " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "raspakiravanje '%s'" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Nisam mogao pokrenuti alat za nadogradnju" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1430,33 +1429,33 @@ "Najvjerojatnije se radi o grešci alata nadogradnje. Prijavite grešku pomoću " "naredbe 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Potpis alata za nadogradnju" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Alat za nadogradnju" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Preuzimanje nije uspjelo" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Preuzimanje nadogradnje nije uspjelo. Vjerojatno je problem u mreži. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Autorizacija nije uspjela" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1464,13 +1463,13 @@ "Autorizacija nadogradnje nije uspjela. Vjerojatno je problem u mreži ili s " "poslužiteljem. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Raspakiravanje nije uspjelo." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1478,13 +1477,13 @@ "Raspakiravanje nadogradnje nije uspjelo. Vjerojatno je problem u mreži ili " "na poslužitelju. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Verifikacija nije uspjela" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1492,15 +1491,15 @@ "Provjera nadogradnje nije uspjela. Vjerojatno je problem u mreži ili s " "poslužiteljem. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Pokretanje nadogradnje nije moguće" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1509,13 +1508,13 @@ "Montirajte particiju ponovno bez noexec direktive i još jednom pokrenite " "nadogradnju." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Poruka greške je '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1527,73 +1526,73 @@ "Izvorna inačica datoteke sources.list je spremljena u /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Odustajanje" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Degradirano:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Za nastavak pritisnite [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Nastavi [dN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Detalji [e]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "d" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "a" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Nepodržano: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Ukloni: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Instaliraj: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Nadogradi: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Nastavi [Dn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1660,9 +1659,8 @@ msgstr "Nadogradnja distribucije" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Nadogradnja Ubuntua na inačicu 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Nadogradnja Ubuntua na inačicu 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1680,84 +1678,85 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Molim pričekajte, ovo može potrajati." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Nadogradnja je gotova" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Nisam mogao naći bilješke izdanja" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Poslužitelj bi mogao biti preopterećen. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Nisam mogao dohvatiti bilješke izdanja" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Molim, provjerite vašu internet vezu." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Nadogradnja" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Bilješke izdanja" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Preuzimanje dodatnih paketnih datoteka..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Datoteka %s od %s pri %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Datoteka %s od %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Otvori poveznicu u pregledniku" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Kopiraj poveznicu u međuspremnik" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Preuzimanje datoteke %(current)li od %(total)li brzinom %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Preuzimam datoteku %(current)li od %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Vaša inačica Ubuntua više nije podržana." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1765,52 +1764,59 @@ "Više nećete dobivati dodatne sigurnosne i kritične dopune. Molimo vas da " "nadogradite Ubuntu na najnoviju inačicu." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Informacije o nadogradnji" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Instaliraj" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Ime" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Inačica %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Nema otkrivenih mrežnih veza, stoga ne možete preuzeti bilješke izdanja." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Preuzimam popis promjena..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "Poništi o_dabir" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Od_aberi sve" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "Označena je %(count)s dopuna." +msgstr[1] "Označene su %(count)s dopune." +msgstr[2] "Označeno je %(count)s dopuna." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s će biti preuzeto." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "Dopuna je već preuzeta, ali nije instalirana." msgstr[1] "Dopune su već preuzete, ali nisu instalirane." msgstr[2] "Dopuna je već preuzeto, ali nije instalirano." @@ -1819,11 +1825,18 @@ msgid "There are no updates to install." msgstr "Nema dopuna za instalaciju" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Nepoznata veličina preuzimanja." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1831,7 +1844,7 @@ "Nije poznato kada su informacije paketa posljednji put ažurirane. Da biste " "ažurirali informacije, kliknite na tipku \"Provjeri\"." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1840,7 +1853,7 @@ "Informacije o paketima su posljednji put ažurirane prije %(days_ago)s dana.\n" "Da biste provjerili dostupnost novih dopuna, kliknite na tipku 'Provjeri'." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1851,7 +1864,7 @@ msgstr[2] "" "Informacije o paketima su posljednji put ažurirane prije %(days_ago)s dana." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1864,34 +1877,45 @@ "Informacije o paketima su posljednji put ažurirane prije %(hours_ago)s sati." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Informacije paketa su posljednji put ažurirane prije %s minuta." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Informacija paketa su upravo ažurirane." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Nadogradnje programa popravljaju greške, uklanjaju sigurnosne propuste i " +"donose nove mogućnosti." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Dopune za vaše računalo su možda dostupne" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Dobrodošli u Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Ove softverske dopune su objavljene otkako je objavljena ova inačica Ubuntua." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Dostupne su softverske dopune za ovo računalo." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1903,7 +1927,7 @@ "svoje smeće ili uklonite privremene pakete prethodnih instalacija koristeći " "'sudo apt-get clean'." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1911,23 +1935,23 @@ "Računalo se mora ponovno pokrenuti za završetak nadogradnje. Pohranite svoj " "rad prije nastavka." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Čitanje informacija paketa" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Povezivanje..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "Možda nećete moći provjeriti postoje li nove dopune ili ih preuzeti." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Ne mogu inicijalizirati informacije paketa" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1941,7 +1965,7 @@ "Molim, prijavite grešku u 'update-manager' paketu i priložite sljedeću " "grešku:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1953,31 +1977,31 @@ "Molim, prijavite grešku u 'update-manager' paketu i priložite sljedeću " "grešku:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Nova instalacija)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Veličina: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Verzija %(old_version)s u %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Inačica %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Nadogradnja izdanja trenutno nije moguća" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1986,21 +2010,21 @@ "Nadogradnju izdanja trenutno nije moguće obaviti, molim pokušajte ponovno. " "Poslužitelj je odgovorio: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Preuzimanje alata za nadogradnju izdanja" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Novo izdanje Ubuntua, '%s', je dostupno" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Popis programa je oštećen" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -2010,6 +2034,17 @@ "upravitelja paketima \"Synaptic\" ili upišite \"sudo apt-get install -f\" u " "terminalu za ispravljanje ovog problema." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Novo '%s' izdanje dostupno." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Odustani" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Provjerite dostupnost dopuna" @@ -2019,22 +2054,18 @@ msgstr "Instaliraj sve dostupne dopune" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Odustani" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Dnevnik promjena" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Dopune" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Izgrađivanje popisa dopuna" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2058,20 +2089,20 @@ " * neslužbeni softverski paketi koji ne dolaze uz Ubuntu\n" " * normalne promjene razvojne inačice Ubuntua" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Preuzimanje zapisa o promjenama" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Ostale dopune (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "Ova dopuna ne dolazi iz izvora koji podržava izvještaje promjena." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2079,7 +2110,7 @@ "Preuzimanje popisa promjena nije uspjelo. \n" "Molim, provjerite svoju internet vezu." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2092,7 +2123,7 @@ "Dostupna inačica: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2105,7 +2136,7 @@ "Molim koristite http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "dok promjene ne postanu dostupne ili pokušajte ponovno kasnije." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2118,53 +2149,44 @@ "Molim, posjetite http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "dok promjene ne postanu dostupne ili pokušajte ponovno kasnije." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Prepoznavanje distribucije nije uspjelo" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" "Došlo je do greške '%s' prilikom prilikom provjere sustava kojeg koristite." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Važne sigurnosne nadogradnje" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Preporučene nadogradnje" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Predložene nadogradnje" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backporti" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Nadogranje distribucije" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Druge nadogradnje" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Pokretanje Upravitelja nadogradnji" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Nadogradnje programa popravljaju greške, uklanjaju sigurnosne propuste i " -"donose nove mogućnosti." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Djelomična nadogradnja" @@ -2235,37 +2257,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Nadogradnje programa" +msgid "Update Manager" +msgstr "Upravitelj nadogradnji" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Nadogradnje programa" +msgid "Starting Update Manager" +msgstr "Pokretanje Upravitelja nadogradnjama" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "Na_dogradnja" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "nadogradnje" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Instaliraj" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Promjene" +msgid "updates" +msgstr "nadogradnje" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Opis" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Opis nadogradnje" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2273,23 +2285,33 @@ "Povezani u roamingu. Promet potrošen za preuzimanje dopune vam može biti " "naplaćen." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Povezani ste pomoću bežičnog modema." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "Preporuka je da prije ažuriranja svoje računalo priključite na struju." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Instaliraj nadogradnje" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Promjene" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "Po_stavke..." +msgid "Description" +msgstr "Opis" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Instaliraj" +msgid "Description of update" +msgstr "Opis nadogradnje" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "Po_stavke..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2313,9 +2335,8 @@ msgstr "Odbili ste nadograditi na novu inačicu Ubuntua" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Nadogradnju možete obaviti kasnije, otvaranjem Upravitelja nadogradnji i " @@ -2329,59 +2350,59 @@ msgid "Show and install available updates" msgstr "Pokaži i instaliraj moguće nadogradnje" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Prikaži verziju i izađi" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Direktorij koji sadrži podatkovne datoteke" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Provjeri ako je dostupno novo izdanje Ubuntua" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Provjera mogućnosti nadogradnje na noviju razvojnu verziju" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Nadogradi na najnoviju predloženu inačicu koju ponudi nadograditelj izdanja" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Nemoj se usredotočiti na kartu prilikom pokretanja" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Pokušajte pokrenuti nadogradnju distribucije" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Ne provjeravaj dostupnost novih dopuna prilikom pokretanja" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Testna nadogradnja sa sandbox aufs prekrivanjem" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Izvršavanje djelomične nadogradnje" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Prikaži opis paketa umjesto dnevnika promjena" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Pokušaj nadogradnju na najnovije izdanje koristeći nadograditelja iz $distro-" "proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2391,11 +2412,11 @@ "Trenutačno se podržani 'desktop' za sustave stolnih računala i 'server' za " "poslužiteljske sustave." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Pokreni odabrano sučelje" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2403,11 +2424,11 @@ "Provjeri je li novo izdanje distribucije dostupno i javi rezultat pute " "izlaznog kôda" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Provjera dostupnosti novog izdanja Ubuntua" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2415,68 +2436,68 @@ "Za informacije o nadogradnji posjetite:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Ne postoji novo izadnje" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Novo '%s' izdanje dostupno." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Pokrenite 'do-release-upgrade' za nadogradnju na novu inačicu." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Dostupna nadogradnja Ubuntu %(version)" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Odbili ste nadogradnju na Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Dodaj informacije za otklanjanje grešaka" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Pokaži nepodržane pakete na ovome računalu" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Prikaži podržane pakete na ovome računalu" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Prikaži sve pakete zajedno s njihovim statusom" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Prikaži sve pakete u obliku popisa" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Podrži sažetak statusa od '%s':" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "Imate %(num)s paketa (%(percent).1f%%) podržanih do %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "Imate %(num)s paketa (%(percent).1f%%) koji se ne mogu preuzeti" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "Imate %(num)s paketa (%(percent).1f%%) koji su nepodržani" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2484,124 +2505,153 @@ "Da biste vidjeli detalje, pokrenite sa --show-unsupported, --show-supported " "ili --show-all" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Više nije dostupno za preuzimanje:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Nepodržano: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Podržano do %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Nepodržano" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Neimplementirana metoda: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Datoteka na disku" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb paket" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Instaliraj paket koji nedostaje." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Paket %s ne bi smio biti instaliran." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb paket" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s treba biti instaliran kao ručno instaliran." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"Prilikom nadogradnje, ako je kdelibs4-dev instaliran, kdelibs5-dev mora biti " -"instaliran. Za detalje pogledajte bugs.launchpad.net, greška ##279621." - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i zastarsjeli zapisi u statusnoj datoteci" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Zastarjeli zapisi u dpkg statusu" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Zastarjeli dpkg status zapisi" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"Prilikom nadogradnje, ako je kdelibs4-dev instaliran, kdelibs5-dev mora biti " +"instaliran. Za detalje pogledajte bugs.launchpad.net, greška ##279621." + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s treba biti instaliran kao ručno instaliran." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Ukloni lilo s obizirom da je grub također instaliran.(Za detalje pogledajte " "grešku #314004)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Nakon što su informacije o paketima ažurirane, esencijalni paket '%s' " -#~ "nije pronađen, stoga se pokreće proces za prijavu greške." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Nadogradnja Ubuntua na inačicu 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "Označena je %(count)s dopuna." -#~ msgstr[1] "Označene su %(count)s dopune." -#~ msgstr[2] "Označeno je %(count)s dopuna." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Dobrodošli u Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Ove softverske dopune su objavljene otkako je objavljena ova inačica " -#~ "Ubuntua." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Dostupne su softverske dopune za ovo računalo." - -#~ msgid "Update Manager" -#~ msgstr "Upravitelj nadogradnji" - -#~ msgid "Starting Update Manager" -#~ msgstr "Pokretanje Upravitelja nadogradnjama" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Povezani ste pomoću bežičnog modema." - -#~ msgid "_Install Updates" -#~ msgstr "_Instaliraj nadogradnje" +#~ "Nakon što su informacije o paketima ažurirane, esencijalni paket '%s' " +#~ "nije pronađen, stoga se pokreće proces za prijavu greške." #~ msgid "Checking for a new ubuntu release" #~ msgstr "Provjeravanje za novo Ubuntu izdanje" @@ -2662,6 +2712,9 @@ #~ "Ako ih ne želite odmah instalirati, kasnije odaberite \"Upravitelj " #~ "nadogradnji\" u izborniku Aplikacija." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Nadogradnja Ubuntua na inačicu 11.10" + #~ msgid "0 kB" #~ msgstr "0 kB" diff -Nru update-manager-17.10.11/po/hu.po update-manager-0.156.14.15/po/hu.po --- update-manager-17.10.11/po/hu.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/hu.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # Copyright (C) 2005, Free Software Foundation, Inc. # Gabor Kelemen , 2005. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-21 06:54+0000\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Kiszolgáló a következőhöz: %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Fő kiszolgáló" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Egyéni kiszolgálók" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Nem határozható meg a sources.list bejegyzés" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Egyetlen csomagfájl sem található! Lehet, hogy nem Ubuntu lemezt, vagy más " "architektúrához tartozót helyezett a meghajtóba." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "A CD hozzáadása meghiúsult" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,13 +83,13 @@ "A hibaüzenet:\n" "„%s”" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Hibás állapotban levő csomag eltávolítása" msgstr[1] "Hibás állapotban levő csomagok eltávolítása" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -109,15 +110,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Lehet, hogy a kiszolgáló túlterhelt" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Törött csomagok" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -127,7 +128,7 @@ "segítségével." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -148,11 +149,11 @@ " * az Ubuntu által nem támogatott csomagok\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Ez valószínűleg átmeneti probléma, próbálkozzon később." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -160,16 +161,16 @@ "Ha ezek nem állnak fent, kérjük jelentse a hibát a terminálban kiadott " "„ubuntu-bug update-manager” parancs segítségével." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "A frissítés előkészítése sikertelen" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Hiba történt néhány csomag hitelesítése közben" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -179,7 +180,7 @@ "hálózati probléma okozza, ezért érdemes később újra megpróbálni. Az alábbi " "felsorolás a hitelesíthetetlen csomagokat tartalmazza." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -187,22 +188,22 @@ "A(z) „%s” nevű csomagot eltávolításra jelölte ki, de ez rajta van az " "eltávolítási feketelistán." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "A létfontosságú „%s” csomagot eltávolításra jelölte ki." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Kísérlet a feketelistára tett „%s” verzió telepítésére" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "„%s” nem telepíthető" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -211,11 +212,11 @@ "terminálban kiadott „ubuntu-bug update-manager” parancs segítségével." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "A meta-csomag megállapítása sikertelen" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -229,15 +230,15 @@ " A folytatás előtt telepítse a fenti csomagok egyikét a synaptic vagy az apt-" "get használatával." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Gyorsítótár beolvasása" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "A kizárolagos zárolás nem lehetséges" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -245,11 +246,11 @@ "Ez általában azt jelenti, hogy már fut egy másik csomagkezelő alkalmazás " "(például apt-get vagy aptitude). Kérem először zárja be azt az alkalmazást." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "A frissítés nem támogatott távoli kapcsolaton keresztül" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -263,11 +264,11 @@ "\n" "A frissítés most megszakad. Próbálja SSH nélkül." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Folytatja a futtatást SSH alatt?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -284,11 +285,11 @@ "Ha folytatja, egy újabb SSH-démon indul az alábbi porton: %s.\n" "Szeretné folytatni?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Új sshd indítása" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -299,7 +300,7 @@ "indul a(z) %s porton. Ha bármiféle probléma lép fel az aktuális SSH futása " "során, Ön továbbra is kapcsolódni tud majd a másik segítségével.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -312,30 +313,30 @@ "történik automatikusan. A port megnyitható például a következő módon:\n" "„%s”" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Nem lehet frissíteni" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" "Ez az eszköz nem támogatja a frissítést „%s” rendszerről „%s” rendszerre." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "A tesztkörnyezet beállítása meghiúsult" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Nem sikerült létrehozni a tesztkörnyezetet." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Teszt mód" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -350,18 +351,18 @@ "A mostantól a következő újraindításig a rendszerkönyvtárakban történő " "változások *nem* lesznek állandó érvényűek." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "A Python telepítése sérült. Javítsa ki a „/usr/bin/python” szimbolikus " "linket." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "A „debsig-verify” csomag telepítve van" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -371,12 +372,12 @@ "Távolítsa el a Synaptic vagy az „apt-get remove debsig-verify” parancs " "kiadásával és futtassa újra a frissítést." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "%s nem írható" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -386,11 +387,11 @@ "A(z) „%s” rendszerkönyvtár nem írható. A frissítés nem folytatódhat.\n" "Biztosítsa a rendszerkönyvtár írhatóságát." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Használja az interneten elérhető legújabb frissítéseket?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -411,16 +412,16 @@ "után nem sokkal.\n" "Ha a „Nem”-et választja, a telepítő nem fogja használni internetkapcsolatát." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "letiltva a(z) %s változatra frissítéskor" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Nem található érvényes tükör" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -440,11 +441,11 @@ "„Nem” kiválasztása megszakítja a frissítést." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Alapértelmezett források ismételt előállítása?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -458,11 +459,11 @@ "Hozzáadja az alap bejegyzéseket a következőhöz: „%s”? A „Nem” kiválasztása " "megszakítja a frissítést." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Érvénytelen tárolóinformációk" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -470,11 +471,11 @@ "A tároló frissítése érvénytelen fájlt eredményezett, ezért most elindul egy " "hibajelentési folyamat." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "A külső források letiltva" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -484,13 +485,13 @@ "frissítés után újraengedélyezheti őket a Szoftverforrások eszközzel, vagy a " "csomagkezelővel." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Nem konzisztens állapotú csomag" msgstr[1] "Nem konzisztens állapotú csomagok" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -509,11 +510,11 @@ "található hozzájuk megfelelő archívum. Telepítse újra a csomagot saját " "kezűleg, vagy távolítsa el a rendszerről." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Hiba történt a frissítés közben" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -521,13 +522,13 @@ "Hiba lépett fel a frissítés közben. Ez többnyire hálózati problémára utal. " "Kérem, ellenőrizze a hálózati kapcsolatot és próbálja újra." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Nincs elég szabad hely a merevlemezen" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -542,21 +543,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Módosítások előkészítése" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Biztosan el szeretné kezdeni a frissítést?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Frissítés megszakítva" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -564,12 +565,12 @@ "A frissítés visszavonásra kerül, és az eredeti rendszerállapot lesz " "visszaállítva. A frissítést később lehet folytatni." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "A frissítések nem tölthetők le" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -580,27 +581,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Hiba a módosítások rögzítése közben" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "A rendszer eredeti állapotának helyreállítása" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "A frissítések nem telepíthetők" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -608,7 +609,7 @@ "A frissítés megszakadt. A rendszer használhatatlan állapotban lehet. A " "helyreállítás azonnal indul (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -625,7 +626,7 @@ "fájlokat a jelentéshez.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -633,20 +634,20 @@ "A frissítés megszakadt. Ellenőrizze az internetkapcsolatát vagy a telepítési " "adathordozót, és próbálja újra. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Eltávolítja az elavult csomagokat?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Megtartás" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Eltávolítás" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -656,27 +657,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "A szükséges függőségek nincsenek telepítve" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "A következő függőség nincs telepítve: %s. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Csomagkezelő ellenőrzése" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "A frissítés előkészítése meghiúsult" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -684,11 +685,11 @@ "A rendszer előkészítése a frissítésre sikertelen, emiatt elindul egy " "hibajelentési folyamat." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "A frissítés előfeltételeinek lekérése meghiúsult" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -701,69 +702,69 @@ "\n" "Ezen kívül elindul egy hibajelentési folyamat is." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Tárolóinformációk frissítése" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Nem sikerült a CD-ROM hozzáadása" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Elnézést, a CD-ROM hozzáadása sikertelen." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Érvénytelen csomaginformációk" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Letöltés" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Frissítés" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "A frissítés befejeződött" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "A frissítés befejeződött, de hibák történtek a frissítési folyamat alatt." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Elavult szoftverek keresése" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "A rendszer frissítése befejeződött." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Az intelligens frissítés sikeresen befejeződött." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "Az evms használatban van" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -772,13 +773,13 @@ "A rendszer az „evms” kötetkezelőt használja a /proc/mounts alatt. Az „evms” " "szoftver már nem támogatott, kapcsolja ki és futtassa újra a frissítést." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "Videokártyája nem biztos, hogy teljesen támogatott lesz Ubuntu 12.04 LTS " "alatt." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -790,9 +791,9 @@ "https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx oldalt. Folytatni " "szeretné a frissítést?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -800,8 +801,8 @@ "A frissítés visszafoghatja a vizuális effektusokat, a játékok és a sok " "grafikai számítást igénylő alkalmazások teljesítményét." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -815,7 +816,7 @@ "\n" "Biztosan folytatja?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -829,11 +830,11 @@ "\n" "Biztosan folytatja?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Nem i686-os CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -845,11 +846,11 @@ "optimalizációkkal készült. Rendszere ezzel a hardverrel nem frissíthető új " "Ubuntu kiadásra." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Nem ARMv6 processzor" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -861,11 +862,11 @@ "optimalizációkkal készült. Ezen a hardveren nem frissíthető a rendszer új " "Ubuntu kiadásra." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Nem érhető el init" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -880,17 +881,17 @@ "\n" "Biztosan folytatja?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Tesztfrissítés aufs használatával" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "A megadott útvonalat használja frissíthető csomagokat tartalmazó CD lemez " "kereséséhez" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -898,58 +899,58 @@ "Használja a kezelőfelületet. Jelenleg elérhető: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*IDEJÉTMÚLT * ez az opció figyelmen kívül lesz hagyva" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Csak intelligens frissítés végrehajtása (nem írja újra a sources.list fájlt)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "GNU Screen támogatás kikapcsolása" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Adatkönyvtár beállítása" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Helyezze be a(z) „%s” adathordozót a(z) „%s” meghajtóba." #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "A letöltés befejeződött" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Fájl letöltése: %li / %li, (%sB/s)" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Kb. %s van hátra" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "%li. fájl letöltése (összesen: %li)" @@ -959,27 +960,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Módosítások alkalmazása" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "függőségi hibák - a csomag beállítatlan maradt" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "„%s” nem telepíthető" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -991,7 +992,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1003,27 +1004,27 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" "A beállítófájl összes módosítása elvész, ha lecseréli az újabb verzióra." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "A „diff” parancs nem található" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Végzetes hiba történt" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1035,13 +1036,13 @@ "frissítés megszakadt. Az eredeti sources.list /etc/apt/sources.list." "distUpgrade néven került mentésre." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl+C billentyűkombináció lenyomva" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1050,136 +1051,136 @@ "Biztos, hogy ezt akarja tenni?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Az esetleges adatvesztés elkerülése érdekében zárjon be minden nyitott " "alkalmazást és dokumentumot." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "A Canonical már nem támogatja (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Visszafejlesztendő (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Eltávolítandó (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Már nem szükséges (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Telepítendő (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Frissítendő (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Adathordozó-csere" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Különbség megjelenítése >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Különbség elrejtése" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Hiba" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Mégse" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Bezárás" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Terminál megjelenítése >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Terminál elrejtése" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Információ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Részletek" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Már nem támogatott: %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "%s eltávolítása" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "%s eltávolítása (automatikusan telepített)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "%s telepítése" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "%s frissítése" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Újraindítás szükséges" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Indítsa újra a rendszert a frissítés befejezéséhez" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "Újrain_dítás most" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1191,32 +1192,32 @@ "Lehet, hogy a rendszer használhatatlanná válik, ha most megszakítja a " "frissítést. Erősen ajánlott a frissítés folytatása!" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Megszakítja a frissítést?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li nap" msgstr[1] "%li nap" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li óra" msgstr[1] "%li óra" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li perc" msgstr[1] "%li perc" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1232,7 +1233,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1246,14 +1247,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1263,34 +1264,32 @@ "%s alatt 56k-s modem használatával." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "A letöltés körülbelül %s alatt fejeződik be ezen a kapcsolaton. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Felkészülés a frissítésre" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Új szoftvercsatornák lekérése" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Új csomagok letöltése" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "A frissítések telepítése" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Frissítés befejezése" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1307,28 +1306,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d csomag el lesz távolítva." msgstr[1] "%d csomag el lesz távolítva." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d új csomag lesz telepítve." msgstr[1] "%d új csomag lesz telepítve." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d csomag lesz frissítve." msgstr[1] "%d csomag lesz frissítve." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1339,7 +1338,7 @@ "\n" "Összes letöltendő adatmennyiség: %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1347,7 +1346,7 @@ "A frissítések telepítése órákat vehet igénybe. Ha a letöltés befejeződött, a " "folyamat már nem állítható meg." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1355,16 +1354,16 @@ "A frissítések letöltése és telepítése órákat vehet igénybe. Ha a letöltés " "befejeződött, a folyamat már nem állítható meg." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "A csomagok eltávolítása órákig is eltarthat. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "A szoftverek a számítógépen naprakészek." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1372,38 +1371,38 @@ "Nem állnak rendelkezésre frissítések a rendszeréhez. A frissítés most " "megszakad." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Újraindítás szükséges" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "A frissítés elkészült, de a befejezéshez újra kell indítani a rendszert. " "Újraindítja most?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "„%(file)s” hitelesítése ezzel: „%(signature)s” " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "„%s” kicsomagolása" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Nem sikerült futtatni a frissítőeszközt" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1411,35 +1410,35 @@ "Ez valószínűleg egy hiba a frissítőben. Kérjük küldjön egy hibajelentést az " "„ubuntu-bug update-manager” parancs futtatásával." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Frissítőeszköz aláírása" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Frissítőeszköz" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "A letöltés meghiúsult" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "A frissítés letöltése meghiúsult. Lehetséges, hogy hálózati probléma áll " "fenn. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Hitelesítés sikertelen" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1447,13 +1446,13 @@ "A frissítés hitelesítése meghiúsult. Probléma lehet a hálózattal vagy a " "kiszolgálóval. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "A kibontás meghiúsult" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1461,13 +1460,13 @@ "A frissítés kibontása meghiúsult. Probléma lehet a hálózattal vagy a " "kiszolgálóval. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Az ellenőrzés meghiúsult" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1475,15 +1474,15 @@ "A frissítés ellenőrzése meghiúsult. Probléma lehet a hálózattal vagy a " "kiszolgálóval. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "A frissítés nem futtatható!" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1492,13 +1491,13 @@ "felcsatolva. Kérjük csatolja újra nooexec kapcsolóval, majd próbálja újból a " "frissítést." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "A hibaüzenet: „%s”." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1510,73 +1509,73 @@ "megszakadt. Az eredeti sources.list /etc/apt/sources.list.distUpgrade néven " "került mentésre." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Megszakítás" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Lefokozott:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "A folytatáshoz nyomja meg az [ENTER] billentyűt" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Folytatja? [i/N] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Részletek [r]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "i" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "r" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Már nem támogatott: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Eltávolítandó: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Telepítendő: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Frissítendő: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Folytatja? [I/n] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1643,9 +1642,8 @@ msgstr "Disztribúciófrissítés" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Frissítés Ubuntu 11.10 kiadásra" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Ubuntu frissítése a 12.04 verzióra" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1663,85 +1661,86 @@ msgid "Terminal" msgstr "Terminál" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Kis türelmet, ez eltarthat egy ideig." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "A frissítés befejeződött" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Nem érhetők el a kiadási megjegyzések" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "A kiszolgáló túl lehet terhelve. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "A kiadási megjegyzések nem tölthetők le" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Kérjük ellenőrizze az internetkapcsolatát." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Frissítés" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Kiadási megjegyzések" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "További csomagfájlok letöltése..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "%s. fájl, összesen %s. Sebesség: %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "%s. fájl, összesen %s." -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Hivatkozás megnyitása a böngészőben" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Hivatkozás másolása a vágólapra" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" "%(current)li. fájl letöltése, összesen: %(total)li, sebesség: %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "%(current)li. fájl letöltése, összesen: %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Az Ön Ubuntu kiadása már nem támogatott." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1749,53 +1748,59 @@ "Nem fog több biztonsági frissítést kapni. Frissítsen egy újabb Ubuntu " "verzióra." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Frissítési információk" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Telepítés" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Név" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "%s verzió: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Nem található hálózati kapcsolat, a változásnapló információi nem tölthetők " "le." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Változások listájának letöltése…" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Kijelölés megszüntetése" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "_Összes kijelölése" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s frissítés kiválasztva." +msgstr[1] "%(count)s frissítés kiválasztva." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s kerül letöltésre." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "A frissítés már le van töltve, de még nincs telepítve." msgstr[1] "A frissítések már le vannak töltve, de még nincsenek telepítve." @@ -1803,11 +1808,18 @@ msgid "There are no updates to install." msgstr "Nincs telepíthető frissítés." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Ismeretlen letöltési méret." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1815,7 +1827,7 @@ "Nem tudni, mikor frissültek utoljára a csomaginformációk. Kattintson az " "„Ellenőrzés” gombra az információk frissítéséhez." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1824,14 +1836,14 @@ "A csomaginformációk legutoljára %(days_ago)s nappal ezelőtt frissültek.\n" "Nyomja meg alul az „Ellenőrzés” gombot az új frissítések kereséséhez." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "A csomaginformációk %(days_ago)s napja kerültek frissítésre." msgstr[1] "A csomaginformációk %(days_ago)s napja kerültek frissítésre." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1840,34 +1852,44 @@ msgstr[1] "A csomaginformációk %(hours_ago)s órája kerültek frissítésre." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "A csomaginformációk %s perce frissültek." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "A csomaginformációk épp most frissültek." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"A szoftverfrissítések kijavítják a programhibákat és biztonsági " +"sebezhetőségeket, illetve új szolgáltatásokat biztosítanak." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Szoftverfrissítések lehetnek elérhetők az Ön gépéhez." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Üdvözli az Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" -msgstr "" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "Ezeket a frissítéseket ezen Ubuntu verzió kiadása után bocsátották ki." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Szoftverfrissítések érhetők el a számítógéphez." + +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1879,7 +1901,7 @@ "távolítsa el a korábbi telepítések ideiglenes csomagjait a „sudo apt-get " "clean” parancs használatával." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1887,23 +1909,23 @@ "A számítógépet újra kell indítani a frissítések telepítésének befejezéséhez. " "A folytatás előtt mentse munkáját." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Csomaginformációk olvasása" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Csatlakozás…" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "Lehet, hogy nem lehetséges a frissítések keresése vagy telepítése." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "A csomaginformációk inicializálása meghiúsult" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1917,7 +1939,7 @@ "Kérem jelentse a frissítéskezelő hibáját és csatolja a következő " "hibaüzenetet:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1925,31 +1947,31 @@ "following error message:" msgstr "Megoldhatatlan probléma lépett fel a frissítés alatt." -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Új telepítés)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Méret: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Régi verzió: %(old_version)s, új verzió: %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "%s verzió" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "A kiadás frissítése most nem lehetséges" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1958,21 +1980,21 @@ "A kiadás frissítése jelenleg nem hajtható végre, próbálja újra később. A " "kiszolgáló üzenete: „%s”" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "A kiadásfrissítő eszköz letöltése" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Elérhető az új „%s” Ubuntu kiadás" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "A szoftverindex sérült" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1982,6 +2004,17 @@ "csomagkezelőt vagy futtassa a „sudo apt-get install -f” parancsot egy " "terminálban a probléma megoldása érdekében." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Elérhető az új „%s” kiadás." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Mégse" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Frissítések keresése" @@ -1991,22 +2024,18 @@ msgstr "Összes elérhető frissítés telepítése" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Mégse" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Változásnapló" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Frissítések" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Frissítéslista létrehozása" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2031,21 +2060,21 @@ " * nem hivatalos csomagok, amelyeket nem az Ubuntu biztosít\n" " * szokásos változások egy kiadás előtti Ubuntu verzióban." -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Változások listájának letöltése" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Egyéb frissítések (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" "A frissítés olyan forrásból érkezik amely nem támogatja a változásnaplókat." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2053,7 +2082,7 @@ "A módosítások listájának letöltése meghiúsult.\n" "Ellenőrizze az internetkapcsolatát." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2066,7 +2095,7 @@ "Elérhető verzió %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2079,7 +2108,7 @@ "Használja a http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "oldalt, míg nem válik hozzáférhetővé, vagy próbálja meg később." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2092,52 +2121,43 @@ "Használja a http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "oldalt, míg nem válik hozzáférhetővé, vagy próbálja meg később." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Hiba a kiadás felismerésekor" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "A következő hiba lépett fel a rendszer felmérése során: %s." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Fontos biztonsági frissítések" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Ajánlott frissítések" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Javasolt frissítések" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Visszaportolt csomagok" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Disztribúciófrissítések" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Egyéb frissítések" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Frissítéskezelő indítása" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"A szoftverfrissítések kijavítják a programhibákat és biztonsági " -"sebezhetőségeket, illetve új szolgáltatásokat biztosítanak." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Intelligens frissítés" @@ -2208,37 +2228,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Szoftverfrissítések" +msgid "Update Manager" +msgstr "Frissítéskezelő" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Szoftverfrissítések" +msgid "Starting Update Manager" +msgstr "Frissítéskezelő indítása" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Frissítés" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "frissítés" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Telepítés" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Módosítások" +msgid "updates" +msgstr "frissítés" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Leírás" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Frissítés leírása" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2246,25 +2256,35 @@ "Barangoló kapcsolaton keresztül csatlakozik, és a frissítés által használt " "adatokat kiszámlázhatják." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Vezeték nélküli modemen keresztül kapcsolódik." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Biztonságosabb a gépet a hálózati tápellátásra csatlakoztatni frissítés " "előtt." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Telepítés" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Módosítások" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Beállítások…" +msgid "Description" +msgstr "Leírás" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Telepítés" +msgid "Description of update" +msgstr "Frissítés leírása" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Beállítások…" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2287,9 +2307,8 @@ msgstr "Ön elutasította az Ubuntu új változatára történő frissítést." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Később is végrehajthatja a frissítést a Frissítéskezelő megnyitásával és a " @@ -2303,58 +2322,58 @@ msgid "Show and install available updates" msgstr "Rendelkezésre álló frissítések megjelenítése és telepítése" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Verziószám kiírása és kilépés" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Az adatfájlokat tartalmazó könyvtár" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Új Ubuntu kiadás elérhetőségének ellenőrzése" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Ellenőrzi, hogy lehetséges-e frissíteni a legújabb fejlesztői kiadásra" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "Frissítés a kiadásfrissítő legújabb ajánlott változatának segítségével" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Ne kerüljön fókuszba indításkor" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Kísérlet disztribúciófrissítés futtatására" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Ne ellenőrizze a frissítéseket indításkor" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Tesztfrissítés tesztkörnyezetben aufs használatával" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Intelligens frissítés futtatása" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Csomag leírásának megjelenítése a változásnapló helyett" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Kísérlet a legfrissebb kiadásra való áttérésre $distro-proposed kiadásról a " "frissítő használatával" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2364,11 +2383,11 @@ "Jelenleg a „desktop” (asztali rendszerek szabályos frissítése) és a " "„server” (kiszolgálórendszerek frissítése) módok támogatottak." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "A megadott előtét futtatása" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2376,11 +2395,11 @@ "Csak akkor ellenőrizze, ha egy új kiadás elérhetővé válik, az eredményt " "jelenítse meg a kimeneti értékben" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Új Ubuntu kiadás keresése" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2388,68 +2407,68 @@ "Frissítési információkért lásd:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Nem található új kiadás" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Elérhető az új „%s” kiadás." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "A frissítéshez futassa a „do-release-upgrade” parancsot." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Ubuntu %(version)s frissítés érhető el" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Ön elutasította az Ubuntu %s kiadásra történő frissítést" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Hibakeresési kimenet hozzáadása" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Nem támogatott csomagok megjelenítése ezen a gépen" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Támogatott csomagok megjelenítése ezen a gépen" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Minden csomag megjelenítése az állapotával együtt" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Összes csomag megjelenítése egy listában" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "„%s” támogatási összegzése:" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "%(num)s csomag (%(percent).1f%%) támogatott %(time)s-ig" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "%(num)s csomag (%(percent).1f%%) (már) nem tölthető le" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "%(num)s csomag (%(percent).1f%%) nem támogatott" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2457,54 +2476,71 @@ "Futassa a --show-unsupported, --show-supported vagy a --show-all kapcsolóval " "bővebb információkért" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Már nem tölthető le:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Nem támogatott: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "%s-ig támogatott:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Nem támogatott" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Megvalósítatlan metódus: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Egy fájl a lemezen" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb csomag" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Hiányzó csomag telepítése." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "A(z) %s csomagot telepíteni kell." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb csomag" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "A(z) %s csomagot saját kezűleg telepítettként kell megjelölni." +msgid "%i obsolete entries in the status file" +msgstr "%i elavult bejegyzés van az állapotfájlban" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "Elavult bejegyzések a dpkg állapotban" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "Elavult dpkg állapotbejegyzések" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2513,67 +2549,81 @@ "telepíteni kell. Részletekért lásd a bugs.launchpad.net #279621 számú " "hibáját." -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "%i elavult bejegyzés van az állapotfájlban" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "Elavult bejegyzések a dpkg állapotban" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "Elavult dpkg állapotbejegyzések" +msgid "%s needs to be marked as manually installed." +msgstr "A(z) %s csomagot saját kezűleg telepítettként kell megjelölni." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "A lilo eltávolítása, mivel a grub is telepítve van. (Lásd a #314004 számú " "hibát a részletekért)." -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "A csomaginformációk frissítése után a(z) „%s” alapvető csomag már nem " -#~ "található, ezért most elindul egy hibajelentési folyamat." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Ubuntu frissítése a 12.04 verzióra" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s frissítés kiválasztva." -#~ msgstr[1] "%(count)s frissítés kiválasztva." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Üdvözli az Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Ezeket a frissítéseket ezen Ubuntu verzió kiadása után bocsátották ki." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Szoftverfrissítések érhetők el a számítógéphez." - -#~ msgid "Update Manager" -#~ msgstr "Frissítéskezelő" - -#~ msgid "Starting Update Manager" -#~ msgstr "Frissítéskezelő indítása" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Vezeték nélküli modemen keresztül kapcsolódik." - -#~ msgid "_Install Updates" -#~ msgstr "_Telepítés" +#~ "A csomaginformációk frissítése után a(z) „%s” alapvető csomag már nem " +#~ "található, ezért most elindul egy hibajelentési folyamat." #~ msgid "Checking for a new ubuntu release" #~ msgstr "Új Ubuntu-kiadás keresése" @@ -2710,6 +2760,9 @@ #~ "kérjük jelentse a hibát a terminálban kiadott „ubuntu-bug update-manager” " #~ "parancs segítségével." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Frissítés Ubuntu 11.10 kiadásra" + #~ msgid "" #~ "If you don't want to install them now, choose \"Update Manager\" from the " #~ "Administration menu later." diff -Nru update-manager-17.10.11/po/hy.po update-manager-0.156.14.15/po/hy.po --- update-manager-17.10.11/po/hy.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/hy.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2010. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-03-11 21:39+0000\n" "Last-Translator: Serj Safarian \n" "Language-Team: Armenian \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f ՄԲ" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "" @@ -42,30 +43,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Հիմնակամ սպասարկիչ" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -75,13 +76,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -96,22 +97,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -124,65 +125,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -191,25 +192,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -218,11 +219,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -233,11 +234,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -245,7 +246,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -254,29 +255,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -286,28 +287,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -315,11 +316,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -331,16 +332,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -353,11 +354,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -366,34 +367,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -406,23 +407,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -433,32 +434,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -466,33 +467,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -503,26 +504,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -530,37 +531,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -568,79 +569,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -648,16 +649,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -666,7 +667,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -675,11 +676,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -687,11 +688,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -699,11 +700,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -713,71 +714,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -787,27 +788,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -817,7 +818,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -826,26 +827,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -853,147 +854,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1001,32 +1002,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1042,7 +1043,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1056,14 +1057,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1071,34 +1072,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1111,28 +1110,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1140,145 +1139,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1286,73 +1285,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1410,7 +1409,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1429,164 +1428,180 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1595,34 +1610,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1630,29 +1653,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1661,7 +1684,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1669,58 +1692,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1730,22 +1763,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1759,26 +1788,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1787,7 +1816,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1796,7 +1825,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1805,47 +1834,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1906,54 +1929,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" -msgstr "" +msgid "Update Manager" +msgstr "Թարմացումների կառավարիչ" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1978,7 +2004,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1990,219 +2016,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Թարմացումների կառավարիչ" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" diff -Nru update-manager-17.10.11/po/id.po update-manager-0.156.14.15/po/id.po --- update-manager-17.10.11/po/id.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/id.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-12-06 06:42+0000\n" "Last-Translator: Bagus Herlambang \n" "Language-Team: Indonesian \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Server untuk %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Server utama" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Server custom" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Tidak dapat mengkalkulasi masukan sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Tidak dapat menemukan berkas paket apapun, mungkin ini bukan Disk Ubuntu " "atau arsitektur yang salah?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Gagal untuk menambahkan CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,12 +83,12 @@ "Pesan kesalahan adalah: \n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Hapus paket yang kondisinya buruk" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -104,15 +105,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Server mungkin kelebihan beban" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Paket rusak" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -122,7 +123,7 @@ "synaptic atau apt-get sebelum melanjutkan hal ini." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -144,11 +145,11 @@ " * Perangkat lunak yang tidak secara resmi disediakan oleh Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Ini sepertinya masalah sementara saja, coba lagi nanti." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -156,16 +157,16 @@ "Bila tak satupun yang berlaku, mohon laporkan kutu ini memakai perintah " "'ubuntu-bug update-manager' dalam suatu terminal." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Tidak dapat menghitung peningkatan versi" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Kesalahan membuktikan keabsahan beberapa paket" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -175,7 +176,7 @@ "mungkin karena masalah pada jaringan. Anda dapat mencobanya beberapa saat " "lagi. Lihat senarai dari paket yang belum terbukti keabsahannya dibawah ini." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -183,22 +184,22 @@ "Paket '%s' ditandai untuk dibuang namun paket tersebut berada pada daftar " "hitam buangan." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Paket penting '%s' ditandai untuk dibuang" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Mencoba memasang versi '%s' yang dicekal" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Tidak dapat memasang '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -207,11 +208,11 @@ "sebagai kutu memakai 'ubuntu-bug update-manager' dalam suatu terminal." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Tidak dapat menebak paket-meta" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -225,15 +226,15 @@ " Silakan pasang terlebih dahulu salah satu paket di atas dengan menggunakan " "synaptic atau apt-get sebelum melanjutkan." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Membaca cache" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Tidak bisa memperoleh penguncian eksklusif" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -242,11 +243,11 @@ "berjalan (seperti apt-get atau aptitude). Harap tutup aplikasi tersebut " "terlebih dahulu." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Pemutakhiran melalui koneksi jarak jauh tidak didukung" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -260,11 +261,11 @@ "\n" "Peningkatan akan dibatalkan sekarang. Silakan coba lagi tanpa ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Lanjutkan menjalankan di bawah SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -281,11 +282,11 @@ "Jika Anda lanjutkan, daemon ssh tambahan akan dijalankan di port '%s'.\n" "Tetap lanjutkan peningkatan?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Memulai sshd tambahan" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -296,7 +297,7 @@ "dijalankan pada port '%s'. Jika terjadi kesalahan dengan ssh yang berjalan " "Anda tetap dapat menyambung ke ssh tambahan.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -309,29 +310,29 @@ "secara otomatis. Anda dapat membuka port dengan mis.:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Tidak dapat meningkatkan versi" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Naik tingkat dari '%s' ke '%s' tidak didukung oleh perkakas ini." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Pengaturan Sandbox gagal" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Tidak bisa menciptakan lingkungan Sandbox" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Modus Sandbox" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -341,17 +342,17 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Instalasi python anda rusak. Silahkan perbaiki symlink '/usr/bin/python'." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Paket 'debsig-verify' dipasang" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -361,12 +362,12 @@ "Silahkan menghapusnya dengan menjalankan terlebih dahulu synaptic atau 'apt-" "get remove debsig-verify' dan jalankan peningkatan lagi." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -374,11 +375,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Ikutkan juga pembaruan terakhir dari Internet?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -400,16 +401,16 @@ "Jika Anda menjawab 'tidak' di sini, jaringan tidak akan digunakan sama " "sekali." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "dimatikan untuk melakukan peningkatan ke %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Tidak menemukan mirror yang valid" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -429,11 +430,11 @@ "Bila anda memilih 'Tidak' peningkatan akan dibatalkan." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Membuat sumber baku?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -447,21 +448,21 @@ "Perlukah entri baku bagi '%s' ditambahkan? Bila Anda memilih 'Tidak', " "peningkatan akan dibatalkan." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Informasi gudang tidak valid" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Sumber dari pihak ketiga dimatikan" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -471,12 +472,12 @@ "dapat mengaktifkan kembali setelah peningkatan versi dengan alat 'software-" "properties' atau pengelola paket anda." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Paket dalam keadaan tidak konsisten" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -491,11 +492,11 @@ "tapi tidak ditemukan arsip untuknya. Silakan pasang ulang paket secara " "manual atau hapuslah dari sistem." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Kesalahan pada waktu pemutakhiran" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -503,13 +504,13 @@ "Terjadi masalah pada waktu pemutakhiran. Ini biasanya karena masalah " "jaringan, silakan periksa koneksi jaringan anda dan ulangi." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Kapasitas cakram tidak mencukupi" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -524,21 +525,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Menghitung perubahan" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Apakah anda ingin memulai pemutakhiran?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Peningkatan dibatalkan" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -546,12 +547,12 @@ "Peningkatan kini akan dibatalkan dan keadaan sistem asli akan dikembalikan. " "Anda dapat meneruskan peningkatan di lain waktu." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Tidak dapat mengunduh pemutakhiran" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -562,27 +563,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Kesalahan pada waktu commit" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Sistem dikembalikan ke keadaan awal" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Tidak dapat menginstal pemutakhiran" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -591,7 +592,7 @@ "dapat dipakai. Suatu pemulihan akan dijalankan sekarang (dpkg --configure -" "a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -602,7 +603,7 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -610,20 +611,20 @@ "Peningkatan telah digugurkan. Silakan periksa koneksi Internet atau media " "pemasangan Anda dan coba lagi. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Hapus paket usang?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Simpan" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Hapus" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -633,37 +634,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Dependensi yang dibutuhkan belum terpasang." -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Dependensi yang dibutuhkan '%s' belum terpasang. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Memeriksa manajer paket" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Persiapan peningkatan versi gagal" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Gagal mendapatkan persiapan upgrade" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -671,69 +672,69 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Memutakhirkan informasi gudang" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Gagal untuk menambahkan ke cdrom" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Maaf, penambahan cdrom tidak berhasil." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Informasi paket tidak valid" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Menjemput" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Meng-upgrade" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Peningkatan versi selesai" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "Peningkatan telah lengkap tetapi ada masalah selama proses peningkatan." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Mencari perangkat lunak usang" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Upgrade sistem telah selesai." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Pemutakhiran parsial selesai." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms sedang dipakai" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -743,11 +744,11 @@ "'evms' tidak didukung lagi, silakan mematikannya dan jalankan lagi " "peningkatan setelahnya." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -755,9 +756,9 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -765,8 +766,8 @@ "Peningkatan mungkin mengurangi efek-efek desktop, dan kinerja pada permainan " "dan program-program lain yang intensif grafis." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -780,7 +781,7 @@ "\n" "Anda ingin melanjutkan?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -794,11 +795,11 @@ "\n" "Anda ingin melanjutkan?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "CPU i686 tidak ditemukan" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -810,11 +811,11 @@ "i686 sebagai arsitektur minimal. Tak mungkin untuk meningkatkan sistem Anda " "ke rilis Ubuntu yang baru dengan perangkat keras yang ada." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "CPU ARMv6 tidak ada" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -826,11 +827,11 @@ "arsitektur minimal. Tidak mungkin meningkatkan sistem Anda ke rilis baru " "Ubuntu dengan perangkat keras ini." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Tidak ada 'init' yang tersedia" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -845,17 +846,17 @@ "\n" "Anda yakin akan melanjutkan?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Peningkatan Sandbox menggunakan aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Pakai path yang diberikan untuk mencari cdrom dengan paket-paket yang dapat " "ditingkatkan versinya" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -863,58 +864,58 @@ "Gunakan frontend. Kini tersedia: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*KEDALUARSA* opsi ini akan diabaikan" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Melakukan pemutakhiran sebagian (tidak perlu menulis ulang sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Matikan dukungan screen GNU" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Tentukan datadir" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Silakan masukkan '%s' ke dalam penggerak '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Pengunduhan selesai" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Mengambil berkas %li dari %li pada %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Tersisa sekitar %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Mengunduh berkas %li dari %li" @@ -924,27 +925,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Sahkan perubahan" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "masalah ketergantungan - dibiarkan tidak terkonfigurasi" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Tidak dapat instal '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -956,7 +957,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -967,7 +968,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -976,20 +977,20 @@ "konfigurasi apabila anda memilih untuk menimpanya dengan versi yang lebih " "baru." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Perintah 'diff' tidak dapat ditemukan" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Terjadi kesalahan fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1002,13 +1003,13 @@ "sources.list asli Anda telah disimpan dalam /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c ditekan" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1017,135 +1018,135 @@ "rusak. Apakah Anda yakin ingin melakukannya?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Untuk mencegah kehilangan data silakan tutup seluruh aplikasi dan dokumen." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Tidak lagi didukung oleh Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Turun Tingkatkan (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Hapus (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Tidak lagi dibutuhkan (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Pasang (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Tingkatkan (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Perubahan Media" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Tunjukkan Perbedaan >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Sembunyikan Perbedaan" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Kesalahan" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Batal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Tutup" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Tampilkan Terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Sembunyikan Terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Informasi" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Rincian" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Tidak lagi didukung %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Hapus %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Hilangkan (sebelumnya diinstall otomatis) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Instal %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Upgrade %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Diperlukan reboot" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Mulai ulang sistem untuk menyelesaikan upgrade" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Mulai Ulang Sekarang" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1157,29 +1158,29 @@ "Sistem bisa berada dalam kondisi tidak dapat digunakan jika anda membatalkan " "pemutakhiran. Anda sangat disarankan untuk melanjutkan pemutakhiran." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Batalkan Peningkatan Versi?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li hari" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li jam" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li menit" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1194,7 +1195,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1208,14 +1209,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1225,34 +1226,32 @@ "1Mbit dan sekitar %s dengan modem 56k." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Pengunduhan akan mengambil sekitar %s koneksi Anda. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Persiapan untuk naik tingkat" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Sedang mendapatkan kanal-2 perangkat lunak baru" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Sedang mendapatkan paket-2 baru" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Memasang upgrade" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Membersihkan" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1266,25 +1265,25 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d paket akan dihapus." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d paket baru akan dipasang." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d paket akan diupgrade." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1295,28 +1294,28 @@ "\n" "Anda harus mengunduh sebanyak %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1324,38 +1323,38 @@ "Tidak ada peningkatan versi yang tersedia untuk sistem anda. Proses " "peningkatan versi akan dibatalkan." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Diperlukan reboot" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Upgrade telah selesai dan sistem harus direboot. Apakah anda ingin melakukan " "ini sekarang" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Tidak dapat menjalankan alat upgrade" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1363,33 +1362,33 @@ "Ini sangat boleh jadi suatu kutu pada perkakas peningkatan. Silakan laporkan " "ini sebagai kutu memakai perintah 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Tanda tangan peralatan upgrade" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Peralatan upgrade" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Gagal untuk fetch" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Gagal meng-fetch upgrade. Terjadi masalah pada jaringan. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Otentikasi gagal" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1397,13 +1396,13 @@ "Otentikasi upgrade gagal. Mungkin terjadi masalah dengan jaringan atau " "dengan server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Gagal mengekstrak" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1411,28 +1410,28 @@ "Gagal mengekstrak upgrade. Mungkin terjadi masalah dengan jaringan atau " "dengan server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Verifikasi gagal" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" "Pemeriksaan peningkatan gagal. Mungkin ada masalah jaringan atau server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Tak dapat menjalankan pemutakhiran" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1440,13 +1439,13 @@ "Ini biasanya disebabkan oleh sistem dimana /tmp dikait noexec. Silakan kait " "ulang tanpa noexec dan jalankan peningkatan lagi." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Pesan kesalahannya adalah '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1458,73 +1457,73 @@ "Peningkatan telah digugurkan.\n" "sources.list asli Anda disimpan di /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Membatalkan" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Turun tingkat:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Untuk melanjutkan silakan tekan [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Lanjutkan [yT] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Rincian [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "t" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Tidak lagi didukung: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Hapus: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Pasang: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Upgrade: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Lanjutkan [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1591,9 +1590,8 @@ msgstr "Upgrade Distribusi" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Meningkatkan Ubuntu ke versi 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1611,147 +1609,161 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Silakan tunggu, hal ini membutuhkan beberapa waktu." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Pemutakhiran selesai" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Tidak dapat menemukan catatan luncuran" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Server mungkin kelebihan muatan " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Tidak dapat mengunduh catatan luncuran" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Silakan periksa koneksi internet anda." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Upgrade" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Catatan Luncuran" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Mengunduh berkas paket tambahan..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Berkas %s dari %s pada %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Berkas %s dari %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Buka Tautan pada Penjelajah." -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Salin Tautan ke Clipboard" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Mengunduh berkas %(current)li dari %(total)li dengan %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Mengunduh berkas %(current)li dari %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Rilis Ubuntu Anda sudah tidak didukung lagi." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Informasi peningkatan" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Pasang" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Versi %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Tak ada koneksi jaringan yang terdeteksi, Anda tak bisa mengunduh informasi " "changelog." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Mengunduh senarai dari perubahan..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Lepas Semua" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Pilih Semu_a" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s pemutakhiran telah dipilih." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s akan diunduh." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "Pemutakhiran telah selesai diunduh, namun belum terpasang" +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Ukuran unduhan tidak diketahui." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1759,7 +1771,7 @@ "Tidak diketahui kapan informasi paket terakhir diperbarui. Silakan klik " "tombol 'Periksa' untuk memperbarui informasi." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1769,13 +1781,13 @@ "Tekan tombol 'Periksa' di bawah untuk memeriksa pembaruan perangkat lunak " "baru." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "Informasi paket terakhir diperbarui %(days_ago)s hari yang lalu" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1783,34 +1795,44 @@ msgstr[0] "Informasi paket terakhir diperbarui %(hours_ago)s jam yang lalu." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Informasi paket terakhir diperbarui sekitar %s menit yang lalu." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Informasi paket baru saja diperbarui." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Pemutakhiran perangkat lunak dapat memperbaiki masalah, menghilangkan " +"kerentanan pada keamanan dan menyediakan fitur baru." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Pembaruan perangkat lunak mungkin tersedia untuk komputer Anda." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Selamat datang di Ubuntu" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1822,7 +1844,7 @@ "sampah dan hapus paket temporer dari proses instalasi sebelumnya dengan " "menggunakan 'sudo apt-get clean'." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1830,25 +1852,25 @@ "Komputer perlu di restart untuk menyelesaikan proses instalasi update. " "Silakan simpan pekerjaan Anda sebelum melanjutkan." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Sedang membaca informasi paket" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Menyambung..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Anda mungkin tidak bisa mengecek pemutakhiran atau mengunduh peningkatan " "terbaru." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Tidak dapat menginisialisasi informasi paket" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1862,7 +1884,7 @@ "Silakan laporkan kesalahan paket 'update-manager' ini dan sertakan pesan " "kesalahan berikut:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1874,31 +1896,31 @@ "Silakan laporkan kesalahan paket 'update-manager' ini dan sertakan pesan " "kesalahan berikut:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Pemasangan baru)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Ukuran: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Dari versi %(old_version)s ke %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Versi %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Peningkatan rilis saat ini tak mungkin" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1907,21 +1929,21 @@ "Peningkatan rilis kini tak bisa dilakukan, silakan coba lagi nanti. Server " "melaporkan: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Sedang mengunduh alat peningkatan rilis" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Rilis baru Ubuntu '%s' tersedia" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Indeks perangkat lunak telah rusak" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1931,6 +1953,17 @@ "Silakan gunakan manajer paket \"Synaptic\" atau jalankan \"sudo apt-get " "install -f\" dalam terminal untuk memperbaiki persoalan ini." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Rilis baru '%s' sudah tersedia." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Batal" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Periksa adanya Pembaruan" @@ -1940,22 +1973,18 @@ msgstr "Pasang Semua Pembaruan Yang Tersedia" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Batal" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Membangun Daftar Pemutakhiran" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1979,20 +2008,20 @@ " * Perangkat lunak yang tidak secara resmi disediakan oleh Ubuntu\n" " * Perubahan normal pada sebuah versi pre-release Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Mengunduh log perubahan" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Pembaruan lainnya (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "Pemutakhiran ini tak datang dari sumber yang mendukung changelog." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2000,7 +2029,7 @@ "Gagal mengunduh senarai dari perubahan. \n" "Silakan periksa koneksi Internet anda." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2013,7 +2042,7 @@ "Versi tersedia: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2026,7 +2055,7 @@ "Silakan gunakan http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "hingga perubahannya tersedia atau coba lagi nanti." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2039,52 +2068,43 @@ "Silakan gunakan http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "sampai perubahan tersedia atau coba lagi nanti." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Gagal mendeteksi distribusi" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Kesalahan '%s' terjadi ketika memeriksa sistem apa yang anda gunakan." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Pemutakhiran keamanan yang penting" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Pembaruan yang disarankan" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Pemutakhiran yang disarankan" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backports" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Pemutakhiran distribusi" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Pemutakhiran lain" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Memulai Pengelola Pemutakhiran" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Pemutakhiran perangkat lunak dapat memperbaiki masalah, menghilangkan " -"kerentanan pada keamanan dan menyediakan fitur baru." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "Peningkatan Versi Sebagian" @@ -2157,37 +2177,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Perangkat Lunak Mutakhir" +msgid "Update Manager" +msgstr "Manajer Pemutakhiran" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Perangkat Lunak Mutakhir" +msgid "Starting Update Manager" +msgstr "Memulai Pengelola Pemutakhiran" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "U_pgrade" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "pembaruan" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Pasang" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Perubahan" +msgid "updates" +msgstr "pembaruan" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Deskripsi" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Penjelasan tentang pemutakhiran" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2195,25 +2205,35 @@ "Anda terhubung melalui roaming dan mungkin akan ditagih untuk sejumlah data " "yang terpakai untuk pembaruan ini." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Anda terhubung melalui modem nirkabel." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Lebih aman untuk menghubungkan komputer ke listrik AC sebelum melakukan " "pembaruan." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Instal Update" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Perubahan" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Pengaturan..." +msgid "Description" +msgstr "Deskripsi" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Pasang" +msgid "Description of update" +msgstr "Penjelasan tentang pemutakhiran" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Pengaturan..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2238,9 +2258,8 @@ msgstr "Anda sudah menolak peningkatan ke Ubuntu yang baru." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Anda bisa melakukan upgrade di saat yang lain dengan membuka Manajer " @@ -2254,59 +2273,59 @@ msgid "Show and install available updates" msgstr "Tampilkan dan instal pemutakhiran yang tersedia" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Pelihatkan versi dan keluar" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Direktori yang berisi berkas data tersebut" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Periksa apakah ada rilis baru Ubuntu" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Memeriksa bila menaikkan versi ke rilis pengembangan terakhir mungkin" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Tingkatkan menggunakan versi terbaru yang ditawarkan dari peningkat rilis." -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Jangan fokus pada peta ketika memulai" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Mencoba menjalankan dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Jangan memeriksa pembaruan pada saat dimulai" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Coba peningkatan dengan suatu overlay aufs sandbox" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Menjalankan peningkatan versi sebagian" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Coba penaiktingkatan ke rilis terakhir menggunakan penaik tingkat dari " "$distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2316,11 +2335,11 @@ "Saat ini, 'desktop' untuk naik tingkat reguler dari sistem desktop dan " "'server' untuk sistem server adalah didukung." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Jalankan frontend yang dinyatakan" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2328,11 +2347,11 @@ "Hanya cek jika distribusi terbaru sudah tersedia dan laporkan hasilnya " "melalui kode keluar." -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2340,169 +2359,213 @@ "Untuk informasi peningkatan, silakan kunjungi:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Tidak ada rilis baru yang ditemukan" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Rilis baru '%s' sudah tersedia." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Jalankan 'do-release-upgrade' untuk meningkatkannya." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" -msgstr "Peningkatan ke Ubuntu %(version) Tersedia" +msgstr "Peningkatan ke Ubuntu %(version)s Tersedia" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Anda telah menolak peningkatan ke Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Metode yang belum diimplementasikan: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Sebuah berkas di disk" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "paket .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Pasang paket yang hilang." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Paket %s sebaiknya diinstal." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "paket .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s perlu ditandai sebagai yang dipasang secara manual" - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"Ketika meningkatkan, bila kdelibs4-dev terpasang, kdelibs5-dev perlu " -"dipasang. Lihat bugs.launchpad.net, kutu #279621 untuk rincian." - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i entri usang pada berkas status" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Entri usang pada status dpkg" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Entri status dpkg yang usang" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"Ketika meningkatkan, bila kdelibs4-dev terpasang, kdelibs5-dev perlu " +"dipasang. Lihat bugs.launchpad.net, kutu #279621 untuk rincian." + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s perlu ditandai sebagai yang dipasang secara manual" + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Hapus lilo karena grub terpasang juga. (lihat kutu #314004 untuk informasi " "lebih lanjut.)" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s pemutakhiran telah dipilih." - -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" - -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Selamat datang di Ubuntu" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Manajer Pemutakhiran" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "Starting Update Manager" -#~ msgstr "Memulai Pengelola Pemutakhiran" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Anda terhubung melalui modem nirkabel." +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "_Instal Update" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" #~ "Fetching and installing the upgrade can take several hours. Once the " @@ -2553,6 +2616,10 @@ #~ "Perangkat keras grafis Anda mungkin tidak sepenuhnya didukung di Ubuntu " #~ "11.04" +#~ msgid "The update has already been downloaded, but not installed" +#~ msgid_plural "The updates have already been downloaded, but not installed" +#~ msgstr[0] "Pemutakhiran telah selesai diunduh, namun belum terpasang" + #~ msgid "Your system is up-to-date" #~ msgstr "Sistem Anda mutakhir" @@ -2598,6 +2665,9 @@ #~ "dan Anda mungkin mendapat masalah setelah peningkatan. Apakah Anda ingin " #~ "melanjutkan peningkatan?" +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Meningkatkan Ubuntu ke versi 11.10" + #~ msgid "" #~ "These software updates have been issued since this version of Ubuntu was " #~ "released. If you don't want to install them now, choose \"Update Manager" diff -Nru update-manager-17.10.11/po/is.po update-manager-0.156.14.15/po/is.po --- update-manager-17.10.11/po/is.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/is.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-20 09:37+0000\n" "Last-Translator: Sigurpáll Sigurðsson \n" "Language-Team: Icelandic \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "%(size).0f KB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Netþjónn fyrir %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Aðalnetþjónn" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Sérsniðnir netþjónar" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Tölvan fann engar pakkaskrár, er þetta örugglega Ubuntu-diskur eða kannski " "vitlausa gerðin?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Gat ekki bætt við geisladisknum" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -83,13 +84,13 @@ "Villuskilaboðin voru:\n" "‚%s‘" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Fjarlægja pakka sem er í slæmu ástandi" msgstr[1] "Fjarlægja pakka sem eru í slæmu ástandi" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -110,15 +111,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Netþjónninn gæti verið undir miklu álagi" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Bilaðir pakkar" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -128,7 +129,7 @@ "haldið." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -149,11 +150,11 @@ " * Þú hefur náð í hugbúnaðarpakka sem eru ekki á vegum Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Þetta er væntanlega tímabundið vandamál. Reyndu aftur síðar." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -161,16 +162,16 @@ "Ef ekkert af þessu á við, þá vinsamlegast tilkynntu þessa lús með því að " "nota skipunina 'ubuntu-bug update-manager' í útstöð." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Gat ekki reiknað út uppfærsluna" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Villa kom upp við auðkenningu nokkra pakka" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -180,7 +181,7 @@ "netvandamál- reyndu aftur síðar. Að neðan er listi yfir þá pakka sem ekki " "tókst að staðfesta." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -188,22 +189,22 @@ "Gefin var skipun um að fjarlægja pakkann ‚%s‘ en það er bannað að fjarlægja " "hann." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Það á að fjarlægja pakkann ‚%s‘ en hann er ómissandi." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Reyni að setja upp svartlistaða útgáfu ‚%s‘" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Gat ekki sett upp ‚%s‘" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -212,11 +213,11 @@ "sem lús með því að nota 'ubuntu-bug update-manager' í útstöð." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Get ekki giskað á lýsipakka" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -230,15 +231,15 @@ " Settu upp einn af áðurnefndum pökkum með því að nota Synaptic-pakkastjórann " "eða með því að nota apt-get áður en þú heldur áfram." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Les skyndiminni" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Fékk ekki útilokunarlæsingu" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -246,11 +247,11 @@ "Þetta þýðir líklega að annar pakkastjóri (eins og ‚apt-get‘ eða ‚aptitude‘) " "sé í gangi. Vinsamlegast lokaðu því forriti fyrst." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Uppfærslur yfir fjartengingu eru óstuddar" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -259,11 +260,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Viltu halda áfram að nota SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -274,11 +275,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Ræsi annað sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -288,7 +289,7 @@ "Til að auðvelda bata þá mun auka sshd keyra í tenginum ‚%s‘. Ef eitthvað fer " "úrskeyðis við að keyra SSH þá er hægt að tengjast við hina tenginguna.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -297,29 +298,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Get ekki uppfært" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Þú getur ekki uppfært frá ‚%s‘ yfir í ‚%s' með þessu forriti." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Uppsetning sandkassa mistókst" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Það tókst ekki að búa til sandkassann." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Sandkassahamur" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -329,18 +330,18 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Það er eitthvað að python uppsetningunni þinni. Reyndu að laga ‚/usr/bin/" "python‘-vísunina." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Pakkinn 'debsig-verify' er uppsettur" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -350,12 +351,12 @@ "Fjarlægðu hann með synaptic pakkastjóranum eða með því að nota ‚apt-get " "remove debsig-verify‘ fyrst og keyra uppfærsluna aftur." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Getur ekki skrifað í '%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -363,11 +364,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Viltu láta nýjar uppfærslur af netinu fylgja með?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -387,16 +388,16 @@ "þetta ekki en þú ættir að uppfæra kerfið þegar samt sem áður.\n" "Netið verður ekki notað ef þú velur að gera þetta ekki." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "óvirkt að uppfæra til %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Enginn spegill fannst" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -409,11 +410,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Búa til sjálfgefnar uppsprettur?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -426,21 +427,21 @@ "Viltu að tölvan bæti inn færslu fyrir ‚%s‘ eða viltu velja ‚Nei‘ og hætta " "við uppfærsluna?" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Ógildar upplýsingar um gagnahirslu" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Frumgögn frá þriðja aðila voru gerð óvirk" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -450,13 +451,13 @@ "list‘. Þú getur virkjað þá seinna með tólinu ‚software-properties‘ eða með " "pakkastjóranum þínum." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Pakkinn er í versnandi ásigkomulagi" msgstr[1] "Pakkarnir eru í versnandi ásigkomulagi" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -475,11 +476,11 @@ "þeir fundust hins vegar ekki í gagnahirslunni. Þú verður því að setja þá upp " "handvirkt eða fjarlægja af tölvunni." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Villa kom upp í uppfærslu" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -487,13 +488,13 @@ "Það kom upp villa við að uppfæra tölvuna. Þetta er oftast vandamál með netið " "þannig að best væri að athuga nettenginguna og reyna aftur." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Ekki er nóg pláss á tölvunni" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -504,32 +505,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Reikna út breytingar" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Viltu hefja uppfærsluna?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Það var hætt við uppfærsluna" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Gat ekki sótt uppfærslurnar" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -537,33 +538,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Villa við staðfestingu" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Gat ekki sett upp uppfærslurnar" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -574,26 +575,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Viltu fjarlægja úrelta pakka?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Halda" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Fjarlægja" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -603,37 +604,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Það er ekki búið að setja upp nauðsynleg ákvæði" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Það er ekki búið að setja upp ákvæðið ‚%s‘ sem er nauðsynlegt. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Athuga pakkastjórann" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Undirbúningur fyrir uppfærslu mistókst" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Það tókst ekki að útvega forsendur uppfærslunnar" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -641,68 +642,68 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Uppfæri upplýsingar um gagnahirslur" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Gat ekki bætt við geisladisknum" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Ógildar pakkaupplýsingar" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Sæki" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Uppfæri" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Uppfærslu lokið" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Leita að úreltum hugbúnaði" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Stýrikerfisuppfærslu er lokið." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Takmarkaðri uppfærslu er lokið." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "‚evms‘ í notkun" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -712,11 +713,11 @@ "Hugbúnaðurinn ‚evms‘ er ekki lengur studdur, slökktu á honum og keyrðu " "uppfærsluna aftur að því loknu." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -724,9 +725,9 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -734,8 +735,8 @@ "Þá má vera að brellur, leikir og önnur forrit sem nota skjákortið mikið " "virki ekki eins vel að uppfærslu lokinni." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -749,7 +750,7 @@ "\n" "Viltu halda áfram?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -763,11 +764,11 @@ "\n" "Viltu halda áfram?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -775,11 +776,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Enginn ARMv6-örgjörvi" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -790,11 +791,11 @@ "í karmic þurfa að lágmarki örgjörva af útgáfu ARMv6. Það er ekki hægt að " "uppfæra stýrikerfi þitt yfir í nýja útgáfu af Ubuntu með þessum vélbúnaði." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "‚init‘ fannst ekki" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -804,17 +805,17 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Uppfærsla í sandkassanum með ‚aufs‘" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Nota þessa slóð til að leita að geisladiski með pökkum sem hægt er að " "uppfæra með" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -822,57 +823,57 @@ "Nota framenda. Nú þegar tiltækir: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "Ekki uppfæra allt (mun ekki skrifa yfir ‚sources.list‘)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Ákveða ‚datadir‘" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Settu ‚%s‘ í drifið ‚%s‘" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Búið að sækja" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Sæki skrá %li af %li á %sB/sek." #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Um það bil %s eftir" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Sæki skrá %li af %li" @@ -882,27 +883,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Virki breytingar" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "vandamál með ákvæði - skil eftir óstillt" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Gat ekki sett upp ‚%s‘" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -914,7 +915,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -925,7 +926,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -933,20 +934,20 @@ "Þú munt tapa öllu sem þú hefur breytt í þessari stillingarskrá ef þú ákveður " "að skipta henni út fyrir nýja útgáfu." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Skipunin ‚diff‘ fannst ekki" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Það kom upp grafalvarleg villa" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -954,13 +955,13 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ýtt á ctrl-c" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -969,134 +970,134 @@ "viljir halda áfram?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "Til að fyrirbyggja tap á gögnum skaltu loka öllum forritum og skrám." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Breyta miðli" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Sýna mun >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Fela mun" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Villa" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Hætta við" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Loka" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Sýna útstöðina >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Fela útstöðina" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Upplýsingar" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Frekari upplýsingar" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Ekki lengur stutt %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Fjarlægja %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Fjarlægja (var sett upp sjálfvirkt) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Setja upp %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Uppfæra %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Það þarf að endurræsa tölvuna" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Endurræsa kerfið til að ljúka uppfærslunni" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Endurræsa núna" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1108,32 +1109,32 @@ "Það getur verið að tölvan þín verði ónothæf ef þú hættir núna. Það er " "stranglega mælt með því að halda áfram." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Viltu hætta við uppfærsluna?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li dagur" msgstr[1] "%li dagar" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li klukkutími" msgstr[1] "%li klukkutímar" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li mínúta" msgstr[1] "%li mínútur" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1149,7 +1150,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1163,14 +1164,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1180,34 +1181,32 @@ "símalínutengingu." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Þetta mun taka um %s með þinni tengingu. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Undirbý að uppfæra" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Sæki nýjar hugbúnaðarrásir" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Sæki nýja pakka" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Set upp uppfærslurnar" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Hreinsa til" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1220,28 +1219,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d pakki mun vera fjarlægður." msgstr[1] "%d pakkar munu vera fjarlægðir." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d nýr pakki mun vera uppsettur." msgstr[1] "%d nýir pakkar munu vera uppsettir." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d pakki mun vera uppfærður." msgstr[1] "%d pakkar munu vera uppfærðir." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1252,28 +1251,28 @@ "\n" "Þú þarft að sækja samtals %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1281,70 +1280,70 @@ "Það eru engar uppfærslur fáanlegar fyrir kerfið þitt. Uppfærslu verður nú " "hætt." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Þú þarft að endurræsa tölvuna" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Uppfærslum er lokið og nú þarf að endurræsa tölvuna. Viltu gera það núna?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Gat ekki keyrt uppfærslutólið" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Auðkenni uppfærslutóls" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Uppfærsluforrit" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Ekki tókst að sækja" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "Það tókst ekki að sækja uppfærsluna. Þetta gæti verið vandamál með netið. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Auðkenning mistókst" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1352,13 +1351,13 @@ "Það tókst ekki að auðkenna uppfærsluna. Þetta er mögulega vandamál við " "nettenginguna eða netþjóninn. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Gat ekki afþjappað" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1366,13 +1365,13 @@ "Það mistókst að nálgast upplýsingarnar um uppfærsluna. Þetta er mögulega " "vandamál við nettenginguna eða netþjóninn. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Staðfesting mistókst" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1380,27 +1379,27 @@ "Það tókst ekki að staðfesta uppfærsluna. Það gæti verið vandamál með " "nettenginguna eða netþjóninn. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Get ekki keyrt uppfærsluna" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Villuskilaboðið er ‚%s‘." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1408,73 +1407,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Hætti við" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Lækkað í tign:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Viltu halda áfram [jN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Frekari upplýsingar [u]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "j" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "u" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Ekki lengur stutt: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Fjarlægja: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Setja upp: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Uppfæra: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Viltu halda áfram [Jn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1541,7 +1540,7 @@ msgstr "Kerfisuppfærsla" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1560,136 +1559,143 @@ msgid "Terminal" msgstr "Útstöð" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Vinsamlegast dokaðu, þetta gæti tekið drjúga stund." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Uppfærslu er lokið" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Fann ekki upplýsingar um útgáfu" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Það er mögulega mikið álag á netþjóninum. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Gat ekki sótt upplýsingar um útgáfuna" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Vinsamlegast athugaðu nettenginguna þína" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Uppfæra" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Upplýsingar um útgáfu" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Sæki aukapakka..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Skrá %s af %s á %sB/sek." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Skrá %s af %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Opna tengil í vafra" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Afrita tengil á klippiborð" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Sæki skrá %(current)li af %(total)li á %(speed)s/sek." -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Sæki skrá %(current)li af %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Upplýsingar um uppfærslu" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Setja upp" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Útgáfa %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Engin nettenging fannst, þú getur ekki sótt upplýsingar varðandi " "breytingalista." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Sæki lista yfir breytingar..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "Uppfærslan hefur þegar verið sótt, en ekki sett upp." msgstr[1] "Uppfærslurnar hafa þegar verið sóttar, en ekki settar upp." @@ -1697,11 +1703,18 @@ msgid "There are no updates to install." msgstr "Það eru engar uppfærslur til að setja upp." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Óþekkt stærð á niðurhali." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1709,7 +1722,7 @@ "Það er ekki vitað hvenær pakkaupplýsingarnar voru uppfærðar síðast. " "Vinsamlegast smelltu á hnappann 'Athuga' til að uppfæra upplýsingarnar." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1719,14 +1732,14 @@ "Smelltu á hnappann 'Athuga' fyrir neðan til að athuga með nýjar " "hugbúnaðaruppfærslur.." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "Pakkaupplýsingarnar voru síðast uppfærðar fyrir %(days_ago)s degi." msgstr[1] "Pakkaupplýsingarnar voru síðast uppfærðar fyrir %(days_ago)s dögum." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1735,34 +1748,46 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Pakkaupplýsingarnar voru síðast uppfærðar fyrir um %s mínútum." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Það var verið að uppfæra pakkaupplýsingarnar." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Hugbúnaðauppfærslur leiðrétta villur, lagfæra öryggisveilur og innleiða nýja " +"möguleika." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Hugbúnaðaruppfærslur gætu verið fáanlegar fyrir tölvuna þína." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Velkomin í Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Þessar hugbúnaðaruppfærslur hafa verið gefnar út síðan þessi útgáfa af " +"Ubuntu var gefin út." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Hugbúnaðaruppfærslur eru fáanlegar fyrir þessa tölvu." + +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1774,7 +1799,7 @@ "bráðabirgðapakka sem gamlar uppsetningar skildu eftir sig með því að skrifa " "‚sudo apt-get clean‘ í útstöðina." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1782,25 +1807,25 @@ "Það þarf að endurræsa tölvuna til að ljúka uppfærslum. Vistaðu öll skjöl " "áður en haldið er áfram." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Les pakkaupplýsingar" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Tengist..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Það gæti verið að þú getir ekki athugað með uppfærslur eða sótt nýjar " "uppfærslur." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Gat ekki frumstillt pakkaupplýsingar" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1809,7 +1834,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1817,52 +1842,52 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (ný uppsetning)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(stærð: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Frá útgáfu %(old_version)s upp í %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Útgáfa %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Útgáfuuppfærsla ekki möguleg í augnablikinu." -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Sækir uppfærslutólið fyrir útgáfuna" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Nýja ‚%s‘ Ubuntu-útgáfan er fáanleg" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Hugbúnaðarvísirinn er bilaður" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1872,6 +1897,17 @@ "„Synaptic‟-pakkastjórann eða keyrðu skipunina „sudo apt-get install -f‟ í " "útstöðina til að laga þetta vandamál." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Nýja útgáfan ‚%s‘ fannst." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Hætta við" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1881,22 +1917,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Hætta við" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Bý til lista yfir uppfærslur" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1920,20 +1952,20 @@ " * Óformlegir hugbúnaðarpakkar sem ekki er á vegum Ubuntu\n" " * Venjulegar breytingar á prufuútgáfu Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Sæki breytingarskrá" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Aðrar uppfærslur (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -1941,7 +1973,7 @@ "Það tókst ekki að sækja lista yfir breytingar. \n" "Athugaðu með nettenginguna þína." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1950,7 +1982,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1959,7 +1991,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1972,52 +2004,43 @@ "Notaðu http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "þangað til breytingarnar eru fáanlegar eða reyndu aftur síðar." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Gat ekki komist að því hvaða útgáfa þetta er" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Villan ‚%s‘ kom upp þegar tölvan var að kanna hvaða kerfi þú notar." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Mikilvægar öryggisuppfærslur" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Ráðlagðar uppfærslur" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Fyrirhugaðar uppfærslur" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Endurgerð forrit" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Uppfærslur fyrir dreifinguna" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Aðrar uppfærslur" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Ræsi uppfærslustjórann" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Hugbúnaðauppfærslur leiðrétta villur, lagfæra öryggisveilur og innleiða nýja " -"möguleika." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Hlutauppfærsla" @@ -2080,59 +2103,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Hugbúnaðaruppfærslur" +msgid "Update Manager" +msgstr "Uppfærslustjóri" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Hugbúnaðaruppfærslur" +msgid "Starting Update Manager" +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Uppfæra" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "uppfærslur" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Setja upp" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Breytingar" +msgid "updates" +msgstr "uppfærslur" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Lýsing" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Uppfærslulýsing" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Setja upp uppfærslur" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Breytingar" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "" +msgid "Description" +msgstr "Lýsing" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Setja upp" +msgid "Description of update" +msgstr "Uppfærslulýsing" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2155,9 +2178,8 @@ msgstr "Þú hefur hafnað uppfærslu í nýja útgáfu af Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Þú getur uppfært síðar með því að opna Uppfærslustjórann og smella á " @@ -2171,242 +2193,286 @@ msgid "Show and install available updates" msgstr "Sýna og setja upp uppfærslur" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Sýna útgáfu og hætta" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Mappan sem inniheldur gagnaskrárnar" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Athuga hvort til sé ný útgáfa af Ubuntu" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Athuga hvort hægt sé að uppfæra í nýjustu þróunarútgáfuna" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Reyndu að keyra drefingaruppfærslu" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Keyra hlutauppfærslu" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Keyra tiltekið viðmót" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Engar nýjar útgáfur fundust" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Nýja útgáfan ‚%s‘ fannst." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Keyrðu ‚do-release-upgrade‘ til að hefja uppfærsluna." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Uppfærsla í Ubuntu %(version)s er tiltæk" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Þú hefur hafnað uppfærslu í Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Aðferð sem er ekki notuð: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Skrá á diski" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb-pakki" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Setja upp pakkann sem vantar." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Það ætti að setja upp pakkann %s." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb-pakki" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "" - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "" + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Fjarlægja lilo þar sem grub er til staðar.(See bug #314004 for details.)" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" - -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Velkomin í Ubuntu" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." -#~ msgstr "" -#~ "Þessar hugbúnaðaruppfærslur hafa verið gefnar út síðan þessi útgáfa af " -#~ "Ubuntu var gefin út." +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "Software updates are available for this computer." -#~ msgstr "Hugbúnaðaruppfærslur eru fáanlegar fyrir þessa tölvu." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Uppfærslustjóri" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "_Setja upp uppfærslur" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" #~ "If you don't want to install them now, choose \"Update Manager\" from the " diff -Nru update-manager-17.10.11/po/it.po update-manager-0.156.14.15/po/it.po --- update-manager-17.10.11/po/it.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/it.po 2017-12-23 05:00:38.000000000 +0000 @@ -5,11 +5,12 @@ # # # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-21 17:44+0000\n" "Last-Translator: Alessandro Ranaldi \n" "Language-Team: Italian \n" @@ -22,7 +23,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -30,13 +31,13 @@ msgstr[1] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Server in %s" @@ -44,20 +45,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Server principale" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Server personalizzati" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Impossibile calcolare la voce di sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -66,11 +67,11 @@ "selezionato un disco di Ubuntu o che l'architettura installata sia " "differente." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Aggiunta del CD non riuscita" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -86,13 +87,13 @@ "Il messaggio di errore è stato:\n" "\"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Rimuovi il pacchetto danneggiato" msgstr[1] "Rimuovi i pacchetti danneggiati" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -112,15 +113,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Il server potrebbe essere sovraccarico" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Pacchetti danneggiati" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -130,7 +131,7 @@ "«synaptic» o «apt-get»." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -151,13 +152,13 @@ " * Pacchetti software non ufficiali non forniti da Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Si tratta molto probabilmente di un problema momentaneo, riprovare in un " "secondo momento." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -165,16 +166,16 @@ "Se nessuna delle precedenti è la causa, segnalare questo problema tramite il " "comando «ubuntu-bug update-manager» da terminale." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Impossibile calcolare l'avanzamento" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Errore nell'autenticare alcuni pacchetti" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -184,7 +185,7 @@ "un problema di rete passeggero, è possibile riprovare più tardi. Segue " "l'elenco dei pacchetti non autenticati." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -192,23 +193,23 @@ "Il pacchetto «%s» è selezionato per la rimozione, ma è nella blacklist per " "la rimozione." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Il pacchetto essenziale «%s» è selezionato per la rimozione." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" "Tentativo di installazione della versione «%s» presente nella blacklist" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Impossibile installare «%s»" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -217,11 +218,11 @@ "problema tramite il comando «ubuntu-bug update-manager» da terminale." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Impossibile indovinare il meta-pacchetto" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -235,15 +236,15 @@ " Prima di procedere, usare «synaptic» o «apt-get» per installare uno dei " "pacchetti sopra menzionati." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Lettura della cache" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Impossibile ottenere un blocco esclusivo" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -252,11 +253,11 @@ "pacchetti (come «apt-get» o «aptitude») è già in esecuzione. Chiudere " "l'altra applicazione prima di continuare." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Avanzamento tramite connessione remota non supportato" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -270,11 +271,11 @@ "\n" "L'avanzamento è stato interrotto. Riprovare senza SSH." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Continuare la sessione con SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -291,11 +292,11 @@ "Continuando verrà avviato un demone SSH aggiuntivo sulla porta «%s».\n" "Continuare?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Avvio demone sshd addizionale" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -307,7 +308,7 @@ "servizio ssh in esecuzione, sarà ancora possibile collegarsi a quello " "aggiuntivo.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -321,31 +322,31 @@ "aprire la porta è:\n" "«%s»" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Impossibile eseguire l'avanzamento" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" "Questo strumento non supporta l'avanzamento dalla versione «%s» alla " "versione «%s»." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Impostazione della sandbox non riuscita." -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Impossibile creare l'ambiente sanbox." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Modalità sandbox" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -360,18 +361,18 @@ "Nessuna modifica salvata in una cartella di sistema, da ora al prossimo " "riavvio, è permanente." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "La propria installazione di python è danneggiata. Correggere il collegamento " "simbolico \"/usr/bin/python\"." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Il pacchetto «debsig-verify» è installato" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -381,12 +382,12 @@ "Rimuoverlo usando Synaptic oppure col comando \"apt-get remove debsig-verify" "\" quindi eseguire nuovamente l'avanzamento." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Impossibile scrivere su «%s»" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -397,11 +398,11 @@ "può continuare.\n" "Assicurarsi che la directory di sistema sia accessibile in scrittura." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Includere ultimi aggiornamenti da Internet?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -421,16 +422,16 @@ "installare gli ultimi aggiornamenti al termine dell'avanzamento.\n" "Rispondendo «no», la rete non verrà utilizzata." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "disabilitato durante l'avanzamento a %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Non è stato trovato alcun mirror valido" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -450,11 +451,11 @@ "Scegliendo «No» l'avanzamento verrà annullato." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Generare le sorgenti predefinite?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -467,11 +468,11 @@ "Aggiungere le voci predefinite per «%s»? Scegliendo «No» l'avanzamento verrà " "annullato." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Informazioni sul repository non valide" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -479,11 +480,11 @@ "L'aggiornamento delle informazioni sui repository ha creato un file non " "valido. Sarà ora possibile segnalare questo problema." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Sorgenti di terze parti disabilitate" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -493,13 +494,13 @@ "È possibile abilitarle di nuovo dopo l'avanzamento di versione con lo " "strumento «software-properties» o con il gestore di pacchetti." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Pacchetto in uno stato inconsistente" msgstr[1] "Pacchetti in uno stato inconsistente" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -518,11 +519,11 @@ "reinstallati, ma non è stato trovato alcun archivio. Reinstallare i " "pacchetti manualmente o rimuoverli dal sistema." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Errore durante l'aggiornamento" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -530,13 +531,13 @@ "Si è verificato un problema durante l'aggiornamento. Solitamente si tratta " "di problemi di rete, controllare la connessione di rete e riprovare." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Spazio libero su disco insufficiente" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -551,21 +552,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Calcolo delle modifiche" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Avviare l'avanzamento di versione?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Avanzamento annullato" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -574,12 +575,12 @@ "originale del sistema. È possibile riprendere l'avanzamento di versione in " "un secondo momento." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Impossibile scaricare gli avanzamenti di versione" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -590,27 +591,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Errore durante il commit" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Ripristino dello stato originale del sistema" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Impossibile installare gli avanzamenti di versione" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -618,7 +619,7 @@ "L'avanzamento si è interrotto: il sistema potrebbe essere in uno stato " "inutilizzabile. Verrà avviato un ripristino (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -635,7 +636,7 @@ "var/log/dist-upgrade/ nella segnalazione.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -643,20 +644,20 @@ "L'avanzamento si è interrotto: controllare la connessione a Internet o il " "supporto di installazione e riprovare. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Rimuovere i pacchetti obsoleti?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Mantieni" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Rimuovi" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -666,27 +667,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Le dipendenze richieste non sono installate" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "La dipendenza richiesta «%s» non è installata. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Controllo gestore dei pacchetti" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Preparazione dell'avanzamento di versione non riuscita" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -694,11 +695,11 @@ "La preparazione del sistema per l'avanzamento non è riuscita. Sarà ora " "possibile segnalare questo problema." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Recupero dei prerequisiti per l'avanzamento di versione non riuscito" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -710,70 +711,70 @@ "\n" "Sarà ora possibile segnalare questo problema." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Aggiornamento delle informazioni sui repository" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Aggiunta CD-ROM non riuscita" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "L'aggiunta del CD-ROM non è avvenuta con successo." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Informazioni di pacchetto non valide" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Recupero file" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Avanzamento versione" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Avanzamento di versione completato" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "L'avanzamento di versione è stato completato, ma durante l'operazione si " "sono verificati degli errori." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Ricerca di software obsoleto" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "L'avanzamento di versione del sistema è stato completato." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "L'avanzamento parziale è stato completato." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "È in uso evms" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -783,13 +784,13 @@ "software «evms» non è più supportato, disattivarlo e rieseguire " "l'avanzamento." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "La scheda video potrebbe non essere pienamente supportata in Ubuntu 12.04 " "LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -801,9 +802,9 @@ "informazioni andare su https://wiki.ubuntu.com/X/Bugs/" "UpdateManagerWarningForI8xx Continuare?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -812,8 +813,8 @@ "prestazioni di giochi e di altri programmi che fanno un uso intensivo della " "grafica." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -826,7 +827,7 @@ "\n" "Continuare comunque?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -839,11 +840,11 @@ "\n" "Continuare comunque?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "CPU non compatibile" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -856,11 +857,11 @@ "A causa di tale configurazione hardware non è possibile aggiornare questo " "sistema a un nuovo rilascio di Ubuntu." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Nessuna CPU ARMv6" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -872,11 +873,11 @@ "richiedono ARMv6 come architettura minima. Non è possibile avanzare il " "sistema a un nuovo rilascio di Ubuntu con l'hardware attuale." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "\"init\" non disponibile" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -892,17 +893,17 @@ "\n" "Continuare comunque?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Avanzamento in ambiente sandbox con file system aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Utilizzare il percorso fornito per cercare un CD-ROM contenente pacchetti da " "far avanzare." -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -910,58 +911,58 @@ "Frontend da usare. Disponibili al momento: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*DEPRECATA* Questa opzione sarà ignorata" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Esegue solo un avanzamento parziale (nessuna riscrittura di sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Disabilita la schermata GNU di supporto" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Imposta datadir" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Inserire «%s» nell'unità «%s»" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Recupero file completato" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Recupero file %li di %li a %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Circa %s rimanenti" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Recupero file %li di %li" @@ -971,27 +972,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Applicazione delle modifiche" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "problemi con le dipendenze - lasciato non configurato" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Impossibile installare «%s»" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -1003,7 +1004,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1014,7 +1015,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1022,20 +1023,20 @@ "Se si decide di sostituire il file di configurazione con una versione più " "recente, tutte le modifiche apportate andranno perse." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Il comando «diff» non è stato trovato" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Si è verificato un errore fatale" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1048,13 +1049,13 @@ "Il file sources.list originale è stato salvato come /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Premuto Ctrl-C" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1063,136 +1064,136 @@ "d'errore. Confermare l'operazione?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Chiudere tutte le applicazioni e i documenti aperti per prevenire la perdita " "di dati." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Non più supportati da Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Da retrocedere (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Da rimuovere (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Non più necessari (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Da installare (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Da aggiornare (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Cambio del supporto" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Mostra differenze >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Nascondi differenze" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Errore" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Annulla" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Chiudi" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Mostra terminale >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Nascondi terminale" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Informazioni" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Dettagli" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Non più supportato %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Rimuovere %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Rimuovere %s (installato automaticamente)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Installare %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Avanzare %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Riavvio richiesto" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Riavviare il sistema per completare l'avanzamento" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Riavvia ora" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1204,32 +1205,32 @@ "Se viene annullato l'avanzamento, il sistema può rimanere in uno stato " "instabile. È fortemente consigliato riprendere l'avanzamento." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Annullare l'avanzamento di versione?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li giorno" msgstr[1] "%li giorni" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li ora" msgstr[1] "%li ore" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minuto" msgstr[1] "%li minuti" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1245,7 +1246,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s e %(str_hours)s" @@ -1259,14 +1260,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1276,34 +1277,32 @@ "%s con un modem 56k." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Questo scaricamento richiederà circa %s con la propria connessione. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Preparazione all'avanzamento di versione" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Recupero nuovi canali software" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Recupero nuovi pacchetti" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Installazione degli aggiornamenti" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Pulizia" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1320,28 +1319,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d pacchetto sta per essere rimosso." msgstr[1] "%d pacchetti stanno per essere rimossi." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d nuovo pacchetto sta per essere installato." msgstr[1] "%d nuovi pacchetti stanno per essere installati." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d pacchetto sta per essere aggiornato." msgstr[1] "%d pacchetti stanno per essere aggiornati." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1352,7 +1351,7 @@ "\n" "È necessario scaricare un totale di %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1360,7 +1359,7 @@ "L'installazione degli avanzamenti di versione può richiedere diverse ore e " "non è possibile annullarlo in un momento successivo." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1368,16 +1367,16 @@ "Il recupero dei file e l'installazione degli avanzamenti di versione possono " "richiedere diverse ore e non è possibile annullarli in un momento successivo." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "La rimozione dei pacchetti può richiedere diverse ore. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Il software è aggiornato." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1385,38 +1384,38 @@ "Non ci sono avanzamenti di versione disponibili per questo sistema. " "L'avanzamento sarà annullato." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Riavvio richiesto" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "L'avanzamento di versione è stato completato ed è richiesto un riavvio. " "Riavviare ora?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "autenticazione di «%(file)s» con «%(signature)s» " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "estrazione di «%s»" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Impossibile eseguire lo strumento di avanzamento versione" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1424,35 +1423,35 @@ "Probabilmente c'è un bug nello strumento di avanzamento. Segnalare questo " "problema tramite il comando «ubuntu-bug update-manager» da terminale." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Firma dello strumento di avanzamento versione" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Strumento di avanzamento versione" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Recupero non riuscito" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "Il recupero dei file per l'avanzamento di versione non è riuscito. Potrebbe " "dipendere da un problema di rete. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Autenticazione non riuscita" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1460,13 +1459,13 @@ "Non è riuscita l'autenticazione dell'avanzamento di versione. Potrebbe " "dipendere da un problema con la connessione di rete o con il server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Estrazione non riuscita" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1474,13 +1473,13 @@ "Non è riuscita l'estrazione dell'aggiornamento. Potrebbe dipendere da un " "problema con la connesione di rete o con il server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Verifica non riuscita" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1488,15 +1487,15 @@ "Non è riuscita la verifica dell'avanzamento di versione. Potrebbe dipendere " "da un problema con la connessione di rete o con il server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Impossibile eseguire l'avanzamento" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1504,13 +1503,13 @@ "Questo di solito succede se /tmp è montata in modalità noexec. Montarla " "senza modalità noexec ed eseguire nuovamente l'avanzamento." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Il messaggio di errore è «%s»." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1523,73 +1522,73 @@ "Il file sources.list originale è stato salvato come /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Interruzione" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Retrocesso:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Per continuare premere [INVIO]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Continua [sN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Dettagli [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "s" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Non più supportato: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Rimuove: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Installa: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Avanza: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Continua [Sn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1657,9 +1656,8 @@ msgstr "Avanzamento distribuzione" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Avanzamento di Ubuntu alla versione 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Avanzamento di Ubuntu alla versione 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1677,84 +1675,85 @@ msgid "Terminal" msgstr "Terminale" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Attendere, potrebbe richiedere del tempo." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Aggiornamento completato" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Impossibile trovare le note di rilascio" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Il server potrebbe essere sovraccarico. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Impossibile scaricare le note di rilascio" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Controllare la propria connessione a internet." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Avanza" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Note di rilascio" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Scaricamento pacchetti aggiuntivi..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "File %s di %s a %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "File %s di %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Apri collegamento nel browser" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Copia collegamento negli appunti" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Scaricamento del file %(current)li di %(total)li a %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Scaricamento del file %(current)li di %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Il rilascio di Ubuntu in uso non è più supportato." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1762,51 +1761,57 @@ "Non saranno disponibili futuri aggiornamenti critici o di sicurezza. " "Effettuare l'aggiornamento a una versione più recente di Ubuntu." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Informazioni avanzamento" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Installa" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Nome" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Versione %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "Nessuna connessione di rete, impossibile scaricare il changelog." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Scaricamento dell'elenco dei cambiamenti..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Deseleziona tutto" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "_Seleziona tutto" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "È stato selezionato un aggiornamento." +msgstr[1] "Sono stati selezionati %(count)s aggiornamenti." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "Verranno scaricati %s." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "L'aggiornamento è stato scaricato, ma non installato." msgstr[1] "Gli aggiornamenti sono stati scaricati, ma non installati." @@ -1814,11 +1819,18 @@ msgid "There are no updates to install." msgstr "Non ci sono aggiornamenti da installare." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Dimensione scaricamento sconosciuta." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1826,7 +1838,7 @@ "Il momento dell'ultima verifica è sconosciuto. Fare clic sul pulsante " "«Verifica» per aggiornare le informaizoni." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1836,7 +1848,7 @@ "Premere il pulsante «Verifica» per controllare la presenza di nuovi " "aggiornamenti software." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1847,7 +1859,7 @@ "Le informazioni sui pacchetti sono state aggiornate l'ultima volta " "%(days_ago)s giorni fa." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1859,35 +1871,47 @@ "%(hours_ago)s ore fa." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" "Le informazioni sui pacchetti sono state aggiornate circa %s minuti fa." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Le informazioni sui pacchetti sono appena state aggiornate." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Gli aggiornamenti software correggono errori, eliminano vulnerabilità di " +"sicurezza e forniscono nuove funzionalità." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Potrebbero essere disponibili aggiornamenti software." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Benvenuti in Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Questi aggiornamenti sono stati resi disponibili dopo il rilascio di questa " +"versione di Ubuntu." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Sono disponibili aggiornamenti software." + +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1899,7 +1923,7 @@ "pacchetti temporanei di precedenti installazioni con il comando «sudo apt-" "get clean»." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1907,23 +1931,23 @@ "Per concludere l'installazione degli aggiornamenti è necessario riavviare il " "computer. Salvare il proprio lavoro prima di continuare." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Lettura informazioni sui pacchetti" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Connessione..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "Potrebbe non essere possibile controllare e scaricare aggiornamenti." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Impossibile inizializzare le informazioni del pacchetto" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1937,7 +1961,7 @@ "Segnalare questo bug per il pacchetto «update-manager» e includere il " "seguente messaggio d'errore:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1950,31 +1974,31 @@ "Segnalare questo bug per il pacchetto «update-manager» e includere il " "seguente messaggio di errore:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Nuova installazione)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Dimensione: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Dalla versione %(old_version)s alla %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Versione %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Avanzamento di versione impossibile in questo momento" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1983,21 +2007,21 @@ "L'avanzamento di versione non può essere eseguito, riprovare in un secondo " "momento. Il messaggio del server è stato: «%s»" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Scaricamento dello strumento di avanzamento versione" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "È disponibile il nuovo rilascio «%s» di Ubuntu" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "L'indice del software è rovinato" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -2007,6 +2031,17 @@ "pacchetti «Synaptic» o eseguire «sudo apt-get install -f» in un terminale " "per correggere innanzitutto questo problema." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Nuovo rilascio «%s» disponibile." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Annulla" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Verifica aggiornamenti" @@ -2016,22 +2051,18 @@ msgstr "Installa aggiornamenti disponibili" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Annulla" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Changelog" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Aggiornamenti" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Creazione elenco aggiornamenti" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2055,21 +2086,21 @@ " * pacchetti software non ufficiali non forniti da Ubuntu;\n" " * normali cambiamenti di una versione di pre-rilascio di Ubuntu." -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Scaricamento changelog" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Altri aggiornamenti (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" "Questo aggiornamento non proviene da una fonte che supporta i changelog." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2077,7 +2108,7 @@ "Scaricamento dell'elenco delle modifiche non riuscito. \n" "Verificare la connessione a Internet." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2090,7 +2121,7 @@ "Versione disponibile: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2103,7 +2134,7 @@ "Consultare http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "finché i cambiamenti non sono disponibili o riprovare più tardi." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2116,53 +2147,44 @@ "Utilizzare http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "finché le modifiche non saranno disponibili oppure riprovare più tardi." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Identificazione della distribuzione non riuscita" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" "Si è verificato un errore «%s» durante il controllo del sistema in uso." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Aggiornamenti di sicurezza importanti" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Aggiornamenti raccomandati" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Aggiornamenti proposti" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backport" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Aggiornamenti della distribuzione" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Altri aggiornamenti" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Avvio del gestore di aggiornamenti" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Gli aggiornamenti software correggono errori, eliminano vulnerabilità di " -"sicurezza e forniscono nuove funzionalità." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "Esegui avanzamento _parziale" @@ -2235,37 +2257,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Aggiornamenti software" +msgid "Update Manager" +msgstr "Gestore aggiornamenti" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Aggiornamenti software" +msgid "Starting Update Manager" +msgstr "Avvio del Gestore aggiornamenti" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Esegui avanzamento" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "aggiornamenti" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Installa" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Cambiamenti" +msgid "updates" +msgstr "aggiornamenti" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Descrizione" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Descrizione dell'aggiornamento" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2273,25 +2285,35 @@ "Connessione eseguita in roaming: è possibile che il costo sia basato sui " "dati scaricati per l'aggiornamento." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Connessione eseguita attraverso un modem senza fili." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Per sicurezza collegare il computer alla rete elettrica prima di eseguire " "aggiornamenti." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "I_nstalla aggiornamenti" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Cambiamenti" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Impostazioni..." +msgid "Description" +msgstr "Descrizione" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Installa" +msgid "Description of update" +msgstr "Descrizione dell'aggiornamento" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Impostazioni..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2315,9 +2337,8 @@ msgstr "Avanzamento alla nuova versione di Ubuntu rifiutato" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "È possibile effettuare l'avanzamento in un secondo momento aprendo il " @@ -2331,60 +2352,60 @@ msgid "Show and install available updates" msgstr "Mostra e installa gli aggiornamenti disponibili" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Mostra la versione ed esce" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Directory contenente i file di dati" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Controlla la disponibilità di un nuovo rilascio di Ubuntu" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Verifica se è possibile avanzare all'ultima versione di sviluppo" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "Usa l'ultima versione proposta del sistema di avanzamento di versione" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Avvia senza dare il focus alla finestra del gestore" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Prova a eseguire un dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Non controlla la presenza di aggiornamenti all'avvio" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" "Prova di avanzamento in ambiente sandbox con sovrapposizione di file system " "aufs" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Esecuzione avanzamento di versione parziale" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Mostra la descrizione del pacchetto al posto del changelog" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Tentativo di avanzamento all'ultimo rilascio usando lo strumento di " "avanzamento da $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2394,11 +2415,11 @@ "Attualmente sono supportati «desktop» per un avanzamento normale di sistemi " "desktop e «server» per sistemi server." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Esegue il frontend specificato" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2406,11 +2427,11 @@ "Controlla se è dispoibile un nuovo rilascio della distribuzione e riporta il " "risultato tramite un codice d'uscita" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Verifica un nuovo rilascio di ubuntu" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2418,68 +2439,68 @@ "Per informazioni sull'avanzamento consultare:\n" "$(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Nessun nuovo rilascio trovato" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Nuovo rilascio «%s» disponibile." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Lanciare «do-release-upgrade» per eseguire l'avanzamento." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Disponibile avanzamento a Ubuntu &(version)s" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "È stato rifiutato l'avanzamento alla versione %s di Ubuntu" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Abilitare le informazioni di debug" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Mostra pacchetti non supportati" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Mostra pacchetti supportati" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Mostra lo stato di tutti i pacchetti" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Mostra tutti i pacchetti in un elenco" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Riepilogo supporto per «%s»:" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "Ci sono %(num)s pacchetti (%percent).1f%%) supportati fino a %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "Ci sono %(num)s pacchetti (%(percent).1f%%) non più scaricabili" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "Ci sono %(num)s pacchetti (%(percent).1f%%) non supportati" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2487,54 +2508,71 @@ "Eseguire con --show-unsupported, --show-supported o --show-all per ulteriori " "dettagli" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Non più scaricabili:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Non supportati: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Supportati fino a %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Non supportato" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Metodo non implementato: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Un file su disco" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "Pacchetto .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Installare il pacchetto mancante." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "È necessario installare il pacchetto %s." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "Pacchetto .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "È necessario selezionare il pacchetto %s come installato manualmente." +msgid "%i obsolete entries in the status file" +msgstr "%i voci non aggiornate nel file di stato" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "Voci non aggiornate nello stato di dpkg" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "Voci dello stato di dpkg non aggiornate" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2543,69 +2581,82 @@ "installare kdelibs5-dev. Per maggiori informazioni, consultare il bug n° " "279621 su bugs.launchpad.net." -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "%i voci non aggiornate nel file di stato" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "Voci non aggiornate nello stato di dpkg" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "Voci dello stato di dpkg non aggiornate" +msgid "%s needs to be marked as manually installed." +msgstr "È necessario selezionare il pacchetto %s come installato manualmente." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "È necessario rimuovere lilo per la presenza di grub. Per ulteriori dettagli " "consultare il bug n° 314004." -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Dopo l'aggiornamento delle informazioni sui pacchetti, il pacchetto " -#~ "essenziale «%s» non può più essere trovato. Sarà ora possibile segnalare " -#~ "questo problema." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Avanzamento di Ubuntu alla versione 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "È stato selezionato un aggiornamento." -#~ msgstr[1] "Sono stati selezionati %(count)s aggiornamenti." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Benvenuti in Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Questi aggiornamenti sono stati resi disponibili dopo il rilascio di " -#~ "questa versione di Ubuntu." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Sono disponibili aggiornamenti software." - -#~ msgid "Update Manager" -#~ msgstr "Gestore aggiornamenti" - -#~ msgid "Starting Update Manager" -#~ msgstr "Avvio del Gestore aggiornamenti" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Connessione eseguita attraverso un modem senza fili." - -#~ msgid "_Install Updates" -#~ msgstr "I_nstalla aggiornamenti" +#~ "Dopo l'aggiornamento delle informazioni sui pacchetti, il pacchetto " +#~ "essenziale «%s» non può più essere trovato. Sarà ora possibile segnalare " +#~ "questo problema." #~ msgid "Checking for a new ubuntu release" #~ msgstr "Verifica un nuovo rilascio di ubuntu" @@ -2660,6 +2711,9 @@ #~ "Per non installarli ora, scegliere in un secondo momento Applicazioni → " #~ "Gestore aggiornamenti." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Avanzamento di Ubuntu alla versione 11.10" + #~ msgid "%.0f kB" #~ msgstr "%.0f kB" diff -Nru update-manager-17.10.11/po/ja.po update-manager-0.156.14.15/po/ja.po --- update-manager-17.10.11/po/ja.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/ja.po 2017-12-23 05:00:38.000000000 +0000 @@ -5,11 +5,12 @@ # Hiroyuki Ikezoe , 2005 # # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager 0.42.4\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-04-12 16:16+0000\n" "Last-Translator: Mitsuya Shibata \n" "Language-Team: Ubuntu Japanese Team \n" @@ -22,20 +23,20 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" msgstr[0] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s にあるサーバー" @@ -43,20 +44,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "メインサーバー" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "カスタムサーバー群" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "sources.listのエントリーから作業内容を見積もれません" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -64,11 +65,11 @@ "パッケージファイルが見つかりません。UbuntuのCDではないか、異なるアーキテク" "チャー向けのCDかもしれません。" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "CDの追加に失敗しました" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -83,12 +84,12 @@ "エラーメッセージ：\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "壊れた状態のパッケージを削除する" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -105,15 +106,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "サーバーが過負荷状態にある可能性があります" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "壊れたパッケージ" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -122,7 +123,7 @@ "す。 Synaptic や apt-get を使って最初に修正してください。" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -143,11 +144,11 @@ " * Ubuntu が提供していない、非公式なパッケージを利用している。\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "これは一時的な問題のようです。後でもう一度試してください。" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -155,16 +156,16 @@ "これが適用できない場合は、端末で 'ubuntu-bug update-manager' コマンドを実行し" "てバグ報告を行ってください。" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "アップグレード作業を見積もれません" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "パッケージの認証において、エラーがありました" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -174,7 +175,7 @@ "かもしれません。あとで再び試してみてください。以下に認証できなかったパッケー" "ジのリストが表示されます。" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -182,23 +183,23 @@ "パッケージ'%s'は「削除」と指定されていますが、削除ブラックリストに入っていま" "す。" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "必須パッケージ'%s'に「削除」マークがついています。" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" "ブラックリストに入っているバージョン '%s' をインストールしようとしています" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "'%s'をインストールすることができません。" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -207,11 +208,11 @@ "update-manager' を実行して、バグ報告を行なってください。" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "メタパッケージを推測できません" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -225,15 +226,15 @@ " 続ける前に、Synaptic や apt-get を使用して、まずは上記のパッケージのうちのい" "ずれかをインストールしてください。" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "キャッシュを読み込み中" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "排他的なロックができません" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -241,11 +242,11 @@ "パッケージマネージャーは一度にひとつしか起動できません。apt-getやaptitudeなど" "のような、他のパッケージマネージャーを終了してください。" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "リモート接続経由でのアップグレードはサポートされていません" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -262,11 +263,11 @@ "\n" "アップグレードは中断されます。SSHを経由しない起動方法で実行してください。" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "SSH経由で実行していますが、続けますか？" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -283,11 +284,11 @@ "続行する場合、追加のSSHデーモンをポート '%s' で起動します。\n" "本当に作業を進めてよろしいですか？" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "予備のsshdを開始します" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -298,7 +299,7 @@ "始します。現在実行中のsshにおかしなことが起きても、もう一方のポートに接続する" "ことができます。\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -311,30 +312,30 @@ "てポートを開けます:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "アップグレードできません" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" "'%s' から '%s' へのアップグレードは、このツールではサポートされていません。" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "サンドボックス環境のセットアップに失敗しました" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "サンドボックス環境を構築することができませんでした。" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "サンドボックスモード" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -349,18 +350,18 @@ "現時点から次に再起動するまでの間にシステムディレクトリに書き込まれた変更は、" "破棄されます。" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "インストールされたPythonが破損しています。シンボリックリンク'/usr/bin/" "python'を修正してください。" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "'debsig-verify'パッケージがインストールされています" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -371,12 +372,12 @@ "Synapticパッケージマネージャーか 'apt-get remove debsig-verify' で削除した後" "で、再度アップグレードを実行してください。" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "'%s' に書き込みできません" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -387,11 +388,11 @@ "せん。\n" "システムディレクトリが書き込み可能かどうか確認してください。" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "インターネットからの最新のアップデート情報を取得しますか？" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -413,16 +414,16 @@ "タをインストールする必要があります。\n" "ここで「いいえ」を選択すると、アップグレードにネットワークを利用しません。" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "%sへのアップグレード時に無効化されました" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "利用可能なミラーが見つかりません" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -442,11 +443,11 @@ "「いいえ」を選択すると、アップグレードをキャンセルします。" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "標準のリポジトリ設定ファイルを生成しますか？" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -460,11 +461,11 @@ "'%s' のためのデフォルト設定エントリを追加しますか？　「いいえ」を選択すると、" "アップグレードはキャンセルされます。" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "リポジトリ情報が無効です" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -472,11 +473,11 @@ "リポジトリの情報を更新した際にファイルが破損しました。それによりバグ報告のプ" "ロセスが開始されました。" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "サードパーティが提供するリポジトリを使わない設定にしました" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -486,12 +487,12 @@ "た。アップグレード完了後、'ソフトウェアソース' ツールもしくはパッケージマネー" "ジャーを使って再び利用可能な設定にすることができます。" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "矛盾した状態のパッケージ" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -506,11 +507,11 @@ "アーカイブを見つけることができません。パッケージを手動で再インストールする" "か、システムからパッケージを削除してください。" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "アップデート中にエラーが発生しました" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -519,13 +520,13 @@ "問題です。ネットワーク接続が可能であることをチェックし、あらためて試してくだ" "さい。" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "ディスクの空き領域が足りません" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -540,21 +541,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "変更点を確認中" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "アップグレードを開始しますか？" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "アップグレードをキャンセルしました" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -562,12 +563,12 @@ "アップグレードはすぐにキャンセルされ、システムは元の状態に戻ります。後でアッ" "プグレードをやり直すことができます。" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "アップグレードに必要なデータをダウンロードできません" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -578,27 +579,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "反映中にエラーが発生しました" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "システムを元に戻しています" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "アップグレードをインストールできません" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -606,7 +607,7 @@ "アップグレードを中断しました。システムが不安定な状態の可能性があります。今か" "らリカバリーを実行します。(dpkg --configure -a)" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -623,7 +624,7 @@ "upgrade/ にあるファイルを添付してください。\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -631,22 +632,22 @@ "アップグレードを中断しました。インターネット接続またはインストールメディアを" "確認して、もう一度実行してください。 " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" "サポートが中止された（あるいはリポジトリに存在しない）パッケージを削除します" "か？" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "そのまま(_K)" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "削除(_R)" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -656,27 +657,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "依存するパッケージがインストールされていません" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "依存するパッケージ '%s' がインストールされていません。 " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "パッケージマネージャーをチェック中です" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "アップグレードの準備に失敗しました" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -684,11 +685,11 @@ "アップグレードのための準備に失敗しました。それによりバグ報告のプロセスが開始" "されました。" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "アップグレードの事前作業に失敗しました" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -700,70 +701,70 @@ "\n" "同時にバグ報告のプロセスが開始されました。" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "リポジトリ情報のアップデート" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "cdromの追加に失敗しました" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "cdrom の追加に失敗しました。" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "利用できないパッケージ情報です" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "取得中" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "アップグレード中です" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "アップグレードが完了しました" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "アップグレードは完了しましたが、アップグレード中にいくつかのエラーが発生しま" "した。" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "古いソフトウェアを検索しています" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "システムのアップグレードが完了しました。" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "部分的なアップグレードが完了しました。" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms は使用中です" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -773,13 +774,13 @@ "す。'evms' ソフトウェアはもうサポートされていません。オフにしてからアップグ" "レードしてください。" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "現在使用中のグラフィックハードウェアのサポートは Ubuntu 12.04 LTS では不完全" "な可能性があります。" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -791,9 +792,9 @@ "す。詳しくは https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx をご" "覧ください。アップグレードを続行しますか?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -802,8 +803,8 @@ "フィックに強く依存するその他のプログラムなどのパフォーマンスが低下するかもし" "れません。" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -817,7 +818,7 @@ "\n" "作業を続けますか？" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -831,11 +832,11 @@ "\n" "作業を続けますか？" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "i686 CPU ではありません" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -847,11 +848,11 @@ "i686 を必要とする最適化でビルドされています。このハードウェアでは、新しいバー" "ジョンの Ubuntu にアップグレードすることができません。" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "ARMv6 準拠ではない CPU です" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -863,11 +864,11 @@ "最適化オプションを利用してビルドされています。このハードウェアでは新しい " "Ubuntu のリリースにアップグレードできません。" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "initデーモンが見つかりません" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -882,15 +883,15 @@ "\n" "本当に作業を進めてよろしいですか？" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "aufsを使用したサンドボックスアップグレード" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "アップグレードパッケージが含まれたCD-ROMへのパスを指定してください" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -898,57 +899,57 @@ "フロントエンドを使用してください。現在利用可能なもの: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*DEPRECATED* このオプションは無視されます" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "部分アップグレードだけを実行します（sources.listを書き換えません）" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "GNU screen のサポートを無効にする" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "datadirを設定" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "メディア '%s' をドライブ '%s' に挿入してください" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "取得が完了しました" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "%li / %li を取得中（%s B/s）" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "残り時間 約%s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "%li / %li を取得中です" @@ -958,27 +959,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "変更を適用しています" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "依存関係の問題 - 設定を見送ります" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "'%s' がインストールできません" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -990,7 +991,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1001,7 +1002,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1009,20 +1010,20 @@ "より新しいバージョンと入れ換えた場合、この構成ファイルへの変更内容は失われま" "す。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "'diff' コマンドが見つかりません" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "致命的なエラーが起こりました" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1034,13 +1035,13 @@ "があります。アップグレードは完了しませんでした。\n" "変更前のsources.listは/etc/apt/sources.list.distUpgradeに保存されています。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c が入力されました" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1049,137 +1050,137 @@ "ん。本当に実行しますか？" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "データが失われることを避けるため、利用中のアプリケーションとドキュメントを閉" "じてください。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Canonical によってサポートされなくなりました (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "ダウングレード (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "削除 (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "もう不要なもの (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "インストール (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "アップグレード (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "メディアの交換" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "差分を表示 >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< 差分を隠す" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "エラー" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "キャンセル(&C)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "閉じる(&C)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "端末を表示 >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< 端末を隠す" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "情報" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "詳細" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "サポートされなくなりました %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "%s を削除" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "(自動インストールされた) %s を削除" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "インストール %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "アップグレード %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "再起動が必要です" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" "アップグレードを完了するには、システムの再起動が必要です" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "すぐに再起動(_R)" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1191,29 +1192,29 @@ "アップグレードをキャンセルしてしまうと、システムが不安定な状態になる恐れがあ" "ります。アップグレードを再開することを強くお勧めします。" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "アップグレードをキャンセルしますか?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li 日" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li 時間" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li 分" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1228,7 +1229,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1242,14 +1243,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1258,34 +1259,32 @@ "このダウンロードは 1Mbit DSL 接続で約 %s 、56k モデムで約 %s かかります。" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "このダウンロードは約 %s かかります。 " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "アップグレードの準備" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "新しいソフトウェア・チャンネルの取得" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "新しいパッケージの取得" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "アップグレードのインストール" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "クリーンアップ" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1299,25 +1298,25 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d 個のパッケージが削除されます。" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d 個の新規パッケージがインストールされます。" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d 個のパッケージがアップグレードされます。" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1328,7 +1327,7 @@ "\n" "合計 %s をダウンロードする必要があります。 " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1336,7 +1335,7 @@ "アップグレードをインストールするのに数時間かかることがあります。ダウンロード" "が完了してしまうと、処理はキャンセルできません。" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1344,16 +1343,16 @@ "アップグレードの取得とインストールには数時間かかることがあります。ダウンロー" "ドが完了してしまうと、処理はキャンセルできません。" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "パッケージの削除に数時間かかることがあります。 " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "このコンピューターのソフトウェアは最新です。" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1361,37 +1360,37 @@ "システムに適用可能なアップグレードはありません。アップグレードは中止されま" "す。" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "再起動が必要です" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "アップグレードが終了しました。再起動が必要です。今すぐ自動で再起動しますか？" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "「%(signature)s」を用いて「%(file)s」の認証を行ないます " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "'%s' の展開中" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "アップグレード・ツールを実行できません" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1399,33 +1398,33 @@ "この問題はアップグレードツールのバグの可能性が高いです。'ubuntu-bug update-" "manager' コマンドを実行してバグ報告を行ってください。" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "ツールの署名のアップグレード" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "ツールのアップグレード" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "取得に失敗しました" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "アップグレードの取得に失敗しました。おそらくネットワークの問題です。 " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "認証に失敗しました" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1433,13 +1432,13 @@ "アップグレードの認証に失敗しました。おそらくネットワークまたはサーバーの問題" "です。 " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "抽出に失敗しました" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1447,13 +1446,13 @@ "アップグレードの展開に失敗しました。おそらくネットワークまたはサーバーの問題" "です。 " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "認証に失敗しました" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1461,15 +1460,15 @@ "アップグレードの検証に失敗しました。ネットワーク接続もしくはサーバーに問題が" "あるかもしれません。 " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "アップグレードを実行できません" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1477,13 +1476,13 @@ "この現象は、通常/tmpがnoexecでマウントされている場合にシステムで発生します。" "noexecを付けずに再マウントして、再度アップグレードを実行してください。" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "エラーメッセージは'%s'です。" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1495,73 +1494,73 @@ "は完了しませんでした。\n" "変更前のsources.listは/etc/apt/sources.list.distUpgradeに保存されています。" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "中断します" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "サポートレベルの格下げ:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "続けるには [ENTER] キーを押してください" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "続行する[yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "詳細 [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "サポートされなくなりました: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "削除: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "インストール: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "アップグレード: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "続ける [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1629,9 +1628,8 @@ msgstr "ディストリビューションのアップグレード" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Ubuntu 11.10にアップグレードする" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Ubuntu バージョン 12.04 へのアップグレード" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1649,84 +1647,85 @@ msgid "Terminal" msgstr "端末" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "しばらくお待ちください。少し時間がかかります。" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "アップデートが完了しました" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "リリースノートが見つかりません" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "サーバーに大きな負荷がかかっています。 " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "リリースノートをダウンロードできません" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "インターネット接続を確認してください。" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "アップグレード" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "リリースノート" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "追加パッケージのダウンロード..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "ファイル %s / %s (%sB/s)" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "ファイル %s / %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "リンクをブラウザで開く" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "リンクをクリップボードにコピー" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "ファイル %(current)li / %(total)li をダウンロード中 (%(speed)s/秒)" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "ファイル %(current)li / %(total)li をダウンロード中" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "このバージョンのUbuntuは既にサポートが打ち切られています。" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1734,52 +1733,57 @@ "今後、セキュリティ修正や重要な更新は行われません。新しいリリースの Ubuntu に" "アップグレードしてください。" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "アップグレード情報" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "インストール" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "名前" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "バージョン %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "ネットワーク接続が見つからないので、変更履歴情報をダウンロードできません。" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "変更点のリストを取得中..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "すべての選択を外す(_D)" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "すべて選択(_A)" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s 個のアップデートが選択されています。" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s をダウンロードします。" #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" "アップデートは既にダウンロードされていますが、インストールされていません。" @@ -1787,11 +1791,18 @@ msgid "There are no updates to install." msgstr "インストールするアップデートはありません。" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "不明なダウンロードサイズです。" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1799,7 +1810,7 @@ "パッケージ情報の最終更新日時は不明です。'再チェック' ボタンをクリックして情報" "を更新してください。" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1809,13 +1820,13 @@ "'再チェック' ボタンを押して新しいソフトウェアアップデートをチェックしてくださ" "い。" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "パッケージ情報は %(days_ago)s 日前に更新されました。" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1823,34 +1834,46 @@ msgstr[0] "パッケージ情報は %(hours_ago)s 時間前に更新されました。" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "パッケージ情報は約 %s 分前に更新されました。" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "パッケージ情報が更新されました。" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"ソフトウェアアップデートはエラーを修正し、セキュリティホールを取り除き、新し" +"い機能を提供します。" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "このコンピューターでソフトウェアのアップデートが利用できます。" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Ubuntuへようこそ" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"これらのソフトウェアアップデートは、このバージョンのUbuntu のリリース以降に提" +"供されたものです。" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "ソフトウェアアップデートが利用可能です。" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1861,7 +1884,7 @@ "領域を'%s'に確保してください。ゴミ箱を空にしたり、'sudo apt-get clean'を使っ" "て過去にインストールした一時パッケージを削除してください。" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1869,25 +1892,25 @@ "アップデートパッケージのインストール完了には再起動が必要です。再起動の前に、" "各アプリケーションで作業を保存してください。" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "パッケージ情報を取得しています" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "接続しています..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "アップデートの情報をチェックしたり新規アップデートをダウンロードすることがで" "きません。" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "パッケージ情報を初期化できませんでした" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1900,7 +1923,7 @@ "'update-manager'パッケージのバグとして、以下のエラーメッセージを含めてレポー" "トしてください:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1912,31 +1935,31 @@ "'update-manager'パッケージのバグとして、以下のエラーメッセージを含めてレポー" "トしてください:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (新規インストール)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(サイズ: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "バージョン %(old_version)s から %(new_version)s　へ" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "バージョン %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "今はリリースアップグレードができません。" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1945,21 +1968,21 @@ "リリースアップグレードが現在実行できないので後でもう一度試してください。サー" "バーの報告は以下のとおりです: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "リリースアップグレードツールのダウンロード" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Ubuntu の新しいリリース '%s' が利用可能です" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "ソフトウェア・インデックスが壊れています" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1969,6 +1992,17 @@ "解決するために \"Synapticパッケージマネージャー\" を起動するか、 \"sudo apt-" "get install -f\" コマンドをターミナルで実行してください。" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "新しいリリース '%s' が利用可能になっています。" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "キャンセル" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "アップデートを確認" @@ -1978,22 +2012,18 @@ msgstr "利用可能なアップデートをすべてインストールする" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "キャンセル" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "更新履歴" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "アップデート" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "アップデートリストを構成しています" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2017,21 +2047,21 @@ " * Ubuntu が提供していない、非公式なパッケージを利用している。\n" " * Ubuntu のリリース前バージョンにおける、通常の変更。" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "変更履歴をダウンロードしています" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "その他のアップデート (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" "このアップデートは変更履歴をサポートしているソースからのものではありません。" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2039,7 +2069,7 @@ "変更内容のダウンロードに失敗しました。\n" "インターネットに接続されているか確認してください。" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2052,7 +2082,7 @@ "利用可能なバージョン: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2066,7 +2096,7 @@ "%s/+changelog\n" "を利用するか、後ほど再び試してください。" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2080,52 +2110,43 @@ "%s/+changelog\n" "を利用するか、後ほど再び試してください。" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "ディストリビューションの検出に失敗しました" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "使用しているシステムを確認している際に、エラー '%s' が起きました。" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "重要なセキュリティアップデート" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "推奨アップデート" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "「Proposed」（テスト版）アップデート" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "バックポート" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "ディストリビューションのアップデート" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "その他のアップデート" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "アップデートマネージャーを起動しています" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"ソフトウェアアップデートはエラーを修正し、セキュリティホールを取り除き、新し" -"い機能を提供します。" - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "部分的なアップグレード(_P)" @@ -2198,37 +2219,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "ソフトウェアのアップデート" +msgid "Update Manager" +msgstr "アップデートマネージャー" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "ソフトウェアのアップデート" +msgid "Starting Update Manager" +msgstr "アップデートマネージャーを起動しています" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "アップグレード(_P)" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "アップデート" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "インストール" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "変更箇所" +msgid "updates" +msgstr "アップデート" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "詳細" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "アップデートの詳細" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2236,23 +2247,33 @@ "ローミングサービス経由で接続しているため、アップデートによる帯域消費によって" "課金される可能性があります。" -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "無線モデム経由で接続しています。" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "アップデートを行う前にAC電源をコンピューターに接続しておくと安全です。" +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "アップデートをインストール(_I)" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "変更箇所" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "設定(_S)..." +msgid "Description" +msgstr "詳細" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "インストール" +msgid "Description of update" +msgstr "アップデートの詳細" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "設定(_S)..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2276,9 +2297,8 @@ msgstr "新しいUbuntuへのアップグレードを拒絶" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "後でアップデートマネージャーを開いて \"アップグレード\" をクリックすればアッ" @@ -2292,61 +2312,61 @@ msgid "Show and install available updates" msgstr "利用できるアップデートの閲覧・インストール" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "バージョンを表示して終了" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "データファイルの含まれるディレクトリ" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" "新しい Ubuntu のリリースが\r\n" "利用可能かどうかチェックする" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "最新の開発リリースへのアップデートが利用可能かどうかチェックする" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "リリースアップグレードが提案する最新のバージョンを使ってアップグレードを行う" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "起動時にウィンドウに入力フォーカスを当てない" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "dist-upgradeを実行する" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "起動時にアップデートをチェックしない" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "aufsオーバレイを実験環境に用いてのテストアップグレード" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "部分的なアップグレードを実行" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "変更履歴の代わりにパッケージの説明を表示" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "アップグレードソフトウェアを使って $distro-proposed から最新のリリースへの" "アップグレードを試す" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2356,11 +2376,11 @@ "現在、デスクトップシステムの標準的なアップグレードを行う 'desktop' オプション" "と、サーバーシステム向けの 'server' オプションがサポートされています。" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "特定のフロントエンドで実行" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2368,11 +2388,11 @@ "新しいディストリビューション・リリースが利用可能かどうかチェックし、終了コー" "ドで結果を通知する" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "新しい Ubuntu のリリースをチェックしています" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2380,69 +2400,69 @@ "アップグレード情報は以下を参照:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "新しくリリースされたものはありません" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "新しいリリース '%s' が利用可能になっています。" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "'do-release-upgrade' を実行してアップグレードしてください" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" -msgstr "Ubuntu %(version) のアップグレードが利用可能です" +msgstr "Ubuntu %(version)s のアップグレードが利用可能です" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Ubuntu %s へのアップグレードを拒絶" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "デバッグ出力を追加" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "このコンピューターでサポートされていないパッケージを表示" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "このコンピューターでサポートされているパッケージを表示" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "すべてのパッケージを状態とともに表示" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "すべてのパッケージをリストで表示" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "'%s' のサポート状況の概要:" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" "%(num)s 個のパッケージ (%(percent).1f%%) は、%(time)s までサポートされます" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "%(num)s 個のパッケージ (%(percent).1f%%) は、ダウンロードできません" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "%(num)s 個のパッケージ (%(percent).1f%%) は、サポートされていません" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2450,54 +2470,71 @@ "詳細を見るには、--show-unsupported または --show-supported または --show-all " "を付けて実行してください" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "ダウンロード不可能なパッケージ:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "サポートされていないパッケージ: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "%s までサポートされるパッケージ:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "サポートされていません" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "未実装のメソッド： %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "ディスクにあるファイル" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb パッケージ" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "見つからないパッケージをインストール" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "パッケージ %s がインストールされているべきです。" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb パッケージ" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s は手動インストール済みとマークされている必要があります。" +msgid "%i obsolete entries in the status file" +msgstr "ステータスファイル内に %i 個の廃止されたエントリがあります。" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "dpkgステータス内に廃止されたエントリがあります" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "廃止されたdpkgステータスエントリ" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2506,67 +2543,81 @@ "kdelibs5-dev をインストールする必要があります。詳細は bugs.launchpad.net の " "bug #279621 を参照してください。" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "ステータスファイル内に %i 個の廃止されたエントリがあります。" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "dpkgステータス内に廃止されたエントリがあります" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "廃止されたdpkgステータスエントリ" +msgid "%s needs to be marked as manually installed." +msgstr "%s は手動インストール済みとマークされている必要があります。" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "grub もインストールされているので lilo を削除します。(詳細は bug #314004 を参" "照してください。)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "パッケージ情報が更新された際に、必要なパッケー「%s」が見つからなくなってし" -#~ "まいました。それによりバグ報告のプロセスが開始されました。" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Ubuntu バージョン 12.04 へのアップグレード" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s 個のアップデートが選択されています。" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Ubuntuへようこそ" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "これらのソフトウェアアップデートは、このバージョンのUbuntu のリリース以降" -#~ "に提供されたものです。" - -#~ msgid "Software updates are available for this computer." -#~ msgstr "ソフトウェアアップデートが利用可能です。" - -#~ msgid "Update Manager" -#~ msgstr "アップデートマネージャー" - -#~ msgid "Starting Update Manager" -#~ msgstr "アップデートマネージャーを起動しています" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "無線モデム経由で接続しています。" - -#~ msgid "_Install Updates" -#~ msgstr "アップデートをインストール(_I)" +#~ "パッケージ情報が更新された際に、必要なパッケー「%s」が見つからなくなってし" +#~ "まいました。それによりバグ報告のプロセスが開始されました。" #~ msgid "Checking for a new ubuntu release" #~ msgstr "新しいUbuntuのリリースをチェックする" @@ -2614,6 +2665,9 @@ #~ "ことはできません。より新しいバージョンのUbuntuへアップグレードしてくださ" #~ "い。" +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Ubuntu 11.10にアップグレードする" + #~ msgid "" #~ "The support in Ubuntu 11.04 for your intel graphics hardware is limited " #~ "and you may encounter problems after the upgrade. Do you want to continue " diff -Nru update-manager-17.10.11/po/jv.po update-manager-0.156.14.15/po/jv.po --- update-manager-17.10.11/po/jv.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/jv.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2009. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2009-06-29 03:01+0000\n" "Last-Translator: Rahman Yusri Aftian \n" "Language-Team: Javanese \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "" @@ -42,30 +43,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -75,13 +76,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -96,22 +97,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -124,65 +125,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -191,25 +192,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -218,11 +219,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -233,11 +234,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -245,7 +246,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -254,29 +255,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -286,28 +287,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -315,11 +316,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -331,16 +332,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -353,11 +354,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -366,34 +367,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -406,23 +407,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -433,32 +434,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -466,33 +467,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -503,26 +504,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -530,37 +531,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -568,79 +569,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -648,16 +649,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -666,7 +667,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -675,11 +676,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -687,11 +688,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -699,11 +700,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -713,71 +714,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -787,27 +788,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -817,7 +818,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -826,26 +827,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -853,147 +854,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1001,32 +1002,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1042,7 +1043,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1056,14 +1057,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1071,34 +1072,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1111,28 +1110,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1140,145 +1139,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1286,73 +1285,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1410,7 +1409,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1429,133 +1428,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1563,31 +1570,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1596,34 +1610,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1631,29 +1653,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1662,7 +1684,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1670,58 +1692,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1731,22 +1763,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1760,26 +1788,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1788,7 +1816,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1797,7 +1825,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1806,47 +1834,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1907,54 +1929,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1979,7 +2004,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1991,216 +2016,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/ka.po update-manager-0.156.14.15/po/ka.po --- update-manager-17.10.11/po/ka.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/ka.po 2017-12-23 05:00:38.000000000 +0000 @@ -6,11 +6,12 @@ # FIRST AUTHOR , 2006. # Vladimer Sichinava , 2006. # Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: po_update-manager-ka\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-12-06 06:38+0000\n" "Last-Translator: Vladimer Sichinava \n" "Language-Team: Georgian longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "ცვლილებების დამტკიცება" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "ვერ დადგა '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -865,7 +866,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -876,7 +877,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -884,20 +885,20 @@ "თუ დაეთანხმებით, კონფიგურაციის ფაილში თქვენს მიერ ადრე შეტანილი ცვლილებები " "დაიკარგება." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "'diff' ბრძანება ვერ მოინახა" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "დაიშვა ფატალური შეცდომა" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -905,149 +906,149 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "დახურეთ გახსნილი პროგრამები და დოკუმენტები, მონაცემების დაკარგვის თავიდან " "ასაცილებლად." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "მედიის შეცვლა" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "სხვაობის ჩვენება >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< სხვაობის დამალვა" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "შეცდომა" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&გაუქმება" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&დახურვა" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "ტერმინალის ჩვენება >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< ტერმინალის დამალვა" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "ინფორმაცია" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "ცნობები" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "წაშლა %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "დაყენება %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "განახლდება %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "საჭიროებს გადატვირთვას" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "გადატვირთეთ სისტემა განახლების დასასრულებლად" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_გადატვირთვა" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1055,32 +1056,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "გნებავთ განახლების შეწყვეტა?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1096,7 +1097,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1110,14 +1111,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1125,34 +1126,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "მოცემული ჩამოტვირთვისთვის საჭიროა, დაახლოებით %s. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "განახლებისთვის მომზადება" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "პროგრამების მიღების არხების შეცვლა" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "ახალი პაკეტების მიღება" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "განახლებების დაყენება" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "გასუფთავება" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1165,25 +1164,25 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "წაიშლება %d პაკეტი." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "დადგება %d ახალი პაკეტი." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "განახლდება %d პაკეტი." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1194,96 +1193,96 @@ "\n" "სულ გადმოიტვირთება %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "თქვენი სისტემისათვის ვერ მოინახა განახლებები. პროცედურა შეწყვეტილია." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "საჭიროა გადატვირთვა" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "განახლება დასრულებულია და საჭიროებს გადატვირთვას. გნებავთ მყისვე გადატვირთვა?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "განახლების პროგრამა ვერ გაიშვა" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "განახლების პროგრამის ხელმოწერა" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "განახლების პროგრამა" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "მიღება ვერ მოხერხდა" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "ვერ მოხერხდა განახლების მიღება. შესაძლოა ქსელის პრობლემა იყოს. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "აუთენტიფიკაცია ვერ მოხერხდა" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1291,13 +1290,13 @@ "განახლების აუთენტიფიკაცია ვერ მოხერხდა. შესაძლოა ქსელის ან სერვერის პრობლემა " "იყოს. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "განარქივება ვერ განხორციელდა" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1305,13 +1304,13 @@ "განახლების განარქივება ვერ განხორციელდა. შესაძლოა ქსელის ან სერვერის " "პრობლემა იყოს. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1319,27 +1318,27 @@ "განახლების შეჯერება წარუმატებლად დამთავრდა. შესაძლოა პრობლემა ქსელის ან " "სერვერის მიერ არის გამოწვეული. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1347,73 +1346,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "შეწყვეტა" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "წაშლა:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "გაგრძელება [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "ცნობები [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "წაშლა: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "დაყენება: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "განახლება: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1477,7 +1476,7 @@ msgstr "დისტრიბუტივის განახლება" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1496,165 +1495,180 @@ msgid "Terminal" msgstr "ტერმინალი" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "გთხოვთ მოითმინოთ, მიმდინარე პროცესს საკმაო დრო სჭირდება." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "განახლება დასრულებულია" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "ვერ მოინახა ჩანაწერი გამოშვების შესახებ" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "შესაძლებელია სერვერი გადატვირთულია. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "შეუძლებელია ვერსიის შენიშვნების გადმოწერა" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "შეამოწმეთ ინტერნეტ-კავშირი." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "გამოშვების მონაცემები" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "ბმის გახსნა ბრაუზერში" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "ბმის ასლის ბუფერიზაცია" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "მე-%(current)li ფაილის გადმოწერა %(total)li-დან. სიჩქარე - %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "მე-%(current)li ფაილის გადმოწერა %(total)li-დან" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "დაყენება" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "ვერსია %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "მიმდინარეობს ცვლილებათა სიის გადმოწერა..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "შესაძლებელია სერვერი გადატვირთულია. " +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1663,34 +1677,44 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"პროგრამათა განახლებები ასწორებს შეცდომებს, უსაფრთხოების ხარვეზებს და ამატებს " +"ახალ შესაძლებლობებს." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1698,29 +1722,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "პაკეტების შესახებ ინფორმაციის მოძიება" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "შეუძლებელია პაკეტის შესახებ ინფორმაციის მიღება" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1733,7 +1757,7 @@ "გთხოვთ შეგვატყობინოთ 'update-manager'-ის ხარზვეზის შესახებ და მოაყოლეთ " "გენერირებული შეტყობინება:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1741,52 +1765,52 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(ზომა: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "%(old_version)s ვერსიიდან %(new_version)s-მდე" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "ვერსია %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "პროგრამების სიის ინდექსი დაზიანებულია" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1795,6 +1819,16 @@ "შეუძლებელია პროგრამების დაყენება ან წაშლა. ჯერ გამოასწორეთ დეფექტი პაკეტების " "მენეჯერით Synaptic ან ტერმინალში \"sudo apt-get install -f\" ბრძანებით." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "გაუქმება" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1804,22 +1838,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "გაუქმება" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "განახლებათა სიის შექმნა" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1833,20 +1863,20 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -1854,7 +1884,7 @@ "ვერ განხორციელდა ცვლილებების სიის გადმოწერა.\n" "შეამოწმეთ ინტერნეტ-კავშირი." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1863,7 +1893,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1872,7 +1902,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1881,52 +1911,43 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "უსაფრთხოებისთვის მნიშვნელოვანი განახლებები" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "რეკომენდებული განახლებები" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "შემოთავაზებული განახლებები" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "ბექპორტები" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "დისტრიბუტივის განახლებები" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "სხვა განახლებები" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "ირთვება განახლებების მოურავი" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"პროგრამათა განახლებები ასწორებს შეცდომებს, უსაფრთხოების ხარვეზებს და ამატებს " -"ახალ შესაძლებლობებს." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_ნაწილობრივი განახლება" @@ -1990,59 +2011,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "პროგრამათა განახლებები" +msgid "Update Manager" +msgstr "განახლების მოურავი" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "პროგრამათა განახლებები" +msgid "Starting Update Manager" +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_განახლება" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "განახლებები" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "დაყენება" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "ცვლილებები" +msgid "updates" +msgstr "განახლებები" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "აღწერილობა" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "განახლების აღწერილობა" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "განახლებების _დაყენება" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "ცვლილებები" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "" +msgid "Description" +msgstr "აღწერილობა" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "დაყენება" +msgid "Description of update" +msgstr "განახლების აღწერილობა" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2066,7 +2087,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -2078,57 +2099,57 @@ msgid "Show and install available updates" msgstr "ახალი განახლებების ჩვენება და ჩადგმა" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "ვერსიის ჩვენება და გასვლა" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "შეამოწმება, არის თუ არა შესაძლებელი ბოლო განვითარებად გამოცემაზე გადასვლა" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "სცადეთ dist-upgrade ბრძანების გაშვება" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "ნაწილობრივი განახლების დაწყება" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "სწადეთ განაახლოთ $distro-proposed -ზე" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2138,169 +2159,229 @@ "'desktop' ჩვეულებრივი სამაგიდო სისტემების განახლებისთვის, ხოლო 'server' " "სერვერ სისტემებისთვის." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "მითითებული ფრონტენდის გაშვება" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "არავითარი ახალი გამოცემა" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." msgstr "" -#~ msgid "Update Manager" -#~ msgstr "განახლების მოურავი" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "განახლებების _დაყენება" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "Checking for a new ubuntu release" #~ msgstr "უბუნტუს ახალი ვერსიის არსებობის შემოწმება" diff -Nru update-manager-17.10.11/po/kk.po update-manager-0.156.14.15/po/kk.po --- update-manager-17.10.11/po/kk.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/kk.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2009. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-02-23 19:49+0000\n" "Last-Translator: jmb_kz \n" "Language-Team: Kazakh \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f Мб" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s үшін сервер" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Негізгі сервер" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Өзіңіздің серверлеріңіз" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "sources.list элементін санау мүмкін емес" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Пакеттер файлдарын табу мүмкін емес, мүмкін бұл Ubuntu дистрибутивының " "дискісі да емес, немесе бұрыс сәулетті диск шығар?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "CD дискі қосу сәтсіз аяқталды" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -83,12 +84,12 @@ "Қате туралы мәлімдеме:\n" "\"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Қате етіп белгіленген пакетті жою" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -105,15 +106,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Мүмкін сервер асыра тиелген" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Бұзылған пакеттер" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -123,7 +124,7 @@ "біреуінің көмегімен жөндеңіз." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -144,11 +145,11 @@ " * Ubuntu қолдау көрсетпейтін ресми емес бағдарламалар пакеттерінен\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Мүмкін бұл уақытша мәселе, кейінірек тағы байқап көріңіз." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -157,16 +158,16 @@ "терминалда \"ubuntu-bug update-manager\" командасын орындау арқылы " "хабарлаңыз." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Жүйенің жаңартуын есептеу мүмкін емес" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Кейбір пакеттердің растығын тексеру кезінде қате туындады" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -176,7 +177,7 @@ "уақытты мәселе, кейінірек тағы қайталап көріңіз. Төменде шынайлығы тексеріле " "алынбаған пакеттер тізімі көрсетілген." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -184,23 +185,23 @@ "\"%s\" пакеті жойылуға тиісті етіп белгіленген, бірақ ол жойылуға тыйым " "салынған тізімде." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "\"%s\" негізгі пакеті жойылуға тиісті етіп белгіленген." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" "Қара тізімге кірістірілген '%s' нұсқасының орнатылу мүмкіндігі орындалуда" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "\"%s\" орнату мүмкін емес" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -209,11 +210,11 @@ "bug update-manager\" командасын орындау арқылы хабарлаңыз." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Мета-пакетті теріп алынбады" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -227,15 +228,15 @@ " Алдымен, жоғары аталған пакеттердің біреуін, synaptic немесе apt-get " "бағдарламасының көмегімен орнатыңыз." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Кэшті оқу" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Ерекше бөгеттеу (блокировка) алу мүмкін емес" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -244,11 +245,11 @@ "басқа көшірмесі жұмыс істегінін білдіреді. Әрі қарай осы бағдарламамен жұмыс " "істеу үшін, басқа бағдарлама көшірмесін жабыңыз." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Алыстаған қосылыста жаңартуға тыйым салынған" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -262,11 +263,11 @@ "\n" "Жаңарту тоқтатылды. Жаңартуды ssh қолданбай-ақ жасап көріңіз." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "SSH астында жұмысты жалғастыру қажет пе?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -284,11 +285,11 @@ "істейтін болады.\n" "Әрі қарай жалғастырасыз ба?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Қосымша sshd қосылуы" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -299,7 +300,7 @@ "жүктелінеді. Егер бірдеңе болып қалса, осы қызметке ssh көмегімен қосыла " "аласыз.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -312,29 +313,29 @@ "болады. Сіз оны өзіңіз келедей ашуыңызға болады:\n" "\"%s\"" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Жаңарту мүмкін емес" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "'%s', '%s' дейін осы қосымша құралмен мүмкін емес." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "\"Құмсалғыш\" (песочница) орнату сәтсіз" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Қауіпсіз орта (құмсалғыш (песочница)) құру мүмкін емес." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "\"Құмсалғыш\" (песочница) режимі (қауіпсіз орта)" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -344,18 +345,18 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Python дұрыс емес орнатылған. \"/usr/bin/python\" символдық сілтемені " "жөндеңіз." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "\"debsig-verify\" пакеті орнатылған" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -365,12 +366,12 @@ "Ең алдымен оны Synaptic немесе 'apt-get remove debsig-verify' арқылы " "жойыңыз, кейін жаңартуды басынан жасап көріңіз." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -378,11 +379,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Соңғы жаңартуларды Интернет желісінен жүктейін бе?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -403,16 +404,16 @@ "Егер де сіз 'Жоқ' деп жауап берсеңіз, жаңартулар интернеттен жүктелінбейтін " "болады." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "%s дейін жаңарту кезінде бөгеттелген" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Дұрыс жұмыс істейтін айна табылмады" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -432,11 +433,11 @@ "Егер де 'Жоқ' таңдасаңыз, жаңарту тоқтатылады." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Қалыпты қайнар көздерді генерациялайын ба?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -449,21 +450,21 @@ "'%s' үшін қалыпты жазуды қосу қажет пе? Егер 'Жоқ' таңдалғаны жаңартудан бас " "тартқаныңыз." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Репозиторий туралы ақпарат қате" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Үшінші жақты бағдарламалар қайнар көзі өшірілді" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -474,12 +475,12 @@ "бағдарламасында немесе сіздің пакеттер менеджерінде оларды оң етіп белгілеу " "арқылы қолданылуыңыз мүмкін." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Пакет(тер) тұрақсыз күйде" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -494,11 +495,11 @@ "қатысты мұрағат файлы (архивный файл) табылмады. Бұл пакетті жекешелей " "жаңартыңыз немесе жойыңыз." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Жаңарту кезінде қате туындады" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -506,13 +507,13 @@ "Жаңарту кезіндегі мәселе туындады. Әдетте бұл желідегі мәселелерінің " "кесірінен болуы мүмкін. Желілік қосылыстарды тексеріп, қайталап көріңіз." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Дискіде қажетті бос орын жоқ" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -527,21 +528,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Өзгертулерді есептеу" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Жүйенің жаңартуын бастау қажет пе?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Жаңарту болдырылмады" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -549,12 +550,12 @@ "Бұл жаңарту тоқтатылып, жүйе бастапқы күйге келтірілетін болады. Жаңартуды " "кейінірек жалғастыруыңызға болады." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Жаңартуларды жүктеу мүмкін емес" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -565,27 +566,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Іске асыру кезінде қате туындады" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Жүйені бастапқы қалпына келтіру" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Жаңартуларды орнату мүмкін емес" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -593,7 +594,7 @@ "Жаңарту үзілді. Сіздің жүйеңіз бұзылып, қолдануға жарамсыз болуы мүмкін. " "Қазір қайта қалпына келтіру үрдісі орындалатын болады (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -604,7 +605,7 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -612,20 +613,20 @@ "Жаңарту үзілді. Интернетпен қосылысыңызды не орнатушы дискісін тексеріңіз " "де, жаңартуды қайтадан орындап көріңіз. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Ескірген пакеттерді жоя қажет пе?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Қалдыру" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Жою" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -633,37 +634,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Қажетті тәуелділіктер орнатылмаған" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Қажетті \"%s\" тәуелділігі орнатылмаған. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Пакеттер менеджері тексеру" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Жаңартуға дайындық сәтсіз аяқталды" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Жаңартуға дайындық сәтсіз аяқталды" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -671,68 +672,68 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Репозиторий туралы ақпаратын жаңарту" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Дискті қосу сәтсіз аяқталды" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Кешіріңіз, дискті қосу сәтсіз аяқталды." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Пакет туралы дұрыс емес ақпарат" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Жүктелу" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Жаңартылу" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Жаңарту аяқталды" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "Жаңарту аяқталды, бірақ жаңарту кезінде қателер пайда болды." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Ескерген бағдарламаларды іздеу" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Жүйенің жаңартылуы аяқталды." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Жарым-жартылай жаңарту аяқталды." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms қолданыста" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -742,11 +743,11 @@ "жатыр. Ендігәрі \"evms\" бағдарламалық қамтамасыздандыруға қолдау " "көрсетілмейді. Оны жауып жаңартуды қайтадан жасап көріңіз." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -754,9 +755,9 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -765,8 +766,8 @@ "істейтін ойындар мен бағдарламалардың өнімділігін төмендеуіне әкеліп " "соқтыруы мүмкін." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -779,7 +780,7 @@ "\n" "Жалғастыру қажет пе?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -792,11 +793,11 @@ "\n" "Жалғастыру қажет пе?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "i686 сәулетімен үйлесімді орталық процессор жоқ" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -808,11 +809,11 @@ "сәулетімен үйлесімді орталық процессорлармен тиімді жұмыс істеу үшін етіп " "жиналған." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "ARMv6 орталық процессоры (CPU) жоқ" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -824,11 +825,11 @@ "сәулеттерге арналып қалыпқа келтірілген. Ағымдағы құралдар жабдықтармен, " "жүйеңізді Ubuntu жаңа релизіне дейін жаңарту мүмкін емес." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "init қызметі жетімсіз" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -844,15 +845,15 @@ "\n" "Жалғастыруды қалайсыз ба?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "aufs қолданып, қауіпсіз ортада (құмсалғышта) жаңарту" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Жаңартулар пакеттері бар CD/DVD дискілерін көрсетілген жерден іздеу" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -860,58 +861,58 @@ "Интерфейсті қолдану. Қазір жетімділер: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "Бұл параметр ЕСКЕРДІ және қолданылмайтын болады" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Тек жартылай жаңартуларды дайындау (sources.list үстінен басылмайтын болады)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "GNU экранның қолдауын алып тастау" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Мәліметтер бумасын орнату" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "\"%s\" приводына \"%s\" салыңыз" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Жүктеу аяқталды" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "%li файлдың %li, %sбайт/сек жылдамдығымен жүктелінді" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Шамамен %s қалды" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "%li ішінен %li файл жүктелуде" @@ -921,27 +922,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Өзгерістерді қолдану" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "тәуелділік қателері - қалыпқа келтірмеген етіп қалдыру" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "\"%s\" орнату мүмкін емес" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -954,7 +955,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -965,7 +966,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -973,20 +974,20 @@ "Егер баптау файлдың бұрыңғы нұсқасын жаңа нұсқасымен алмастытатын болсаңыз, " "онда ол баптау файлдағы өзгертулеріңіздің барлығы жоғалады." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "\"diff\" командасы табылмады" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Аса ауыр қате туындады" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -999,13 +1000,13 @@ "sources.list файлыңыздың көшірмесі осы жерде сақталынған /etc/apt/sources." "list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c басылды" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1014,136 +1015,136 @@ "Жалғастырасыз ба?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Мәліметтерді жоғалтуын болдырмау үшін, барлық ашық бағдарламалар мен " "құжаттарды жабыңыз." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Ендігәрі Canonical (%s) компаниясымен қолдау көрсетілмейді" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Ескірген нұсқаны орнату (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Жою (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Ендігәрі қажет емес (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Орнату (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Жаңарту (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Сақтауышты ауыстыру" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Айырмашылықтарды көрсету >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Айырмашылықтарды жасыру" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Қате" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "_Болдырмау" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Жабу" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Терминалды көрсету >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Терминалды жасыру" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Мәлімет" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Көбірек білу" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Қолдау көрсетілмейді (%s)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "%s жою" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "%s жою (автоматты орнатылған)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "%s орнату" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "%s жаңарту" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Компьютерді қайта жүктеу қажет" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Жаңартуды аяқтау үшін компьютерді қайта жүктеңіз" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Қазір қайта жүктеу" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1154,29 +1155,29 @@ "Егер де сіз жаңартуды үзетін болсаңыз, жүйе тұрақсыз жұмыс істеуі мүмкін. " "Жаңартуды әрі қарай жалғастыруды қадала жасауға ұсынамыз." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Жаңартуды болдырмау қажет пе?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li күн" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li сағат" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li минут" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1191,7 +1192,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1205,14 +1206,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1222,34 +1223,32 @@ "Dial-up жылдамдығында шамамен %s алатын болады." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Сіздің қосылысыңызда жүктеу шамамен %s алатын болады. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Жаңартуға дайындалу" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Бағдарламалар қайнар көздерін өзгерту" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Жаңа пакеттерді алу" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Жаңартуларды орнату" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Тазарту" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1263,25 +1262,25 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d жойылатын болады." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d пакеті(тері) орнатылатын болады." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d пакеті(тері) жаңартылатын болады." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1292,65 +1291,65 @@ "\n" "Жалпы %s жүктеу қажет. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" "Сіздің жүйеңізге ешбір жаңарту жетімді емес. Жаңарту кері қайтатын болады." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Компьютерді қайта жүктеу қажет" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Жаңарту аяқталды және қайта жүктеу қажет. Қазір қайта жүктеу орындайсыз ба?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Жаңарту құралын ашу мүмкін емес" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1358,34 +1357,34 @@ "Жаңарту құралындаға бар секілді. Осы қате туралы терминалда \"ubuntu-bug " "update-manager\" командасын орындау арқылы хабарлаңыз." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Жаңарту құралын баспасы" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Жаңарту құралы" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Алу мүмкін емес" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "Жаңартуларды алу мүмкін сәтсіз аяқталды. Желілік мәселелер болуы мүмкін. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Аутентификация сәтсіз" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1393,13 +1392,13 @@ "жаңартулардың шынайлығын растау сәтсіз аяқталды. Желімен не сервермен " "мәселелер болуы мүмкін. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Шығарып алу (извлечь) сәтсіз" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1407,28 +1406,28 @@ "Жаңартуларды шығарып алу сәтсіз аяқталды. Желімен не сервермен мәселелер " "болуы мүмкін. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Тексеріліс сәтсіз" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" "Тексеріліс сәтсіз аяқталды. Желімен не сервермен мәселелер болуы мүмкін. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Жаңарту процессін ашу мүмкін емес" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1437,13 +1436,13 @@ "болады. Нүктені noexec параметрсіз қайта тіркеңіз де, қайтадан жаңартып " "көріңіз." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Қате туралы хабарлама \"%s\"." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1455,73 +1454,73 @@ "sources.list файлыңыздың көшірмесі осы жерде сақталынған /etc/apt/sources." "list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Тоқтатып жатырмын" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Төмендетілген:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Жалғастыру үшін [ENTER] пернесін басыңыз" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Жалғастыру [иЖ] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Толық ақпарат [т]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "и" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "ж" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "т" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Қолдау көрсетілмейді: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Жоюға: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Орнатуға: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Жаңартуға: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Жалғастыру [Иж] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1588,9 +1587,8 @@ msgstr "Дистрибутивті жаңарту" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Ubuntu-ны 11.10 нұсқасына дейін жаңарту" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1608,145 +1606,159 @@ msgid "Terminal" msgstr "Терминал" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Күтіңіз, бұл біраз уақыт алуы мүмкін." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Жаңарту аяқталды" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Релиз туралы мәліметтері табылмады" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Мүмкін сервер аса жүктеулі. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Релиз туралы мәліметтері жүктеу мүмкін емес" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Өзіңіздің интернетпен қосылысыңызды тексеріңіз." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Жаңарту" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Релиз туралы мәлімет" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Пакеттердің қосымша файлдары жүктелуде..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "%sб/с жылдамдықпен %s файлдың %s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "%s файлдың %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Сілтемені веб шолғышта ашу" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Сілтемені алмастыру буферіне көшіру" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "%(speed)s/с жылдамдықпен %(total)li файлдың %(current)li жүктелінуде" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "%(total)li файлдың %(current)li жүктелінуде" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Сіздің Ubuntu нұсқаңызға қолдау ендігәрі көрсетілмейді." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Жаңарту жайлы ақпарат" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Орнату" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "%s нұсқасы: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "Желілік қосылыс жоқ, өзгертулер тізімін жүктеп алу мүмкін емес." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Өзгертулер тізімін жүктеу..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Белгілердің барлығын алып тастау" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Б_арлығын таңдау" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s жаңарту белгіленген." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s жүктелінетін болады." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "Жаңарту(лар) жүктелінді, бірақ орнатылмады" +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Жүктелінетін көлем белгісіз." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1754,7 +1766,7 @@ "Пакет жайлы мәлімет қашан жаңартылғаны белгісіз. Мәліметті жаңарту үшін " "\"Тексеру\" батырмасын басыңыз." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1763,13 +1775,13 @@ "Пакеттер жайлы мәлімет %(days_ago)s күн бұрын жаңартылған.\n" "Жаңартулардың жетімдігін тексеру үшін \"Тексеру\" батырмасын басыңыз." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "Пакеттер жайлы мәлімет %(days_ago)s күн бұрын жаңартылған." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1777,34 +1789,44 @@ msgstr[0] "Пакеттер жайлы мәлімет %(hours_ago)s сағат бұрын жаңартылған." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Пакеттер жайлы мәлімет %s минут бұрын жаңартылған." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Пакеттер жайлы мәлімет қазір ғана жаңартылды." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Бағдарламалардың жаңартулары қателер мен осалдықтарды (уязвимости) жөндеп, " +"жаңа мүмкіншіліктерді қосады." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Сіздің компьютеріңіз үшін жаңартулар жетімді болуы мүмкін." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Ubuntu-ға қош келдіңіз" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1816,7 +1838,7 @@ "clean\" команданы орындау арқылы өзіңіздің корзинаңызды тазартып, " "бағдарламалар орнатылымның уақытша пакеттерді жойыңыз." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1824,23 +1846,23 @@ "Жаңартуды толығымен орнату үшін, компьютерді қайта жүктеу қажет. Әрі қарай " "жалғастыру алдында, өзіңіздің жұмысыңызды сақтаңыз." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Пакет туралы ақпаратты оқу" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Қосылуда..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "Жаңартуларға тексеру немесе жүктеуге құқықтар жетіспейді." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Пакеттер жайлы ақпаратты алу мүмкін емес" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1853,7 +1875,7 @@ "\"update-manager\" пакетінің осы қате туралы хабарлап, оған қосы келесі " "хабарламаны қосыңыз:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1865,31 +1887,31 @@ "\"update-manager\" пакетінің осы қате туралы хабарлап, оған қосы келесі " "хабарламаны қосыңыз:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Жаңа орнатылым)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Мөлшер: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "%(old_version)s нұсқасынан %(new_version)s нұсқасына" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Нұсқа %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Дәл қазір релизді жаңартуы мүмкін емес" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1898,21 +1920,21 @@ "Релиздың жаңартуын қазір орындауға болмайды, кейінірек қайта жасап көріңіз. " "Сервер жауабы: \"%s\"" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Дистрибутивті жаңарту құралы жүктелуде" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Ubuntu жаңа \"%s\" релизі жетімді" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Бағдарламалардың индексі бұзылған" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1922,6 +1944,17 @@ "\" пакеттер менеджерін қолданыңыз немесе терминалда \"sudo apt-get install -f" "\" орындаңыз." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "\"%s\" жаңа релизі жетімді" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Болдырмау" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Жаңартулардың жетімдігіне тексеру" @@ -1931,22 +1964,18 @@ msgstr "Барлық жетімді жаңартуларды орнату" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Болдырмау" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Жаңартулар тізімі құрастырылуда" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1970,21 +1999,21 @@ " * Ubuntu-да қолдау жоқ ресми емес пакеттердің кесірінен\n" " * Ubuntu алдын ала нұсқасындағы жасалған өзгертулер кесірінен" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Өзгертулер тізімін жүктеу" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Басқа жаңартулар (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" "Бұл өзгерту өзгертулердің тарихын сақтамайтын қайнар көзінен ұсынылған." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -1992,7 +2021,7 @@ "Өзгертулер тізімін жүктеу сәтсіз аяқталды. \n" "Өзіңіздің интернет қосылысыңызды тексеріңіз." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2005,7 +2034,7 @@ "Жетімді нұсқа: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2019,7 +2048,7 @@ "+changelog\n" "қараңыз немесе өзгертулер тізімін кейінірек қайтадан байқап көріңіз." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2033,53 +2062,44 @@ "+changelog\n" "қараңыз немесе өзгертулер тізімін кейінірек қайтадан байқап көріңіз." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Дистрибутивті анықтау мүмкін емес" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" "Қандай жүйенің қолданып жатқаныңызды анықтау кезінде \"%s\" қатесі туындады." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Маңызды қауіпсіздік жаңартулары" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Қолдануға ұсынылған жаңартулар" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Ұсынылған жаңартулар" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Бұрыңғы нұсқаларынан бейімделу (backports-бэкпорты)" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Дистрибутив жаңартулары" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Басқа жаңартулар" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Жаңарту менеджері ашылуда" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Бағдарламалардың жаңартулары қателер мен осалдықтарды (уязвимости) жөндеп, " -"жаңа мүмкіншіліктерді қосады." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Жарым-жартылай жаңарту" @@ -2155,37 +2175,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Бағдарламалардың жаңартулары" +msgid "Update Manager" +msgstr "Жаңарту менеджері" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Бағдарламалардың жаңартулары" +msgid "Starting Update Manager" +msgstr "Жаңарту менеджері ашылуда" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Жаңарту" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "жаңартулар" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Орнату" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Өзгерістер" +msgid "updates" +msgstr "жаңартулар" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Сипаттама" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Жаңартудың сипаттамасы" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2193,24 +2203,34 @@ "Сіз роумингте қосылып тұрсыз, бұл жаңарту кезінде алынатын мәліметке қосымша " "ақы төлеуіңізге әкелу мүмкін." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Сіз сымсыз модем арқылы қосылып тұрсыз." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Жаңарту алдында компьютерді электр қуат көзіне қосқаны қауіпсіздеу болады." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "Жаңартуларды _орнату" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Өзгерістер" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Баптаулар..." +msgid "Description" +msgstr "Сипаттама" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Орнату" +msgid "Description of update" +msgstr "Жаңартудың сипаттамасы" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Баптаулар..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2233,9 +2253,8 @@ msgstr "Сіз Ubuntu-ның келесі нұсқасына дейін жаңартуды кері қайтардыңыз" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Жаңарту менеджерін ашып, \"Жаңартуларды орнату\" батырмасын басу арқылы, " @@ -2249,59 +2268,59 @@ msgid "Show and install available updates" msgstr "Жетімді жаңартуларды көрсету және орнату" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Үлгісін көрсету және шығу" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Мәліммет файлдары бар бума" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Ubuntu-ның жаңа релизінің жетімдігін тексеру" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "Дистрибутивтің соңғы тұрақсыз үлгісіне дейін жаңарту мүмкіндігін тексеру" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "Жаңарту менеджерінің соңғы үлгісін қолданып жаңартуларды жасау" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Ашылатын кезде картаны фокустамау (таңдамау)" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "dist-upgrade командасын орындап көріңіз" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Компьютер қосылған кезде жаңартуларға жетімдігін тексермеу" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Жаңартуларды қауіпсіз режимінде тестілеу" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Жарым-жартылай жаңарту жасалынуда" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "$distro-proposed бұтағындағы жаңарту құралын қолданып, соңғы релизге дейін " "жаңартып көріңіз" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2311,11 +2330,11 @@ "Қазіргі уақытта жүйелі жаңартулар \"***настольный***\" және \"серверлік\" " "жүйелерге жетімді." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Көрсетілген интерфейсті ашу" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2323,11 +2342,11 @@ "Дистрибутивтің жаңа нұсқасының жетімдігін тексеріп, нәтижесін шығу кодымен " "шығару" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2335,168 +2354,212 @@ "Жаңарту жайлы мәліметті осы жерден таба аласыз:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Жаңа релиз табылмады" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "\"%s\" жаңа релизі жетімді" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" "Сол релизге дейін жаңартылу үшін \"do-release-upgrade\" командасын орындаңыз." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Ubuntu %(version)s жаңартуы жетімді" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Сіз Ubuntu-ды %s дейін жаңартуды кері қайтардыңыз" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Орындалмаған әдіс: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Дисктегі файл" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb пакеті" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Жетіспеген пакетті орнату." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "%s пакетті орнату қажет." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb пакеті" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s жекешелей орнатылған етіп белгілену қажет." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"Жаңарту кезінде, орнатылған kdelibs5-dev орнына kdelibs4-dev орнату қажет. " -"Бұл қате жайлы осы жерде оқуыңызға болады, bugs.launchpad.net, bug #279621." - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "Күй файлдың %i құрамдасы ескірген" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "dpkg күйдің құрамы ескірген" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "dpkg күйлер құрамы ескірген" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" -msgstr "Егер grub орнатылған болса, lilo жойыңыз. (толығырақ, bug #314004)" +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"Жаңарту кезінде, орнатылған kdelibs5-dev орнына kdelibs4-dev орнату қажет. " +"Бұл қате жайлы осы жерде оқуыңызға болады, bugs.launchpad.net, bug #279621." -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s жаңарту белгіленген." +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s жекешелей орнатылған етіп белгілену қажет." -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +msgstr "Егер grub орнатылған болса, lilo жойыңыз. (толығырақ, bug #314004)" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Ubuntu-ға қош келдіңіз" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Жаңарту менеджері" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "Starting Update Manager" -#~ msgstr "Жаңарту менеджері ашылуда" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Сіз сымсыз модем арқылы қосылып тұрсыз." +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "Жаңартуларды _орнату" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "Checking for a new ubuntu release" #~ msgstr "Ubuntu-ның жаңа релизінің жетімдігін тексеру" @@ -2538,6 +2601,10 @@ #~ msgid "There are no updates to install" #~ msgstr "Орнатылатын жаңарту жоқ" +#~ msgid "The update has already been downloaded, but not installed" +#~ msgid_plural "The updates have already been downloaded, but not installed" +#~ msgstr[0] "Жаңарту(лар) жүктелінді, бірақ орнатылмады" + #~ msgid "" #~ "You will not get any further security fixes or critical updates. Please " #~ "upgrade to a later version of Ubuntu Linux." @@ -2598,6 +2665,9 @@ #~ "update-manager\" командасын орындау арқылы хабарлаңыз, хабарламаға қоса /" #~ "var/log/dist-upgrade/ бумасындағы файлдарды тиеңіз." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Ubuntu-ны 11.10 нұсқасына дейін жаңарту" + #~ msgid "" #~ "\n" #~ "\n" diff -Nru update-manager-17.10.11/po/km.po update-manager-0.156.14.15/po/km.po --- update-manager-17.10.11/po/km.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/km.po 2017-12-23 05:00:38.000000000 +0000 @@ -4,11 +4,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2010. # Khoem Sokhem , 2012. +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: po_update-manager-km\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-21 08:35+0000\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" @@ -22,20 +23,20 @@ "X-Language: km-KH\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" msgstr[0] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "ម៉ាស៊ីន​បម្រើ​សម្រាប់ %s" @@ -43,31 +44,31 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "ម៉ាស៊ីន​បម្រើ​មេ" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "ម៉ាស៊ីន​បម្រើ​ផ្ទាល់ខ្លួន" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "មិន​អាច​គណនា​ធាតុ sources.list បាន​ឡើយ" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" "មិន​អាច​រក​ឃើញទីតាំង​ឯកសារ​កញ្ចប់​ណាមួយ​ឡើយ ប្រហែល​វា​មិនមែន​ជា​ថាស​អ៊ូប៊ុនទូ ឬ​ស្ថាបត្យកម្ម​ដែល​ត្រឹមត្រូវ​ទេ ?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បន្ថែម​ស៊ីឌី" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,12 +83,12 @@ "សារ​កំហុស​គឺ ៖\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "យក​កញ្ចប់​ដែល​ស្ថិត​ក្នុង​ស្ថានភាព​មិនត្រឹមត្រូវ​ចេញ" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -103,15 +104,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "ម៉ាស៊ីន​បម្រើ​អាច​នឹង​ផ្ទុក​លើស" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "កញ្ចប់​ខូច" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -120,7 +121,7 @@ "synaptic ឬ apt-get មុន​នឹង​បន្ត ។" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -141,11 +142,11 @@ " * កញ្ចប់​កម្មវិធី​មិន​ផ្លូវការ​មិន​ត្រូវ​បាន​ផ្ដល់​ដោយ​អ៊ូប៊ុនទូ\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "វា​អាច​នឹង​ជា​បញ្ហា​បណ្ដោះអាសន្ន​ប៉ុណ្ណោះ សូម​ព្យាយាម​ម្ដងទៀត​នៅ​ពេលក្រោយ ។" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -153,16 +154,16 @@ "ប្រសិនបើ​មិន​អាច​ដោះស្រាយ​បញ្ហា​ណាមួយ​បាន​ សូម​រាយការណ៍​អំពី​កំហុស​នេះ​ដោយ​ប្រើ​ពាក្យ​បញ្ជា 'ubuntu-bug " "update-manager' នៅ​ក្នុង​ស្ថានីយ ។" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "មិន​អាច​គណនា​ការ​ធ្វើឲ្យ​ប្រសើរ​បាន​ឡើយ" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "កំហុស​ក្នុង​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​របស់​កញ្ចប់​មួយចំនួន" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -172,28 +173,28 @@ "តែប៉ុណ្ណោះ ។ អ្នក​ប្រហែលជា​ចង់​ព្យាយាម​ម្ដងទៀត​នៅពេលក្រោយ ។ សូម​មើល​ខាងក្រោម​នេះ​សម្រាប់​បញ្ជី​បញ្ចប់​ដែល​ពុំ​" "ទាន់​បាន​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ ។" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "កញ្ចប់ '%s' ត្រូវ​បាន​សម្គាល់​សម្រាប់​ការ​យកចេញ ប៉ុន្តែ​វា​ស្ថិត​នៅ​ក្នុង​បញ្ជី​ខ្មៅ ។" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "កញ្ចប់​ដែល​ចាំបាច់ '%s' ត្រូវ​បាន​សម្គាល់​សម្រាប់​ការ​យកចេញ ។" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "សាកល្បងដំឡើង​កំណែ​ក្នុង​បញ្ជី​ខ្មៅ '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "មិន​អាច​ដំឡើង '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -202,11 +203,11 @@ "update-manager' នៅ​ក្នុង​ស្ថានីយ ។" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "មិន​អាច​ទាយ​កញ្ចប់​មេតា​បាន​ឡើយ" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -218,15 +219,15 @@ "edubuntu-desktop ទេ ហើយ​វា​ក៏​មិន​អាច​រក​ឃើញ​កំណែ​អ៊ូប៊ុនទូ​ណាមួយ​ដែល​អ្នក​កំពុងតែ​ដំណើរការ​ផង​ដែរ ។\n" " សូម​ដំឡើង​កញ្ចប់​ណាមួយ​នៅ​ខាងលើ​នេះ​សិន ដោយ​ប្រើ synaptic ឬ apt-get មុន​នឹង​បន្ត ។" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "អាន​ឃ្លាំងសម្ងាត់" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "មិន​អាច​ចាក់សោ​កញ្ចប់​បាន​ឡើយ" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -234,11 +235,11 @@ "ជាទូទៅ មាន​ន័យ​ថា​កម្មវិធី​គ្រប់គ្រង​កញ្ចប់​ផ្សេងទៀត (ដូចជា apt-get ឬ aptitude) កំពុងតែ​បាន​ដំណើរការ​" "រួចហើយ ។ សូម​បិទ​កម្មវិធី​នោះ​ជាមុន​សិន ។" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "ការ​ធ្វើឲ្យ​ប្រសើរ​តាម​រយៈ​ការ​តភ្ជាប់​ពី​ចម្ងាយ​មិន​ត្រូវ​បាន​គាំទ្រ" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -251,11 +252,11 @@ "\n" "ការ​ធ្វើឲ្យ​ប្រសើរ​នឹង​ត្រូវ​បោះបង់​ឥឡូវ​នេះ ។ សូម​ព្យាយាម​ដោយ​មិន​ប្រើ ssh ។" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "បន្ត​ដំណើរការ​ក្រោម​ SSH ឬ ?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -271,11 +272,11 @@ "ប្រសិនបើ​អ្នក​បន្ត ដេមិន ssh បន្ថែម​នឹង​ត្រូវ​បាន​ចាប់ផ្ដើម​នៅ​ត្រង់​ច្រក '%s' ។\n" "តើ​អ្នក​ចង់​បន្ត​ដែរ​ឬ​ទេ ?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "ចាប់ផ្ដើម sshd បន្ថែម" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -286,7 +287,7 @@ "នៅ​លើ​ច្រក '%s' ។ ប្រសិនបើ​មាន​អ្វី​មួយ​មិន​ត្រឹមត្រូវ​ជាមួយ​នឹង​ការ​ដំណើរការ ssh អ្នក​នៅតែ​អាច​តភ្ជាប់​" "ទៅកាន់ sshd បន្ថែម​បាន​ដដែល ។\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -298,29 +299,29 @@ "ដូច្នេះ​មាន​គ្រោះថ្នាក់​ខ្លាំង វា​មិន​ត្រូវ​បាន​ធ្វើ​ដោយស្វ័យប្រវត្តិ​ទេ ។ អ្នក​អាច​បើក​ច្រក​ជាមួយ ឧ. ៖\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "មិន​អាច​ធ្វើឲ្យ​ប្រសើរ​បាន​ឡើយ" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "ការ​ធ្វើឲ្យ​ប្រសើរ​ពី '%s' ទៅជា '%s' មិន​ត្រូវ​បាន​គាំទ្រ​ជាមួយ​ឧបករណ៍​នេះ​ឡើយ ។" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​រៀបចំ Sandbox" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "មិន​អាច​បង្កើត​បរិស្ថាន sandbox បាន​ឡើយ ។" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "របៀប Sandbox" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -335,16 +336,16 @@ "*គ្មាន* ការ​ផ្លាស់ប្ដូរ​ត្រូវ​បាន​សរសេរ​ទៅកាន់​ថត​ប្រព័ន្ធ​ចាប់ពី​ពេលនេះ​ រហូត​ទាល់តែ​​ការ​ចាប់ផ្ដើម​ឡើងវិញ​" "ពេលក្រោយ​មាន​លក្ខណៈ​អចិន្ត្រៃយ៍ ។" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "ការ​ដំឡើង python របស់​អ្នក​បាន​ខូច ។ សូម​ជួសជុល​តំណ​និមិត្តសញ្ញា '/usr/bin/python' ។" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "កញ្ចប់ 'debsig-verify' ត្រូវ​បាន​ដំឡើង" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -354,12 +355,12 @@ "សូម​យក​វា​ចេញ​ដោយ​ប្រើ synaptic ឬ 'apt-get remove debsig-verify' ជាមុន​សិន រួច​ហើយ​ដំណើរការ​" "ការ​ធ្វើឲ្យ​ប្រសើរ​ម្ដងទៀត ។" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "មិន​អាច​សរសេរ​ទៅកាន់ '%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -370,11 +371,11 @@ "ទេ ។\n" "សូម​ប្រាកដ​ថា​ថត​ប្រព័ន្ធ​អាច​សរសេរ​បាន ។" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "រួមបញ្ចូល​បច្ចុប្បន្នភាព​ចុងក្រោយ​ពី​អ៊ីនធឺណិត​ឬ ?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -393,16 +394,16 @@ "ធ្វើឲ្យ​ប្រសើរ ។\n" "ប្រសិនបើ​អ្នក​ឆ្លើយ​ថា 'ទេ' នៅ​ទីនេះ បណ្ដាញ​របស់​អ្នក​នឹង​មិន​ត្រូវ​បាន​ប្រើឡើយ ។" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "បិទ​នៅ​ពេល​ធ្វើឲ្យ​ប្រសើរ​ទៅកាន់ %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "រក​មិន​ឃើញ​ទីតាំង​ត្រឹមត្រូវ" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -421,11 +422,11 @@ "ប្រសិនបើ​អ្នក​ជ្រើស 'ទេ' ការ​ធ្វើឲ្យ​ប្រសើរ​នឹង​បោះបង់ ។" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "បង្កើត​ប្រភព​លំនាំដើម​ឬ ?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -439,11 +440,11 @@ "តើ​គួរតែ​បន្ថែម​ធាតុ​លំនាំដើម​សម្រាប់ '%s' ដែរ​ឬ​ទេ ? ប្រសិនបើ​អ្នក​ជ្រើស 'ទេ' ការ​ធ្វើឲ្យ​ប្រសើរ​នឹង​" "បោះបង់ ។" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "ព័ត៌មាន​ឃ្លាំង​មិន​ត្រឹមត្រូវ" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -451,11 +452,11 @@ "ការ​ធ្វើឲ្យ​ព័ត៌មាន​ឃ្លាំង​ប្រសើរ​ឡើង​បណ្ដាល​ឲ្យ​មាន​ឯកសារ​មិន​ត្រឹមត្រូវ ដូច្នេះ​ដំណើរការ​ក្នុង​ការ​រាយការណ៍​កំហុស​" "កំពុងតែ​ត្រូវ​បាន​ចាប់ផ្ដើម ។" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "ប្រភព​របស់​ភាគី​ទីបី​ត្រូវ​បាន​បិទ" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -465,12 +466,12 @@ "បន្ទាប់ពី​បាន​បញ្ចប់​ការ​ធ្វើឲ្យ​ប្រសើរ​ដោយ​ប្រើ​ឧបករណ៍ 'software-properties' ឬ​កម្មវិធី​គ្រប់គ្រង​កញ្ចប់ " "។" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "កញ្ចប់​ស្ថិត​នៅក្នុង​ស្ថានភាព​មិន​ឆបគ្នា" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -484,11 +485,11 @@ "កញ្ចប់ '%s' ស្ថិតនៅក្នុង​ស្ថានភាព​មិន​ឆប​គ្នា និង​ទាមទារ​ឲ្យ​ដំឡើង​ឡើងវិញ ប៉ុន្តែ​រក​មិនឃើញ​ឃ្លាំង​សម្ងាត់​" "សម្រាប់​វាទេ ។ សូម​ដំឡើង​កញ្ចប់ដោយដៃ ឬ​យក​វា​ចេញ​ពី​ប្រព័ន្ធ ។" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "កំហុស​ក្នុង​​អំឡុង​ពេល​ធ្វើ​បច្ចុប្បន្នភាព" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -496,13 +497,13 @@ "បញ្ហា​បាន​កើតឡើង​ក្នុង​អំឡុង​ពេល​ធ្វើ​បច្ចុប្បន្នភាព ។ ជាទូទៅ​បណ្ដាលមក​ពី​បញ្ហា​បណ្ដាញ​ខ្លះ​ៗ សូម​ពិនិត្យមើល​ការ​" "តភ្ជាប់​បណ្ដាញ​របស់​អ្នក រួច​ព្យាយាម​ម្ដងទៀត ។" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "គ្មាន​ទំហំ​ថាស​គ្រប់គ្រាន់" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -516,21 +517,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "គណនា​ការ​ផ្លាស់ប្ដូរ" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "តើ​អ្នក​ចង់​ចាប់ផ្ដើម​ការ​ធ្វើឲ្យ​ប្រសើរ​ដែរ​ឬ​ទេ ?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "ការ​ធ្វើឲ្យ​ប្រសើរ​ត្រូវ​បាន​បោះបង់" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -538,12 +539,12 @@ "ការ​ធ្វើឲ្យ​ប្រសើរ​នឹង​បោះបង់​ឥឡូវនេះ ហើយ​ស្ថានភាព​ប្រព័ន្ធ​លំនាំដើម​នឹង​ត្រូវ​បាន​ស្ដារ ។ អ្នក​អាច​បន្ត​ការ​" "ធ្វើ​ឲ្យ​ប្រសើរ​នៅ​ពេល​ក្រោយ​បាន ។" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "មិន​អាច​ទាញ​យក​ការ​ធ្វើឲ្យ​ប្រសើរ​បាន​ឡើយ" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -553,27 +554,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "កំហុស​ក្នុង​អំឡុង​ពេល​ប្រតិបត្តិ" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "ស្ដារ​ស្ថានភាព​ប្រព័ន្ធ​លំនាំដើម" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "មិន​អាច​ដំឡើង​ការ​ធ្វើ​ឲ្យ​ប្រសើរ" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -581,7 +582,7 @@ "ការ​ធ្វើឲ្យ​ប្រសើរ​បាន​បោះបង់ ។ ប្រព័ន្ធ​របស់​អ្នក​អាច​ស្ថិត​នៅ​ក្នុង​ស្ថានភាព​មិន​អាច​ប្រើ​បាន​ ។ ការ​សង្គ្រោះ​" "នឹង​ដំណើរការ​ឥឡូវនេះ (dpkg --configure -a) ។" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -598,7 +599,7 @@ "របាយការណ៍​កំហុស ។\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -606,20 +607,20 @@ "ការ​ធ្វើឲ្យ​ប្រសើរ​បាន​បោះបង់ ។ សូម​ពិនិត្យមើល​ការ​តភ្ជាប់​អ៊ីនធឺណិត ឬ​មេឌៀ​ដំឡើង​របស់​អ្នក រួច​ព្យាយាម​" "ម្ដងទៀត ។ " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "យក​កញ្ចប់​ហួសសម័យ​ចេញ​ឬ ?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "រក្សាទុក" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "យកចេញ" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -627,27 +628,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "ភាព​អាស្រ័យ​ដែល​បាន​ទាមទារ​មិន​ត្រូវ​បាន​ដំឡើង" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "ភាព​អាស្រ័យ​ដែល​បាន​ទាមទារ '%s' មិន​ត្រូវ​បាន​ដំឡើង ។ " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "ពិនិត្យមើល​កម្មវិធី​គ្រប់គ្រង​កញ្ចប់" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​រៀបចំ​ការ​ធ្វើឲ្យ​ប្រសើរ" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -655,11 +656,11 @@ "រៀបចំ​ប្រព័ន្ធ សម្រាប់​ការ​ធ្វើ​ឲ្យ​ប្រសើរ​ឡើង​បាន​បរាជ័យ ដូច្នេះ​ដំណើរការ​រាយការណ៍​កំហុស​កំពុង​ត្រូវ​បាន​" "ចាប់ផ្ដើម ។" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ទទួលយក​តម្រូវការ​ជាមុន​សម្រាប់​ការ​​ធ្វើឲ្យ​ប្រសើរ" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -671,68 +672,68 @@ "\n" "លើសពី​នេះ ដំណើរការ​រាយការណ៍​កំហុស​កំពុង​ត្រូវ​បាន​ចាប់ផ្ដើម ។" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "កំពុង​ធ្វើ​បច្ចុប្បន្នភាព​ព័ត៌មាន​ឃ្លាំង" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បន្ថែម cdrom" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "សូម​អភ័យទោស ការ​បន្ថែម cdrom មិន​ទទួល​ជោគជ័យ​ទេ ។" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "ព័ត៌មាន​កញ្ចប់​មិន​ត្រឹមត្រូវ" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "ទៅ​ប្រមូលយក" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "ធ្វើឲ្យ​ប្រសើរ" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "បាន​បញ្ចប់​ការ​ធ្វើឲ្យ​ប្រសើរ" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "បាន​បញ្ចប់​ការ​ធ្វើឲ្យ​ប្រសើរ ប៉ុន្តែ​មាន​កំហុស​ក្នុង​អំឡុង​ពេល​ធ្វើ​ឲ្យ​ប្រសើរ​ឡើង ។" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "ស្វែងរក​កម្មវិធី​ដែល​ហូសសម័យ" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "បាន​បញ្ចប់​ការ​ធ្វើឲ្យ​ប្រព័ន្ធ​ប្រសើរ ។" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "បាន​បញ្ចប់​ការ​ធ្វើឲ្យ​ប្រសើរ​ដោយ​ផ្នែក ។" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms កំពុង​ត្រូវ​បាន​ប្រើ" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -741,11 +742,11 @@ "ប្រព័ន្ធ​របស់​អ្នក​ប្រើ​កម្មវិធី​គ្រប់គ្រង​ភាគ 'evms' នៅ​ក្នុង /proc/mounts ។ កម្មវិធី 'evms' មិន​ត្រូវ​" "បាន​គាំទ្រ​ទៀត​ទេ សូម​បិទ​វា រួច​ដំណើរការ​ការ​ធ្វើឲ្យ​ប្រសើរ​ម្ដងទៀត នៅ​ពេល​វា​ត្រូវ​បាន​បញ្ចប់ ។" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "ផ្នែក​រឹង​ក្រាហ្វិក​របស់​អ្នក​អាច​គាំទ្រ​មិន​ពេញលេញ​នៅ​ក្នុង​អ៊ូប៊ុនទូ 12.04 LTS  ។" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -756,9 +757,9 @@ "ប្រទះ​បញ្ហា​បន្ទាប់​ពី​ធ្វើ​ឲ្យ​ប្រសើរ​ឡើង ។ ចំពោះ​ព័ត៌មាន​បន្ថែម សូម​មើល https://wiki.ubuntu.com/X/" "Bugs/UpdateManagerWarningForI8xx តើ​អ្នក​ចង់​បន្ត​ការ​ធ្វើ​ឲ្យ​ប្រសើរ​ឡើង​ដែរឬទេ ?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -766,8 +767,8 @@ "ការ​ធ្វើឲ្យ​ប្រសើរ​អាច​កាត់បន្ថយ​បែបផែន​ផ្ទៃតុ សមត្ថភាព​នៅ​ក្នុង​ល្បែង​កម្សាន្ត និងកម្មវិធីដែល​ប្រើ​ក្រាហ្វិក​" "ផ្សេងទៀត ។" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -780,7 +781,7 @@ "\n" "តើ​អ្នក​ចង់​បន្ត​ដែរ​ឬ​ទេ ?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -793,11 +794,11 @@ "\n" "តើ​អ្នក​ចង់​បន្ត​ដែរ​ឬ​ទេ ?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "គ្មាន​ស៊ីភីយូ i686" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -808,11 +809,11 @@ "ការ​ធ្វើឲ្យ​ប្រសើរ​ដែល​ទាមទារ i686 ជា​ស្ថាបត្យកម្ម​អប្បបរមា ។ អ្នក​មិន​អាច​ធ្វើឲ្យ​ប្រព័ន្ធ​របស់​អ្នក​" "ប្រសើរ​ទៅជា​កំណែ​ចេញផ្សាយ​អ៊ូប៊ុនទូ​ថ្មី​ដោយ​ប្រើ​ផ្នែក​រឹង​នេះ​បាន​ឡើយ ។" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "គ្មាន​ស៊ីភីយូ ARMv6" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -823,11 +824,11 @@ "បាន​ស្ថាបនា​ជាមួយ​ការ​ធ្វើឲ្យ​ប្រសើរ​ដែល​ទាមទារ ARMv6 ជា​ស្ថាបត្យកម្ម​អប្បបរមា ។ អ្នក​មិន​អាច​ធ្វើឲ្យ​" "ប្រព័ន្ធ​របស់​អ្នក​ប្រសើរ​ទៅជា​កំណែ​ចេញ​ផ្សាយ​អ៊ូប៊ុនទូ​ថ្មី​ដោយ​ប្រើ​ផ្នែក​រឹង​នេះ​បាន​ឡើយ ។" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "គ្មាន init" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -842,15 +843,15 @@ "\n" "តើ​អ្នក​ចង់​បន្ត​ទេ ?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "ការ​ធ្វើឲ្យ Sandbox ប្រសើរ​ដោយ​ប្រើ aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "ប្រើ​ផ្លូវ​ដែល​បាន​ផ្ដល់ ដើម្បី​ស្វែងរក cdrom ដែល​មាន​កញ្ចប់​ដែល​អាច​ធ្វើ​ឲ្យ​ប្រសើរ​បាន" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -858,57 +859,57 @@ "ប្រើ​ផ្នែក​ខាងមុខ ។ អាច​ប្រើ​ក្នុង​ពេល​បច្ចុប្បន្នបាន ៖\n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*DEPRECATED* ជម្រើស​នេះ​នឹង​ត្រូវ​បាន​មិន​អើពើ" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "អនុវត្ត​ការ​ធ្វើឲ្យ​ប្រសើរ​ដោយ​ផ្នែក​ប៉ុណ្ណោះ (គ្មាន​ការ​សរសេរ sources.list ឡើង​វិញ​ទេ)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "បិទ​ការ​គាំទ្រ​អេក្រង់ GNU" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "កំណត់​ថត​ទិន្នន័យ" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "សូម​បញ្ចូល '%s' ទៅ​ក្នុង​ដ្រាយ '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "បាន​បញ្ចប់​ការ​ទៅ​ប្រមូល​យក" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "ទៅ​ប្រមូល​យក​ឯកសារ %li នៃ %li នៅ %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "នៅសល់​ប្រហែល %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "ទៅ​ប្រមូល​យក​ឯកសារ %li នៃ %li" @@ -918,27 +919,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "អនុវត្ត​ការ​ផ្លាស់ប្ដូរ" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "បញ្ហា​ភាព​អាស្រ័យ - មិន​កំណត់​រចនាសម្ព័ន្ធ" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "មិន​អាច​ដំឡើង '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -950,7 +951,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -961,7 +962,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -969,20 +970,20 @@ "អ្នក​នឹង​បាត់បង់​ការ​ផ្លាស់ប្ដូរ​ណាមួយ​ដែល​អ្នក​បាន​ធ្វើ​ទៅ​លើ​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ​នេះ ប្រសិនបើ​អ្នក​ជ្រើស​ជំនួស​" "វា​ជាមួយ​កំណែ​ថ្មី​ជាងនេះ ។" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "រក​មិន​ឃើញ​ពាក្យ​បញ្ជា 'diff' ទេ" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "កំហុស​ធ្ងន់ធ្ងរ​បាន​កើតឡើង" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -994,13 +995,13 @@ "បាន​បោះបង់ ។\n" " sources.list ដើម​របស់​អ្នក​ត្រូវ​បាន​រក្សាទុក​ក្នុង /etc/apt/sources.list.distUpgrade ។" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "ចុច​បញ្ជា (Ctrl)-c" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1009,134 +1010,134 @@ "ឬ ?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "ដើម្បី​ការពារ​កុំឲ្យ​បាត់បង់​ទិន្នន័យ បិទ​កម្មវិធី និង​ឯកសារ​ដែល​បាន​បើក​ទាំងអស់ ។" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "មិន​​ត្រូវ​បាន​គាំទ្រ​ដោយ Canonical (%s) ទៀត​ឡើយ" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "បន្ទាប (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "យកចេញ (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "លែង​ត្រូវការ (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "ដំឡើង (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "ធ្វើឲ្យ​ប្រសើរ (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "ការ​ផ្លាស់ប្ដូរ​មេឌៀ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "បង្ហាញ​ភាព​ខុសគ្នា >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< លាក់​ភាព​ខុសគ្នា" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "កំហុស" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "បោះបង់" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "បិទ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "បង្ហាញ​ស្ថានីយ >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< លាក់​ស្ថានីយ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "ព័ត៌មាន" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "សេចក្ដី​លម្អិត" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "មិន​ត្រូវ​បាន​គាំទ្រ​ទៀត​ទេ %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "យកចេញ %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "យកចេញ (ត្រូវ​បាន​ដំឡើង​ស្វ័យប្រវត្តិ) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "ដំឡើង %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "ធ្វើឲ្យ​ប្រសើរ %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "ទាមទារឲ្យ​ចាប់ផ្ដើម​ឡើងវិញ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "ចាប់ផ្ដើម​ប្រព័ន្ធ​ឡើងវិញ ដើម្បី​បញ្ចប់​ការ​ធ្វើឲ្យ​ប្រសើរ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "ចាប់ផ្ដើម​ឡើងវិញ​ឥឡូវនេះ" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1148,29 +1149,29 @@ "ប្រព័ន្ធ​អាច​ស្ថិត​ក្នុង​ស្ថានភាព​ដែល​មិន​អាច​ប្រើ​បាន ប្រសិនបើ​អ្នក​បោះបង់​ការ​ធ្វើឲ្យ​ប្រសើរ ។ អ្នក​ត្រូវ​បាន​" "ផ្ដល់​អនុសាសន៍​ឲ្យ​បន្ត​ការ​ធ្វើឲ្យ​ប្រសើរ ។" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "បោះបង់​ការ​ធ្វើឲ្យ​ប្រសើរ​ឬ ?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li ថ្ងៃ" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li ម៉ោង" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li នាទី" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1185,7 +1186,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1199,14 +1200,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1216,34 +1217,32 @@ "។" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "ការ​ទាញ​យក​នេះ​នឹង​ចំណាយ​ពេល​ប្រហែល %s ជាមួយ​ការ​តភ្ជាប់ ។ " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "រៀបចំ​ធ្វើឲ្យ​ប្រសើរ" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "ទទួលយក​ឆានែល​កម្មវិធី​ថ្មី" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "ទទួល​យក​កញ្ចប់​ថ្មី" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "ដំឡើង​ការ​ធ្វើឲ្យ​ប្រសើរ" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "សម្អាត" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1257,25 +1256,25 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d កញ្ចប់នឹង​ត្រូវ​បាន​យក​ចេញ ។" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d កញ្ចប់​ថ្មី​នឹង​ត្រូវ​បាន​ដំឡើង ។" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d កញ្ចប់​នឹង​ត្រូវ​បាន​ធ្វើឲ្យ​ប្រសើរ ។" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1286,7 +1285,7 @@ "\n" "អ្នក​ត្រូវតែ​ទាញ​យក​សរុប​ត្រឹម %s ។ " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1294,7 +1293,7 @@ "ដំឡើង​ការ​ធ្វើ​ឲ្យ​ប្រសើរ​ឡើង​អាច​ចំណាយ​ពេល​ច្រើន​ម៉ោង ។ នៅ​ពេល​ដែល​ការ​ទាញយក​បាន​បញ្ចប់ ដំណើរការ​មិន​អាច​" "ត្រូវ​បាន​បោះបង់បាន​ទេ ។" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1302,52 +1301,52 @@ "ការ​ទៅ​យក និង​ដំឡើង​ការ​ធ្វើ​ឲ្យ​ប្រសើរ​ឡើង​អាច​ចំណាយ​ពេល​រាប់​ម៉ោង ។ នៅពេល​ដែល​កា​រទាញយក​បាន​បញ្ចប់ " "ដំណើរការ​មិន​អាច​ត្រូ​វបាន​​បោះបង់​ទេ ។" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "ការ​យក​កញ្ចប់ចេញ​អាច​ចំណាយ​ពេល​ច្រើន​ម៉ោង ។ " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "កម្មវិធី​នៅ​លើ​កុំព្យូទ័រ​នេះ​ទាន់​សម័យ ។" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" "គ្មាន​ការ​ធ្វើឲ្យ​ប្រសើរ​សម្រាប់​ប្រព័ន្ធ​របស់​អ្នក​ទេ ។ ការ​ធ្វើឲ្យ​ប្រសើរ​នឹង​ត្រូវ​បាន​បោះបង់​ឥឡូវនេះ ។" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "ទាមទារ​ឲ្យ​ចាប់ផ្ដើម​ឡើងវិញ" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "ការ​ធ្វើឲ្យ​ប្រសើរ​បាន​បញ្ចប់ ហើយ​វា​ទាមទារ​ឲ្យ​ចាប់ផ្ដើម​ឡើងវិញ ។ តើ​ចង់​ធ្វើ​ដូច្នេះ​ឥឡូវ​នេះ​ឬ ?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ '%(file)s' ទល់នឹង '%(signature)s' " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "ស្រង់ចេញ '%s'" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "មិន​អាច​ដំណើរការ​ឧបករណ៍​ធ្វើឲ្យ​ប្រសើរ​ទេ" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1355,33 +1354,33 @@ "ភាគច្រើន​អាច​បណ្ដាល​មក​ពី​កំហុស​នៅ​ក្នុង​ឧបករណ៍​ធ្វើឲ្យ​ប្រសើរ ។ សូម​រាយការណ៍​វា​ជា​កំហុស​ដោយ​ប្រើ​ពាក្យ​បញ្ជា " "'ubuntu-bug update-manager' ។" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "ហត្ថលេខា​ឧបករណ៍​ធ្វើឲ្យ​ប្រសើរ" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "ឧបករណ៍​ធ្វើឲ្យ​ប្រសើរ" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូលយក" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ការ​ធ្វើឲ្យ​ប្រសើរ ។ អាច​មាន​បញ្ហា​បណ្ដាញ ។ " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1389,41 +1388,41 @@ "បាន​បរាជ័យ​ក្នុង​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​អំពី​ការ​ធ្វើឲ្យ​ប្រសើរ ។ អាច​មាន​បញ្ហា​ជាមួយ​បណ្ដាញ ឬ​ជាមួយ​" "ម៉ាស៊ីន​បម្រើ ។ " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ស្រង់​ចេញ" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" "បាន​បរាជ័យ​ក្នុង​ការ​ស្រង់​ចេញ​ការ​ធ្វើឲ្យ​ប្រសើរ ។ អាច​មាន​បញ្ហា​ជាមួយ​បណ្ដាញ ឬ​ជាមួយ​ម៉ាស៊ីន​បម្រើ ។ " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ផ្ទៀងផ្ទាត់" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" "បាន​បរាជ័យ​ក្នុង​ការ​ផ្ទៀងផ្ទាត់​ការ​ធ្វើឲ្យ​ប្រសើរ ។ អាច​មាន​បញ្ហា​ជាមួយ​បណ្ដាញ ឬ​ជាមួយ​ម៉ាស៊ីន​បម្រើ ។ " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "មិន​អាច​ដំណើរការ​ការ​ធ្វើឲ្យ​ប្រសើរ​បាន​ទេ" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1431,13 +1430,13 @@ "ជាទូទៅ​វា​បណ្ដាល​មក​ពី​បញ្ហា​ប្រព័ន្ធ​ដែល /tmp ត្រូវ​បាន​ម៉ោន​​ដោយ​ប្រើ noexec ។ សូម​ម៉ោន​ឡើងវិញ​ដោយ​មិន​ប្រើ " "noexec រួច​ដំណើរការ​ការ​ធ្វើឲ្យ​ប្រសើរ​ម្ដងទៀត ។" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "សារ​កំហុស​គឺ '%s' ។" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1448,73 +1447,73 @@ "dist-upgrade/apt.log ទៅ​ក្នុង​របាយការណ៍​របស់​អ្នក ។ ការ​ធ្វើឲ្យ​ប្រសើរ​ត្រូវ​បាន​បោះបង់ ។\n" " sources.list របស់​អ្នក​ត្រូវ​បាន​រក្សាទុក​នៅ​ក្នុង /etc/apt/sources.list.distUpgrade ។" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "បោះបង់" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "បន្ថយ ៖\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "ដើម្បី​បន្ត ចុច [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "បន្ត [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "សេចក្ដីលម្អិត [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "បាទ/ចាស" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "ទេ" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "សេចក្ដីលម្អិត" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "មិន​ត្រូវ​បាន​គាំទ្រ​ទៀតទេ ៖ %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "យក​ចេញ ៖ %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "ដំឡើង ៖ %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "ធ្វើឲ្យ​ប្រសើរ៖ %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "បន្ត [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1581,8 +1580,7 @@ msgstr "ធ្វើឲ្យ​ការ​ចែកចាយ​ប្រសើរ" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "ធ្វើ​ឲ្យ​អ៊ូប៊ុនទូ​ប្រសើរ​ទៅ​ជា​កំណែ ១២.០៤" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1601,146 +1599,159 @@ msgid "Terminal" msgstr "ស្ថានីយ" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "សូម​រង់ចាំ វា​អាច​ចំណាយ​ពេល​មួយ​ស្របក់ ។" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "បាន​បញ្ចប់​ការ​ធ្វើ​បច្ចុប្បន្នភាព" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "រក​មិន​ឃើញ​ឯកសារ​ចេញផ្សាយ​ទេ" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "ម៉ាស៊ីន​បម្រើ​អាច​ផ្ទុក​លើស​ចំណុះ ។ " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "មិន​អាច​ទាញ​យក​ឯកសារ​ចេញផ្សាយ​បាន​ទេ" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "សូម​ពិនិត្យមើល​ការ​តភ្ជាប់​អ៊ីនធឺណិត​របស់​អ្នក ។" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "ធ្វើឲ្យ​ប្រសើរ" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "ឯកសារ​ចេញផ្សាយ" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "ទាញ​យក​ឯកសារ​កញ្ចប់​បន្ថែម..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "ឯកសារ %s នៃ %s នៅ %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "ឯកសារ %s នៃ %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "បើក​តំណ​ក្នុង​កម្មវិធី​រុករក" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "ចម្លង​តំណ​ទៅកាន់​ក្ដារ​តម្បៀត​ខ្ទាស់" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "ទាញ​យក​ឯកសារ %(current)li នៃ %(total)li ដោយ %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "ទាញយក​ឯកសារ %(current)li នៃ %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "ឯកសារ​ចេញផ្សាយ​អ៊ូប៊ុនទូ​របស់​អ្នក​មិន​ត្រូវ​បាន​គាំទ្រ​ទៀតទេ ។" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" "អ្នកនឹង​មិន​យក​ការ​កែ​សុវត្ថិភាព​បន្ត ឬ​បច្ចុប្បន្ន​ភាព​សំខាន់ ។ សូម​ធ្វើ​ឲ្យ​ប្រសើរ​ឡើង​ទៅ​កំណែ​ក្រោយ​របស់​អ៊ូប៊ុន​ទូ ។" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "ព័ត៌មាន​ធ្វើឲ្យ​ប្រសើរ" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "ដំឡើង" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "ឈ្មោះ" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "កំណែ %s ៖ \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "រក​មិន​ឃើញ​ការ​តភ្ជាប់​បណ្ដាញ​ទេ អ្នក​មិន​អាច​ទាញ​យក​ព័ត៌មាន​កំណត់ហេតុ​ផ្លាស់ប្ដូរ​ទេ ។" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "ទាញ​យក​បញ្ជី​នៃ​ការ​ផ្លាស់ប្ដូរ..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "មិន​ជ្រើស​ទាំងអស់" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "ជ្រើស​ទាំងអស់" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s បច្ចុប្បន្នភាព​ត្រូវ​បាន​ជ្រើស ។" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s នឹង​ត្រូវ​បាន​ទាញ​យក ។" #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "បច្ចុប្បន្នភាព​ត្រូវ​បាន​ទាញ​យក​រួចហើយ ប៉ុន្តែ​មិន​ទាន់​បាន​ដំឡើង​ទេ ។" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "គ្មាន​បច្ចុប្បន្នភាព​ត្រូវ​ដំឡើង​ទេ ។" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "មិន​ស្គាល់​ទំហំ​ទាញយក ។" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1748,7 +1759,7 @@ "វា​នឹង​ត្រូវ​បាន​ស្គាល់ នៅ​ពេល​ដែល​ព័ត៌មាន​កញ្ចប់​ត្រូវ​បាន​ធ្វើ​បច្ចុប្បន្នភាព​លើក​ចុងក្រោយ ។ សូម​ចុច​​ប៊ូតុង " "'ពិនិត្យមើល' ដើម្បី​ធ្វើ​បច្ចុប្បន្នភាព​ព័ត៌មាន ។" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1757,13 +1768,13 @@ "ព័ត៌មាន​កញ្ចប់​ត្រូវ​បាន​ធ្វើ​បច្ចុប្បន្នភាព​លើក​ចុងក្រោយ %(days_ago)s ថ្ងៃ​កន្លង​ទៅ ។\n" "ចុច​ប៊ូតុង 'ពិនិត្យមើល' ខាងក្រោម​ដើម្បី​ពិនិត្យ​រកមើល​បច្ចុប្បន្នភាព​កម្មវិធី​ថ្មីៗ ។" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "ព័ត៌មាន​កញ្ចប់​ត្រូវ​បាន​ធ្វើ​បច្ចុប្បន្នភាព​ចុងក្រោយ %(days_ago)s ថ្ងៃ​កន្លងទៅ ។" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1771,34 +1782,42 @@ msgstr[0] "ព័ត៌មាន​កញ្ចប់​ត្រូវ​បាន​ធ្វើ​បច្ចុប្បន្នភាព​លើក​ចុងក្រោយ %(hours_ago)s ម៉ោង​កន្លងទៅ ។" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "ព័ត៌មាន​កញ្ចប់​ត្រូវ​បាន​ធ្វើ​បច្ចុប្បន្នភាព​ចុងក្រោយ​ប្រហែល %s នាទី​កន្លងទៅ ។" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "ព័ត៌មាន​កញ្ចប់​ទើបតែ​ត្រូវ​បាន​ធ្វើ​បច្ចុប្បន្នភាព ។" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "បច្ចុប្បន្នភាព​របស់​កម្មវិធី​កែ​កំហុស លុបបំបាត់​ភាព​ទន់ខ្សោយ​ផ្នែក​សុវត្ថិភាព និង​ផ្ដល់​លក្ខណ​ពិសេស​ថ្មី ។" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "បច្ចុប្បន្នភាព​កម្មវិធី​អាច​មាន​សម្រាប់​កុំព្យូទ័រ​របស់​អ្នក ។" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "សូម​ស្វាគមន៍​ការ​មកកាន់​អ៊ូប៊ុនទូ" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" -msgstr "" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "បច្ចុប្បន្ន​ភាព​កម្មវិធី​ទាំង​នេះ​ត្រុវ​បាន​ចេញ​តាំង​ពី​កំណែ​អ៊ូប៊ុនទូ​ត្រូវ​បាន​ចេញ​ផ្សាយ​មក​ម្លះ ។" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "ប​ច្ចុប្បន្ន​ភាព​កម្មវិធី​អាច​ប្រើបាន​សម្រាប់​កុំព្យូទ័រ​នេះ ។" + +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1809,7 +1828,7 @@ "នៅ​លើ '%s' ។ សម្អាត​ធុងសំរាម​របស់​អ្នក និង​យក​កញ្ចប់​បណ្ដោះអាសន្ន​ដែល​បាន​ដំឡើង​ពី​មុន​ចេញ​ដោយ​ប្រើ​ពាក្យ​" "បញ្ជា 'sudo apt-get clean' ។" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1817,23 +1836,23 @@ "កុំព្យូទ័រ​ទាមទារ​ឲ្យ​ចាប់ផ្ដើម​ឡើងវិញ ដើម្បី​បញ្ចប់​ការ​ដំឡើង​បច្ចុប្បន្នភាព ។ សូម​រក្សាទុក​ការងារ​របស់​អ្នក មុន​" "នឹង​បន្ត ។" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "អាន​ព័ត៌មាន​កញ្ចប់" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "កំពុង​តភ្ជាប់..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "អ្នក​ប្រហែល​ជា​មិន​អាច​ពិនិត្យ​រកមើល​បច្ចុប្បន្នភាព ឬ​ទាញ​យក​បច្ចុប្បន្នភាព​ថ្មី​បាន​ទេ ។" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "មិន​អាច​ចាប់ផ្ដើម​ព័ត៌មាន​កញ្ចប់" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1845,7 +1864,7 @@ "\n" "សូម​រាយការណ៍​កំហុស​នេះ​ទៅកាន់​កញ្ចប់ the 'update-manager' និង​រួមបញ្ចូល​សារ​កំហុស​ដូចខាងក្រោម ៖\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1856,31 +1875,31 @@ "\n" "សូម​រាយការណ៍​កំហុស​នេះ​ទៅកាន់​កញ្ចប់ 'update-manager' និង​រួមបញ្ចូល​សារ​កំហុស​ខាងក្រោម ៖" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (ដំឡើង​ថ្មី)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(ទំហំ ៖ %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "ពី​កំណែ %(old_version)s ទៅ %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "កំណែ %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "ការ​ធ្វើឲ្យ​ការ​ចេញផ្សាយ​ប្រសើរ​ឡើង​មិន​អាច​ធ្វើ​ទៅ​បាន​ក្នុង​ពេល​ឥឡូវនេះ​ទេ" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1889,21 +1908,21 @@ "ការ​ធ្វើឲ្យ​ការ​ចេញផ្សាយ​ប្រសើរ​ឡើង​មិន​អាច​ត្រូវ​បាន​អនុវត្ត​ក្នុង​ពេលនេះ​ទេ សូម​ព្យាយាម​ម្ដងទៀត​នៅ​" "ពេលក្រោយ ។ ម៉ាស៊ីន​បម្រើ​បាន​រាយការណ៍ ៖ '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "ទាញ​យក​ឧបករណ៍​ធ្វើឲ្យ​ការ​ចេញផ្សាយ​ប្រសើរ​ឡើង" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "មាន '%s' ការ​ចេញផ្សាយ​អ៊ូប៊ុនទូ​ថ្មី" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "លិបិក្រម​កម្មវិធី​បាន​ខូច" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1912,6 +1931,17 @@ "មិន​អាច​ដំឡើង ឬ​យក​កម្មវិធី​ណាមួយ​ចេញ​បាន​ទេ ។ សូម​ប្រើ​កម្មវិធី​គ្រប់គ្រង​កញ្ចប់ \"Synaptic\" ឬ​ប្រើ​ពាក្យ​" "បញ្ជា \"sudo apt-get install -f\" នៅ​ក្នុង​ស្ថានីយ ដើម្បី​ដោះស្រាយ​បញ្ហា​នេះ​ជាមុន​សិន ។" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "មាន​ឯកសារ​ចេញផ្សាយ​ថ្មី '%s' ។" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "បោះបង់" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "ពិនិត្យ​រកមើល​បច្ចុប្បន្នភាព" @@ -1921,22 +1951,18 @@ msgstr "ដំឡើង​បច្ចុប្បន្នភាព​ដែល​អាច​ប្រើ​បាន​ទាំងអស់" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "បោះបង់" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "កំណត់​ហេតុ​ផ្លាស់ប្ដូរ" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "បច្ចុប្បន្នភាព" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "ស្ថាបនា​បញ្ជី​បច្ចុប្បន្នភាព" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1960,20 +1986,20 @@ " * កញ្ចប់​កម្មវិធី​មិន​ផ្លូវការ​មិន​ត្រូវ​បាន​ផ្ដល់​ដោយ​អ៊ូប៊ុនទូ\n" " * ការ​ផ្លាស់ប្ដូរ​ធម្មតា​នៃ​កំណែ​ចេញផ្សាយ​មុន​របស់​អ៊ូប៊ុនទូ" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "ទាញ​យក​កំណត់ហេតុ​ផ្លាស់ប្ដូរ" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "បច្ចុប្បន្នភាព​ផ្សេងទៀត (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "បច្ចុប្បន្នភាព​នេះ​មិន​មែន​មក​ពី​ប្រភព​ដែល​គាំទ្រ​កំណត់ហេតុ​ផ្លាស់ប្ដូរ​នេះ​ទេ ។" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -1981,7 +2007,7 @@ "បាន​បរាជ័យ​ក្នុង​ការ​ទាញ​យក​បញ្ជី​ផ្លាស់ប្ដូរ ។ \n" "សូម​ពិនិត្យមើល​ការ​តភ្ជាប់​អ៊ីនធឺណិត​របស់​អ្នក ។" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1994,7 +2020,7 @@ "កំណែ​ដែល​មាន ៖ %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2007,7 +2033,7 @@ "សូម​ប្រើ http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "រហូត​ដល់​ការ​ផ្លាស់ប្ដូរ​អាច​ប្រើ​បាន ឬ​ព្យាយាម​ម្ដងទៀត​នៅ​ពេល​ក្រោយ ។" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2020,50 +2046,43 @@ "សូម​ប្រើ http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "រហូត​ដល់​ការ​ផ្លាស់ប្ដូរ​អាច​ប្រើ​បាន ឬ​ព្យាយាម​ម្ដងទៀត​នៅ​ពេល​ក្រោយ ។" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​រក​ការ​ចែកចាយ" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "កំហុស '%s' បាន​កើតឡើង ខណៈ​ពេល​ពិនិត្យ​ប្រភេទ​ប្រព័ន្ធ​ដែល​អ្នក​កំពុង​ប្រើ ។" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "បច្ចុប្បន្នភាព​សុវត្ថិភាព​សំខាន់" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "បច្ចុប្បន្នភាព​ដែល​បាន​ផ្ដល់​អនុសាសន៍" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "បច្ចុប្បន្នភាព​ដែល​បាន​ស្នើ" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backports" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "បច្ចុប្បន្នភាព​ចែកចាយ" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "បច្ចុប្បន្នភាព​ផ្សេងទៀត" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "ចាប់ផ្ដើម​កម្មវិធី​គ្រប់គ្រង​បច្ចុប្បន្នភាព" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "បច្ចុប្បន្នភាព​របស់​កម្មវិធី​កែ​កំហុស លុបបំបាត់​ភាព​ទន់ខ្សោយ​ផ្នែក​សុវត្ថិភាព និង​ផ្ដល់​លក្ខណ​ពិសេស​ថ្មី ។" - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "ការ​ធ្វើឲ្យ​ប្រសើរ​ដោយ​ផ្នែក" @@ -2134,37 +2153,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "បច្ចុប្បន្នភាព​កម្មវិធី" +msgid "Update Manager" +msgstr "កម្មវិធី​គ្រប់គ្រង​បច្ចុប្បន្នភាព" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "បច្ចុប្បន្នភាព​កម្មវិធី" +msgid "Starting Update Manager" +msgstr "ចាប់ផ្ដើម​កម្មវិធី​គ្រប់គ្រង​បច្ចុប្បន្នភាព" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "ធ្វើឲ្យ​ប្រសើរ" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "បច្ចុប្បន្នភាព" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "ដំឡើង" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "ផ្លាស់ប្ដូរ" +msgid "updates" +msgstr "បច្ចុប្បន្នភាព" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "សេចក្ដី​ពិពណ៌នា" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "សេចក្ដី​ពិពណ៌នា​អំពី​បច្ចុប្បន្នភាព" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2172,23 +2181,33 @@ "អ្នក​ត្រូវ​បាន​តភ្ជាប់​តាម​រយៈ roaming ហើយ​អាច​នឹង​ត្រូវ​បាន​គិត​ថ្លៃ​សម្រាប់​ទិន្នន័យ​ដែល​ប្រើ​ដោយ​បច្ចុប្បន្នភាព​" "នេះ ។" -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "អ្នក​ត្រូវ​បាន​តភ្ជាប់​តាម​រយៈ​ម៉ូដឹម​ឥត​ខ្សែ ។" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "វា​មាន​សុវត្ថិភាព​ក្នុង​ការ​តភ្ជាប់​កុំព្យូទ័រ​ទៅ​ថាមពល AC មុន​នឹង​ធ្វើ​បច្ចុប្បន្នភាព ។" +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "ដំឡើង​បច្ចុប្បន្នភាព" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "ផ្លាស់ប្ដូរ" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "ការ​កំណត់..." +msgid "Description" +msgstr "សេចក្ដី​ពិពណ៌នា" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "ដំឡើង" +msgid "Description of update" +msgstr "សេចក្ដី​ពិពណ៌នា​អំពី​បច្ចុប្បន្នភាព" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "ការ​កំណត់..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2211,9 +2230,8 @@ msgstr "អ្នក​បាន​បដិសេធ​មិន​ធ្វើឲ្យ​ប្រសើរ​ចំពោះ​អ៊ូប៊ុនទូ​ថ្មី" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "អ្នក​អាច​ធ្វើ​ឲ្យ​ប្រសើរ​នៅ​ពេល​ក្រោយ ដោយ​បើក​កម្មវិធី​គ្រប់គ្រង​​​បច្ចុប្បន្នភាព និង​ចុច​លើ \"ធ្វើឲ្យ​ប្រសើរ\" ។" @@ -2226,58 +2244,58 @@ msgid "Show and install available updates" msgstr "បង្ហាញ និង​ដំឡើង​បច្ចុប្បន្នភាព​ដែល​អាច​ប្រើបាន" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "បង្ហាញ​កំណែ រួច​ចាកចេញ" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "ថត​ដែល​មាន​ឯកសារ​ទិន្នន័យ" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "ពិនិត្យ​មើល​ថាតើមាន​ការ​ចេញផ្សាយ​អ៊ូប៊ុនទូ​ដែរ​ឬ​ទេ" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "ពិនិត្យមើល​ថា​តើ​ការ​ធ្វើឲ្យ​ប្រសើរ​ចំពោះ​ឯកសារ​ចេញផ្សាយ devel ចុងក្រោយ​អាច​ធ្វើ​បាន​ដែរ​ឬ​ទេ" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "ការ​ធ្វើឲ្យ​ប្រសើរ​ដោយ​ប្រើ​កំណែ​ដែល​បាន​ស្នើ​ចុងក្រោយ​របស់​កម្មវិធី​ធ្វើឲ្យ​ឯកសារ​ចេញផ្សាយ​ប្រសើរ" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "កុំ​ផ្ដោត​ទៅលើ​ផែនទី នៅ​ពេល​ចាប់ផ្ដើម" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "សាកល្បង​ប្រើ​ពាក្យ​បញ្ជា dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "កុំ​ពិនិត្យ​រកមើល​បច្ចុប្បន្នភាព នៅ​ពេល​ចាប់ផ្ដើម" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "សាកល្បង​ធ្វើឲ្យ​ប្រសើរ​ដោយ​ប្រើ sandbox aufs overlay" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "ដំណើរការ​ការ​ធ្វើឲ្យ​ប្រសើរ​ដោយ​ផ្នែក" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "បង្ហាញ​សេចក្ដី​ពិពណ៌នា​អំពី​កញ្ចប់​ជំនួស​កំណត់ហេតុ​ផ្លាស់ប្ដូរ" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "សាកល្បង​ធ្វើឲ្យ​ប្រសើរ​ទៅកាន់​ឯកសារ​ចេញផ្សាយ​ចុងក្រោយ​ដោយ​ប្រើ​កម្មវិធី​ធ្វើឲ្យ​ប្រសើរ​ពី $distro ដែល​បាន​" "ស្នើ" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2287,22 +2305,22 @@ "បច្ចុប្បន្ន 'ផ្ទៃតុ' សម្រាប់​ការ​ធ្វើឲ្យ​ប្រសើរ​​តាម​ធម្មតា​ចំពោះ​ប្រព័ន្ធ​ផ្ទៃតុ និង 'ម៉ាស៊ីន​បម្រើ' សម្រាប់​" "ប្រព័ន្ធ​ម៉ាស៊ីន​បម្រើ​ដែល​ត្រូវ​បាន​គាំទ្រ ។" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "ដំណើរការ​ផ្នែក​ខាងមុខ​ដែល​បាន​បញ្ជាក់" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" "ពិនិត្យមើល​ថា​តើ​ការ​ចេញផ្សាយ​ការ​ចែកចាយ​អាច​មាន​ដែរ​ឬ​ទេ រួច​រាយការណ៍​លទ្ធផល​តាម​រយៈ​កូដ​ចាកចេញ" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "ពិនិត្យ​មើល​ការ​ចេញ​ផ្សាយ​អ៊ូប៊ុនទូ​ថ្មី" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2310,68 +2328,68 @@ "សម្រាប់​ព័ត៌មាន​អំពី​ការ​ធ្វើឲ្យ​ប្រសើរ សូម​ចូល​មើល ៖\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "រក​មិន​ឃើញ​ឯកសារ​ចេញ​ផ្សាយ​ថ្មី​ទេ" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "មាន​ឯកសារ​ចេញផ្សាយ​ថ្មី '%s' ។" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "ប្រើ​ពាក្យ​បញ្ជា 'do-release-upgrade' ដើម្បី​ធ្វើឲ្យ​ប្រសើរ​ចំពោះ​វា ។" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "ការ​ធ្វើឲ្យ​ប្រសើរ %(version)s អ៊ូប៊ុនទូ​អាច​ប្រើបាន" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "អ្នក​បាន​បដិសេធ​ការ​ធ្វើឲ្យ​ប្រសើរ​ទៅ​អ៊ូប៊ុនទូ %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "បន្ថែម​ទិន្នន័យ​បំបាត់​កំហុស" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "បង្ហាញ​កញ្ចប់​ដែល​គ្មាន​ការ​គាំទ្រ​នៅ​លើ​ម៉ាស៊ីន​នេះ" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "បង្ហាញ​កញ្ចប់​ដែល​មាន​ការ​គាំទ្រ​នៅ​លើ​ម៉ាស៊ីន​នេះ" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "បង្ហាញ​កញ្ចប់​ទាំងអស់​ជាមួយ​ស្ថានភាព​របស់​ពួកវា" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "បង្ហាញ​កញ្ចប់​ទាំងអស់​នៅ​ក្នុង​បញ្ជី" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "គាំទ្រ​សេចក្ដី​សង្ខេប​ស្ថានភាព​អំពី '%s' ៖" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "អ្នក​មាន %(num)s កញ្ចប់ (%(ភាគរយ) ។1f%%) ត្រូវ​បាន​គាំទ្រ​រហូតដល់ %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "អ្នក​មាន %(num)s កញ្ចប់ (%(ភាគរយ) ។1f%%) ដែល​មិន​អាច/លែង​ទាញ​យក​ទៀត​បាន" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "អ្នក​មាន %(num)s កញ្ចប់ (%(ភាគរយ) ។1f%%) ដែល​មិន​ត្រូវ​បាន​គាំទ្រ" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2379,81 +2397,147 @@ "ប្រើ​ពាក្យ​បញ្ជា --show-unsupported, --show-supported ឬ --show-all ដើម្បី​មើល​សេចក្ដី​" "លម្អិត​បន្ថែម" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "មិន​អាច​ទាញ​យក​ទៀត​បាន ៖" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "មិន​គាំទ្រ ៖ " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "មិន​គាំទ្រ​រហូតដល់ %s ៖" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "មិន​គាំទ្រ" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "វិធីសាស្ត្រ​ដែល​មិន​បាន​អនុវត្ត ៖ %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "ឯកសារ​នៅ​លើ​ថាស" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "កញ្ចប់ .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "ដំឡើង​កញ្ចប់​ដែល​បាត់ ។" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "កញ្ចប់ %s គួរតែ​ត្រូវ​បាន​ដំឡើង ។" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "កញ្ចប់ .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s ទាមទារ​ឲ្យ​សម្គាល់​ថា​បាន​ដំឡើង​ដោយដៃ ។" - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"នៅ​ពេល​ធ្វើឲ្យ​ប្រសើរ ប្រសិនបើ kdelibs4-dev ត្រូវ​បាន​ដំឡើង kdelibs5-dev ទាមទារ​ឲ្យ​ដំឡើង ។ " -"ចំពោះ​ព័ត៌មាន​លម្អិត ​សូម​មើល bugs.launchpad.net, bug #279621 ។" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i ធាតុ​ហួសសម័យ​នៅ​ក្នុង​ឯកសារ​ស្ថានភាព" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "ធាតុ​ហួសសម័យ​នៅ​ក្នុង​ស្ថានភាព dpkg" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "ធាតុ​ស្ថានភាព dpkg ដែល​ហួសសម័យ" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"នៅ​ពេល​ធ្វើឲ្យ​ប្រសើរ ប្រសិនបើ kdelibs4-dev ត្រូវ​បាន​ដំឡើង kdelibs5-dev ទាមទារ​ឲ្យ​ដំឡើង ។ " +"ចំពោះ​ព័ត៌មាន​លម្អិត ​សូម​មើល bugs.launchpad.net, bug #279621 ។" + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s ទាមទារ​ឲ្យ​សម្គាល់​ថា​បាន​ដំឡើង​ដោយដៃ ។" + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "យក lilo ចេញ ​ដោយសារតែ grub ត្រូវ​បាន​ដំឡើង​រួច​ហើយ ។(ចំពោះ​ព័ត៌មាន​លម្អិត សូម​មើល bug #314004 " "។)" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" + +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + #~ msgid "" #~ "After your package information was updated the essential package '%s' can " #~ "not be found anymore so a bug reporting process is being started." @@ -2461,36 +2545,6 @@ #~ "បន្ទាប់ពី​បាន​ធ្វើ​បច្ចុប្បន្នភាព​ព័ត៌មាន​កញ្ចប់​រួចហើយ មិន​អាច​រក​ឃើញ​កញ្ចប់​សំខាន់ '%s' ទៀត​ទេ ដូច្នេះ​" #~ "ដំណើរការ​រាយការណ៍​កំហុស​កំពុង​ត្រូវ​បាន​ចាប់ផ្ដើម ។" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s បច្ចុប្បន្នភាព​ត្រូវ​បាន​ជ្រើស ។" - -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" - -#~ msgid "Welcome to Ubuntu" -#~ msgstr "សូម​ស្វាគមន៍​ការ​មកកាន់​អ៊ូប៊ុនទូ" - -#~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." -#~ msgstr "បច្ចុប្បន្ន​ភាព​កម្មវិធី​ទាំង​នេះ​ត្រុវ​បាន​ចេញ​តាំង​ពី​កំណែ​អ៊ូប៊ុនទូ​ត្រូវ​បាន​ចេញ​ផ្សាយ​មក​ម្លះ ។" - -#~ msgid "Software updates are available for this computer." -#~ msgstr "ប​ច្ចុប្បន្ន​ភាព​កម្មវិធី​អាច​ប្រើបាន​សម្រាប់​កុំព្យូទ័រ​នេះ ។" - -#~ msgid "Update Manager" -#~ msgstr "កម្មវិធី​គ្រប់គ្រង​បច្ចុប្បន្នភាព" - -#~ msgid "Starting Update Manager" -#~ msgstr "ចាប់ផ្ដើម​កម្មវិធី​គ្រប់គ្រង​បច្ចុប្បន្នភាព" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "អ្នក​ត្រូវ​បាន​តភ្ជាប់​តាម​រយៈ​ម៉ូដឹម​ឥត​ខ្សែ ។" - -#~ msgid "_Install Updates" -#~ msgstr "ដំឡើង​បច្ចុប្បន្នភាព" - #~ msgid "0 kB" #~ msgstr "០ kB" diff -Nru update-manager-17.10.11/po/kn.po update-manager-0.156.14.15/po/kn.po --- update-manager-17.10.11/po/kn.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/kn.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2008. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2010-09-27 23:33+0000\n" "Last-Translator: Michael Vogt \n" "Language-Team: Kannada \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f ಎಂಬಿ" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s ಗಾಗಿ ಸರ್ವರ್" @@ -42,30 +43,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "ಮುಖ್ಯ ಸರ್ವರ್" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "ವಿಶೇಷ ಸರ್ವರ್ ಗಳು" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "server.list ಅನ್ನು ಲೆಕ್ಕ ಹಾಕಲಾಗಲಿಲ್ಲ" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -75,13 +76,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -96,22 +97,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -124,65 +125,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "ಈ ತೊಂದರೆ ಬಹುತೇಕ ಕ್ಷಣಿಕವಾದದ್ದು, ನಂತರ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "'%s'ನ್ನು ಸಂಸ್ಥಾಪಿಸಲು ಆಗುವುದಿಲ್ಲ" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -191,25 +192,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -218,11 +219,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -233,11 +234,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -245,7 +246,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -254,29 +255,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -286,28 +287,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -315,11 +316,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -331,16 +332,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -353,11 +354,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -366,34 +367,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -406,23 +407,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -433,32 +434,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -466,33 +467,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -503,26 +504,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -530,37 +531,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -568,79 +569,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -648,16 +649,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -666,7 +667,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -675,11 +676,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -687,11 +688,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -699,11 +700,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -713,71 +714,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -787,27 +788,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -817,7 +818,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -826,26 +827,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -853,147 +854,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1001,32 +1002,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1042,7 +1043,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1056,14 +1057,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1071,34 +1072,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1111,28 +1110,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1140,145 +1139,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1286,73 +1285,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1410,7 +1409,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1429,133 +1428,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1563,31 +1570,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1596,34 +1610,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1631,29 +1653,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1662,7 +1684,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1670,58 +1692,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1731,22 +1763,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1760,26 +1788,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1788,7 +1816,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1797,7 +1825,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1806,47 +1834,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1907,54 +1929,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1979,7 +2004,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1991,216 +2016,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/ko.po update-manager-0.156.14.15/po/ko.po --- update-manager-17.10.11/po/ko.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/ko.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # darehanl , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-04-10 17:40+0000\n" "Last-Translator: Kim Boram \n" "Language-Team: Korean \n" @@ -20,20 +21,20 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" msgstr[0] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s 서버" @@ -41,20 +42,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "주 서버" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "사용자 정의 서버" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "sources.list 항목을 계산할 수 없습니다." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -62,11 +63,11 @@ "어떤 패키지 파일도 찾을 수 없습니다. 우분투 디스크가 아니거나 올바르지 않은 " "아키텍처인 것은 아닙니까?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "CD 추가 실패" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -81,12 +82,12 @@ "오류 메시지:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "오류가 있는 패키지 제거" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -102,15 +103,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "서버가 과부화 상태인 것 같습니다" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "망가진 패키지" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -119,7 +120,7 @@ "나 apt-get 명령으로 복구하십시오." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -140,11 +141,11 @@ " * 써드 파티 소프트웨어를 사용 중입니다.\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "이것은 아마도 일시적인 문제일 것입니다. 나중에 다시 시도해주십시오." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -152,16 +153,16 @@ "만약 아무 것도 적용되지 않으면, 터미널에서 'ubuntu-bug update-manager' 명령" "을 입력하여 이 버그를 보고해주십시오." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "업그레이드를 계산할 수 없습니다." -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "일부 패키지를 인증할 수 없습니다." -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -170,28 +171,28 @@ "몇몇 패키지를 인증할 수 없습니다. 일시적인 네트워크 문제일 수 있으므로 나중" "에 대시 시도해주십시오. 인증하지 못한 패키지의 목록은 다음과 같습니다." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "패키지 '%s'은(는) 제거 차단 목록에 기록되어 있어 제거할 수 없습니다." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "필수 패키지 '%s'을(를) 제거할 항목으로 표시했습니다." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "차단 목록 상의 버전 '%s'을(를) 설치합니다" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "'%s'을(를) 설치할 수 없음" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -200,11 +201,11 @@ "령을 입력하시어 이 버그를 보고해 주십시오." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "메타 패키지를 추측할 수 없음" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -217,15 +218,15 @@ "습니다.\n" "우선 위의 패키지 중 하나를 시냅틱이나 apt-get 명령으로 설치하시기 바랍니다." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "캐시 읽는 중" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "배타적으로 잠글 수 없음" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -233,11 +234,11 @@ "이것은 보통 또 다른 패키지 관리 프로그램(예를 들어 apt-get이나 aptitude)을 이" "미 실행하고 있는 것을 의미 합니다. 우선 해덩 프로그램을 종료하십시오." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "원격 접속을 통한 업그레이드를 지원하지 않음" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -251,11 +252,11 @@ "\n" "업그레이드를 중지될 것입니다. SSH를 사용하지 않고 다시 시도하십시오." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "SSH를 통해 계속 진행하시겠습니까?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -272,11 +273,11 @@ "진행하시면 '%s' 포트로 추가 SSH데몬을 시작할 것입니다.\n" "계속 진행하시겠습니까?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "추가 sshd 시작" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -287,7 +288,7 @@ "행합니다. 현재 실행 중인 ssh에 문제가 발생해도 추가로 실행한 데몬을 통해 접속" "할 수 있습니다.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -299,29 +300,29 @@ "은 잠재적으로 위험하기 때문에 자동으로 실행되지 않습니다. 아래와 같이 포트를 " "여실 수 있습니다 : '%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "업그레이드할 수 없음" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "이 도구로 '%s'에서 '%s'(으)로 업그레이드할 수 없습니다." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "샌드박스 설정 실패" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "샌드박스 환경을 만들 수 없습니다." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "샌드박스 모드" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -336,17 +337,17 @@ "지금부터 다음 다시 시작할 때까지 어떤 바뀐 내용도 시스템 디렉터리에 기록하지 " "않습니다." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "파이썬 설치가 잘못되었습니다. '/usr/bin/python' 심볼릭 링크를 수정하십시오." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "'debsig-verify' 패키지를 설치했습니다." -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -356,12 +357,12 @@ "시냅틱이나 'apt-get remove debsig-verify' 명령으로 제거한 후 다시 업그레이드" "를 수행하십시오." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "'%s'에 기록할 수 없습니다" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -372,11 +373,11 @@ "할 수 없습니다.\n" "시스템 디렉터리에 기록할 수 있는 권한이 있는지 확인하십시오." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "인터넷으로 최신 업데이트를 설치하시겠습니까?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -396,16 +397,16 @@ "를 설치해야 합니다.\n" "'아니오'를 선택하면 네트워크를 이용하지 않습니다." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "%s(으)로 업그레이드 하지 않음" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "올바른 미러 서버를 찾지 못함" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -424,11 +425,11 @@ "'아니오'를 선택하면 업그레이드를 취소합니다." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "기본 소스 목록을 만드시겠습니까?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -440,11 +441,11 @@ "'%s'에 대한 기본 항목을 추가하시겠습니까? '아니오'를 선택하면 업그레이드를 취" "소합니다." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "저장소 정보가 올바르지 않습니다" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -452,11 +453,11 @@ "저장소 정보를 업데이트한 결과 올바르지 않은 파일이 생성되었습니다. 버그 보고 " "작업을 시작합니다." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "서드 파티 소스는 사용할 수 없습니다" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -466,12 +467,12 @@ "친 후 '소프트웨어 소스' 도구나 패키지 관리자를 이용해 다시 사용 할 수 있습니" "다." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "패키지 상태가 불완전함" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -485,11 +486,11 @@ "'%s' 패키지는 불완전한 상태이며 다시 설치해야합니다만, 저장소에서 찾을 수 없" "습니다. 이 패키지를 직접 다시 설치하거나 시스템에서 제거하십시오." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "업데이트 중 오류 발생" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -497,13 +498,13 @@ "업데이트 중 문제가 발생했습니다. 보통 네트워크 문제인 경우가 많습니다.네트워" "크의 연결 상태를 확인하시고 다시 시도하십시오." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "디스크 여유 공간이 충분하지 않습니다." -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -517,21 +518,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "바뀐 내용을 계산하는 중" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "업그레이드를 시작하시겠습니까?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "업그레이드 취소함" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -539,12 +540,12 @@ "업그레이드를 취소합니다. 시스템은 업그레이드 이전 상태로 돌아가며 업그레이드" "는 이후에도 언제든지 다시 할 수 있습니다." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "업그레이드 파일을 다운로드 할 수 없음" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -554,27 +555,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "커밋 작업 중 오류 발생" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "시스템을 이전의 상태로 복구하고 있습니다" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "업그레이드를 깔지 못했습니다." #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -582,7 +583,7 @@ "업그레이드를 중단했습니다. 시스템에 치명적인 오류가 발생했을 수 있습니다.복구" "(dpkg --configure -a) 명령을 실행하겠습니다." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -599,7 +600,7 @@ "를 보고해주십시오.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -607,20 +608,20 @@ "업그레이드를 중단했습니다. 인터넷 연결이나 설치 매체를 확인한 후 다시 시도하" "십시오. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "사용하지 못하게 된 패키지를 제거하시겠습니까?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "유지(_K)" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "제거(_R)" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -630,37 +631,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "필요한 의존 프로그램을 설치하지 않았습니다." -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "필요한 의존 프로그램 '%s'을(를) 설치하지 않습니다. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "패키지 관리자 확인 중" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "업그레이드 준비에 실패했습니다" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "시스템 업그레이드 준비를 실패했습니다. 버그 보고 작업을 시작합니다." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "업그레이드 사전 작업에 실패했습니다" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -672,68 +673,68 @@ "\n" "추가적으로, 버그 보고 작업을 시작합니다." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "저장소 정보 업데이트 중" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "cdrom을 추가할 수 없음" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "죄송합니다. cdrom을 추사할 수 없습니다." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "올바르지 않은 패키지 정보" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "가져오는 중" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "업그레이드 중" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "업그레이드 완료" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "업그레이드를 완료했지만 업그레이드 과정 중 오류가 발생하였습니다." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "못 쓰게 된 소프트웨어를 검색하는 중" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "시스템 업그레이드를 완료했습니다." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "부분 업그레이드를 완료했습니다." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms 사용 중" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -742,11 +743,11 @@ "이 시스템은 /proc/mounts 안에 'evms' 볼륨 매니저를 사용하고 있습니다. " "'evms'은 더 이상 지원되지 않으므로, 종료 후 업그레이드를 다시 실행하십시오." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "그래픽 카드가 우분투 12.04 장기 지원판을 지원하지 않습니다." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -758,9 +759,9 @@ "Bugs/UpdateManagerWarningForI8xx 페이지를 확인해주십시오. 업그레이드를 계속 " "진행하시겠습니까?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -768,8 +769,8 @@ "업그레이드로 인해 데스크탑 효과나 게임, 그래픽 관련 프로그램의 성능이 줄어들 " "수 있습니다." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -781,7 +782,7 @@ "드라이버는 우분투 10.04 LTS을 지원하는 버전이 없습니다.\n" "계속 진행하시겠습니까?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -793,11 +794,11 @@ "이버는 우분투 10.04 LTS을 지원하는 버전이 없습니다.\n" "계속 진행하시겠습니까?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "i686 CPU 아님" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -808,11 +809,11 @@ "니다. 모든 패키지는 최소 i686 호환 CPU가 필요합니다. 현 시스템에서 새로운 우" "분투 버전으로 업그레이드 할 수 없습니다." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "ARMv6 CPU 아님" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -824,11 +825,11 @@ "합니다. 현재 하드웨어로는 새로운 우분투 버전으로 시스템을 업그레이드 할 수 없" "습니다." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "init 사용 불가" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -843,15 +844,15 @@ "\n" "계속 진행하시겠습니까?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "aufs로 샌드박스 업그레이드" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "주어진 경로로 업그레이드할 수 있는 패키지가 있는 시디롬을 검색합니다." -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -859,57 +860,57 @@ "프론트 엔드를 사용합니다. 현재 사용할 수 있는 것은 다음과 같습니다: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*삭제된 옵션* 이 항목은 무시합니다." -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "부분 업그레이드만 실행합니다.(sources.list 파일은 바꾸지 않음)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "GNU 화면 지원 사용하지 않음" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "datadir 설정" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "'%s'(을)를 '%s' 드라이브에 넣어주십시오." #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "가져오기 완료" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "%li번째 파일(전체 %li개)을 %sB/s의 속로로 가져오는 중" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "약 %s 남음" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "%li번째 파일(전체 %li개)을 가져오는 중" @@ -919,27 +920,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "바뀐 내용을 적용하는 중" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "의존성 오류 - 설정하지 않은 채로 남겨둡니다." #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "'%s'(을)를 설치할 수 없음" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -951,7 +952,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -962,27 +963,27 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" "새로운 버전으로 바꾸기를 선택하면 이전 설정 파일의 바뀐 내용을 잃게 됩니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "'diff' 명령을 찾을 수 없습니다" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "치명적인 오류 발생" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -994,13 +995,13 @@ "기존 sources.list 파일은 /etc/apt/sources.list.distUpgrade 파일로 저장했습니" "다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "컨트롤-C 누름" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1009,134 +1010,134 @@ "습니까?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "데이터 손실을 막으려면 열려있는 모든 프로그램과 문서를 닫으십시오." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "캐노니컬에서 더 이상 지원하지 않습니다 (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "다운그레이드 (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "지우기 (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "더 이상 필요하지 않음 (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "설치 (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "업그레이드(%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "미디어 바꾸기" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "차이점 보이기 >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< 차이점 숨기기" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "오류" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "취소(&C)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "닫기(&C)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "터미널 보이기 >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< 터미널 숨기기" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "정보" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "자세한 내용" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "지원하지 않음 %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "제거 %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "제거 (자동으로 설치함) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "설치 %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "업그레이드 %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "다시 시작해야 합니다." -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "업그레이드를 완료하기 위해 시스템을 다시 시작합니다." -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "지금 다시 시작(_R)" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1148,29 +1149,29 @@ "업그레이드 중간에 취소하면 시스템을 사용할 수 없게 될 수 있습니다. 업그레이드" "를 계속 진행할 것을 강력하게 추천합니다." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "업그레이드를 취소하겠습니까?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li 일" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li 시간" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li 분" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1185,7 +1186,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1199,14 +1200,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1216,34 +1217,32 @@ "다." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "현재 연결 상태로는 다운로드 과정에 약 %s 정도가 필요합니다. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "업그레이드를 준비하는 중" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "새 소프트웨어 채널을 가져오는 중" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "새 패키지를 가져오는 중" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "업그레이드를 까는 중" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "마무리 중" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1257,25 +1256,25 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "패키지 %d개를 제거할 것입니다." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "새 패키지 %d개를 설치할 것입니다." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "패키지 %d개를 업그레이드 할 것입니다." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1286,7 +1285,7 @@ "\n" "모두 %s개의 패키지를 다운로드해야 합니다.. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1294,7 +1293,7 @@ "업그레이드를 다운로드하고 설치하는 것은 긴 시간이 필요할 수도 있으며, 한번 다" "운로드가 끝나면 취소할 수 없습니다." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1302,51 +1301,51 @@ "업그레이드를 다운로드하고 설치하는 것은 수 시간이 필요할 수도 있으며, 한번 다" "운로드가 끝나면 취소할 수 없습니다." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "패키지 제거는 수 시간이 걸릴 수 있습니다. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "이 컴퓨터의 소프트웨어를 모두 업데이트했습니다." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "시스템에 업그레이드할 것이 없습니다. 업그레이드를 취소합니다." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "다시 시작해야합니다." -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "업그레이드가 끝났으며 다시 시작해야 합니다. 지금 하시겠습니까?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "'%(signature)s'(으)로 '%(file)s' 파일 인증 " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "'%s' 압축 해제 중" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "업그레이드 도구를 실행할 수 없습니다." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1354,46 +1353,46 @@ "업그레이드 도구에 버그가 있을 가능성이 높습니다. 터미널에서 'ubuntu-bug " "update-manager' 명령을 사용하여 이 버그를 보고해 주십시오." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "업그레이드 도구 서명" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "업그레이드 도구" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "가져오기 실패" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "업그레이드를 가져올 수 없습니다. 네트워크에 문제가 있을 수 있습니다. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "인증 실패" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" "업그레이드를 인증할 수 없습니다.네트워크나 서버에 문제가 있을 수 있습니다. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "압축 해체 실패" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1401,28 +1400,28 @@ "업그레이드의 압축을 해체할 수 없습니다. 네트워크나 서버에 문제가 있을 수 있습" "니다. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "검증 실패" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" "업그레이드를 검증할 수 없습니다. 네트워크나 서버에 문제가 있을 수 있습니다. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "업그레이드를 할 수 없습니다." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1430,13 +1429,13 @@ "이 것은 보통 /tmp 디렉터리를 noexec로 마운트한 시스템에서 발생합니다. noexec " "없이 다시 마운트한 후 업그레이드를 시작하십시오." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "오류 메시지는 '%s'입니다." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1447,73 +1446,73 @@ "일을 보고서에 첨부하여 보고해주십시오. 업그레이드를 취소합니다.\n" "원본 소스 목록을 /etc/apt/sources.list.distUpgrade 파일에 저장했습니다." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "중지하는 중" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "강등됨:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "계속 하시려면 [엔터] 키를 눌러 주십시오" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "계속 [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "자세한 내용 [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "더 이상 지원하지 않음: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "지우기: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "설치: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "업그레이드: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "계속하겠습니까? [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1580,8 +1579,7 @@ msgstr "배포판 업그레이드" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "우분투를 12.04버전으로 업그레이드합니다." #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1600,84 +1598,85 @@ msgid "Terminal" msgstr "터미널" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "잠시 기다려 주십시오. 이 작업에 오랜 시간이 소요될 수 있습니다." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "업데이트 완료" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "릴리즈 정보를 찾을 수 없습니다." -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "서버에 접속자가 너무 많습니다. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "릴리즈 정보를 다운로드 할 수 없습니다." -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "인터넷 연결 상태를 확인하십시오." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "업그레이드" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "릴리즈 정보" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "추가 패키지 파일 다운로드 중..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "파일 %s / %s, 속도 %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "파일 %s / %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "브라우저로 링크 열기" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "링크를 클립보드에 복사" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "%(total)li개 중 %(current)li번째 파일을 %(speed)s/s의 속도로 받는 중" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "%(total)li개 중 %(current)li번째 파일을 다운로드 중" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "현재 사용 중인 우분투 배포판은 더 이상 지원하지 않습니다." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1685,63 +1684,75 @@ "이후 보안 패치, 중요한 업데이트를 받을 수 없습니다. 최신 버전으로 업그레이드 " "하십시오." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "업그레이드 정보" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "설치" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "이름" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "버전 %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "네트워크에 연결되어 있지 않습니다. 바뀐 내용 목록을 다운로드할 수 없습니다." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "바뀐 내용 목록을 다운로드하고 있습니다..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "모든 선택 취소(_D)" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "모두 선택(_A)" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s개의 업데이트가 선택 되었습니다." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s을(를) 다운로드 하게됩니다." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "업데이트를 이미 다운로드했으나 설치하지 않았습니다." #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "설치할 업데이트가 없습니다." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "다운로드 크기 알 수 없음" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1749,7 +1760,7 @@ "패키지 정보를 언제 마지막으로 업데이트했는지 알 수 없습니다. 정보를 업데이트" "하려면 '확인' 단추를 눌러주십시오." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1758,13 +1769,13 @@ "패키지 정보를 %(days_ago)s일 전에 업데이트했습니다.\n" "아래 '검사' 단추를 눌러 새로운 소프트웨어 업데이트가 있는지 확인하십시오." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "패키지 정보를 %(days_ago)s일 전에 업데이트했습니다." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1772,34 +1783,46 @@ msgstr[0] "패키지 정보를 %(hours_ago)s시간 전에 업데이트했습니다." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "패키지 정보를 %s분 전에 마지막으로 업데이트했습니다." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "패키지 정보를 지금 막 업데이트했습니다." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"소프트웨어 업데이트는 오류를 고치고, 보안 문제를 제거하며 새로운 기능을 제공" +"합니다." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "컴퓨터가 사용할 수 있는 소프트웨어 업데이트가 있을 수 있습니다." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "우분투의 세계에 오신 것을 환영합니다." -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"이 소프트웨어 업데이트는 이 버전의 우분투가 배포된 이후에 발표된 업데이트입니" +"다." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "이 컴퓨터에 소프트웨어 업데이트를 설치할 수 있습니다" + +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1810,31 +1833,31 @@ "크 공간을 '%s'에 추가로 확보하세요. 휴지통을 비우고 'sudo apt-get clean' 명" "령으로 이전에 설치하며 사용한 임시 패키지를 제거하십시오." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" "업데이트를 끝내려면 다시 시작해야 합니다. 그 전에 작업을 저장해주십시오." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "패키지 정보를 읽는 중" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "접속 중..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "업데이트를 확인할 수 없거나 새 업데이트를 다운로드하지 못할 수 있습니다." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "패키지 정보를 초기화할 수 없습니다." -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1847,7 +1870,7 @@ "다음 오류 메시지를 포함해서 'update-manager' 패키지의 버그로 보고해 주십시" "오:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1858,31 +1881,31 @@ "\n" "다음 오류 메시지를 포함해서 'update-manager' 패키지의 버그로 보고해 주십시오:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (새로 설치)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(크기: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "버전 %(old_version)s에서 %(new_version)s(으)로" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "버전 %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "배포판을 업그레이드할 수 없습니다." -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1891,21 +1914,21 @@ "지금 배포판을 업그레이드할 수 없습니다. 나중에 다시 시도해주십시오.서버의 보" "고: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "배포판 업그레이드 도구 다운로드 중" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "새 우분투 버전 '%s'을(를) 사용할 수 있습니다" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "소프트웨어 목록이 망가짐" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1915,6 +1938,17 @@ "\"을 사용하거나 터미널에서 \"sudo apt-get install -f\" 명령을 실행하여 이 문" "제를 해결하십시오." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "새 배포판 '%s'을(를) 사용할 수 있습니다." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "취소" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "업데이트 확인" @@ -1924,22 +1958,18 @@ msgstr "사용 가능한 업데이트 모두 설치" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "취소" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "바꾼 내용 목록" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "업데이트" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "업데이트 목록 구성 중" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1964,20 +1994,20 @@ " * 우분투에서 제공하지 않는 비공식 소프트웨어 패키지\n" " * 공식 배포 이전 버전 우분투의 일상적인 바뀜" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "바뀐 내용 목록 다운로드 중" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "기타 업데이트 (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "바뀐 내용 목록을 지원하지 않는 소스로 패키징한 업데이트입니다." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -1985,7 +2015,7 @@ "바뀐 내용 목록을 다운로드할 수 없습니다. \n" "인터넷 연결을 확인해주십시오." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1998,7 +2028,7 @@ "사용 가능한 버전: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2012,7 +2042,7 @@ "에 다시 시도하십시오.\n" "http://launchpad.net/ubuntu/+source/%s/%s/+changelog" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2026,52 +2056,43 @@ "에 다시 시도하십시오.\n" "http://launchpad.net/ubuntu/+source/%s/%s/+changelog" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "배포판 탐지 실패" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "사용 중인 시스템을 확인하는 도중 오류 '%s'(이)가 발생했습니다." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "중요 보안 업데이트" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "추천 업데이트" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "제안 업데이트" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "백포트" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "배포판 업데이트" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "기타 업데이트" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "업데이트 관리자를 시작합니다" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"소프트웨어 업데이트는 오류를 고치고, 보안 문제를 제거하며 새로운 기능을 제공" -"합니다." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "부분 업그레이드(_P)" @@ -2141,37 +2162,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "소프트웨어 업데이트" +msgid "Update Manager" +msgstr "업데이트 관리자" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "소프트웨어 업데이트" +msgid "Starting Update Manager" +msgstr "업데이트 관리자를 시작합니다." #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "업그레이드(_P)" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "업데이트" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "설치" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "바뀐 내용" +msgid "updates" +msgstr "업데이트" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "설명" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "업데이트 설명" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2179,24 +2190,34 @@ "로밍 서비스에 연결되어 있습니다. 이 업데이트의 데이터 사용으로 인한 요금이 발" "생할 수 있습니다." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "무선 모뎀에 연결되어 있습니다." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "업데이트를 시작하기 전에 컴퓨터를 교류 전원에 연결 하는 것이 안전합니다." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "업데이트 설치(_I)" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "바뀐 내용" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "설정(_S)..." +msgid "Description" +msgstr "설명" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "설치" +msgid "Description of update" +msgstr "업데이트 설명" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "설정(_S)..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2219,9 +2240,8 @@ msgstr "새 우분투로 업그레이드 하는 것을 취소했습니다." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "이후 업데이트 관리자에서 \"업그레이드\"를 클릭하시면 업그레이드할 수 있습니" @@ -2235,58 +2255,58 @@ msgid "Show and install available updates" msgstr "사용할 수 있는 업데이트를 보여주고, 설치합니다." -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "버전을 표시하고 끝내기" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "데이터 파일이 저장된 디렉터리" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "새로운 우분투 버전이 있는지 확인합니다" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "최신 개발 버전으로 업그레이드할 수 있는지 확인합니다" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "배포판 업그레이드 장치의 최종 제안 버전을 사용하여 업그레이드" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "시작할 때 지도에 포커스를 두지 말 것" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "배포판 업그레이드 실행 시도" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "시작할 때 업데이트 확인하지 않기" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "샌드박스 aufs 오버레이로 시험 업그레이드" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "부분 업그레이드 실행" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "패지키의 바뀐 내용 목록대신 설명 보이기" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "업그레이드 도구를 이용하여 $distro-proposed에서 최신 배포판으로 업그레이드를 " "시도합니다" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2296,21 +2316,21 @@ "현재는 데스크톱 시스템의 일반적인 업그레이드를 위한 'desktop' 모드와 서버 시" "스템을 위한 'server' 모드를 지원합니다." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "지정한 프론트엔드를 실행" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "새 배포판이 있을 경우에만 확인하기. 결과는 끝내기 코드를 통해 반환" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "새 우분투 배포판 확인" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2318,69 +2338,69 @@ "업그레이드 정보를 확인하려면, 아래 주소를 방문하세요:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "새 배포판이 없습니다." -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "새 배포판 '%s'을(를) 사용할 수 있습니다." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "업그레이드를 하시려면 'do-release-upgrade' 명령을 실행하세요." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "우분투 %(version)s(으)로 업그레이드할 수 있습니다." -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "우분투 %s(으)로 업그레이드하는 것을 취소했습니다." -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "디버그 출력 추가" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "이 시스템상의 지원되지 않는 패키지 보이기" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "이 시스템 상의 지원이 계속되는 패키지 보이기" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "모든 패키지를 패키지의 상태와 함께 보이기" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "목록에 모든 패키지 보이기" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "'%s' 지원 상태 요약:" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "%(time)s까지 지원하는 패키지가 %(num)s개 (%(percent).1f%%) 있습니다." -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" "더 이상 다운로드 할 수 없는 패키지가 %(num)s개 (%(percent).1f%%) 있습니다." -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "지원하지 않는 패키지가 %(num)s개 (%(percent).1f%%) 있습니다." -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2388,118 +2408,152 @@ "자세한 내용을 확인하시려면 --show-unsupported, --show-supported 또는 --show-" "all 옵션으로 실행하십시오." -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "더 이상 다운로드할 수 없음:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "지원하지 않음: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "%s 까지 지원함:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "지원하지 않음" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "구현하지 않은 방법: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "디스크에 있는 파일" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb 패키지" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "빠진 패키지를 설치합니다." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "%s 패키지를 반드시 설치해야 합니다." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb 패키지" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s은(는) 직접 설치할 패키지로 표시해야 합니다." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"업그레이드 중 kdelibs4-dev 패키지를 설치한 경우 kdelibs5-dev 패키지를 설치합" -"니다. bugs.launchpad.net의 bug #279621에서 자세한 내용을 확인할 수 있습니다." - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i은(는) 상태 파일에서 쓰지 않게 된 엔트리" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "dpkg 상태에서 쓰지 않게 된 엔트리" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "쓰지 않게 된 dpkg 상태 엔트리" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"업그레이드 중 kdelibs4-dev 패키지를 설치한 경우 kdelibs5-dev 패키지를 설치합" +"니다. bugs.launchpad.net의 bug #279621에서 자세한 내용을 확인할 수 있습니다." + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s은(는) 직접 설치할 패키지로 표시해야 합니다." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "grub을 설치했으므로 lilo는 제거하십시오.(자세한 내용은 버그 #314004를 참조.)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "패키지 정보를 업데이트한 후 필수 패키지 '%s'을(를) 찾을 수 없습니다. 버그 " -#~ "보고 작업을 시작합니다." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s개의 업데이트가 선택 되었습니다." +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "우분투의 세계에 오신 것을 환영합니다." +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "이 소프트웨어 업데이트는 이 버전의 우분투가 배포된 이후에 발표된 업데이트" -#~ "입니다." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "이 컴퓨터에 소프트웨어 업데이트를 설치할 수 있습니다" - -#~ msgid "Update Manager" -#~ msgstr "업데이트 관리자" - -#~ msgid "Starting Update Manager" -#~ msgstr "업데이트 관리자를 시작합니다." - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "무선 모뎀에 연결되어 있습니다." - -#~ msgid "_Install Updates" -#~ msgstr "업데이트 설치(_I)" +#~ "패키지 정보를 업데이트한 후 필수 패키지 '%s'을(를) 찾을 수 없습니다. 버그 " +#~ "보고 작업을 시작합니다." #~ msgid "Checking for a new ubuntu release" #~ msgstr "새로운 우분투 버전을 확인합니다." diff -Nru update-manager-17.10.11/po/ku.po update-manager-0.156.14.15/po/ku.po --- update-manager-17.10.11/po/ku.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/ku.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-12-06 06:47+0000\n" "Last-Translator: Amed Çeko Jiyan \n" "Language-Team: Kurdish \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Pêşkêşkera %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Pêşkêşkera Mak" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Pêşkêşkera taybet" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Hesibandina ketana sources.list biserneket" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Tu pelên pakêtan nayên bicîkirin, pêkan e ku ev ne Diskeke Ubuntuyê be an jî " "avabûneke çewt be?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Di têxistina CD'yê de çewtî" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,13 +83,13 @@ "Peyama çewtiyê:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Pakêta di rewşa nebaş de rake" msgstr[1] "Pakêtên di rewşa nebaş de rake" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -107,15 +108,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Dibe ku li ser pêşkêşkarê pir hatibe barkirin" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Pakêtên şikestî" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -125,7 +126,7 @@ "synaptic an jî i apt-getê sererast bike." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -146,26 +147,26 @@ " * Pakêtên bernameyên nenavendî ji hêla Ubuntuyê ve nayên peydakirin\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Ev wekî pirsgirêkeke demdemî xuya dike, tika ye dîsa biceribîne." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Bilindkirin nehat hesabkirin" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Di piştrastkirina çend paketan de çewtî derket" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -174,7 +175,7 @@ "Hin pakêt nehatin piştrastkirin. Dibe ku ev pirsgirêkeke derbasdar a torê " "be. Ji bo lîsteya pakêtên ku nehatine piştrastkirin li jêr binihêre." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -182,33 +183,33 @@ "Pakêta '%s' ji bo rakirinê hate nîşankirin lê di lîsteya reş a rakirinê de " "ye." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Pakêta bingehîn '%s' ji bo rakirinê hate nîşankirin." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Sazkirina guhertoya '%s' a lîsteya reş diceribîne" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Nikare '%s' saz bike" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Pakêta meta nehate texmînkirin" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -222,15 +223,15 @@ " Ji kerema xwe re berî ku tu berdewam bikî, bi synaptic an jî bi apt-getê " "yek ji pakêtên ku li jor in saz bike." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Pêşbîr tê xwendin" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Kilîtkirina eksklusîv nayê çêkirin" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -238,11 +239,11 @@ "Wateya vê ew e ku, niha sepana rêveberiya pakêteke din dixebite (apt-get an " "jî aptitude). Ji kerema xwe re berê wê sepanê bigire." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Bilindkirina li ser girêdana ji dûr ve nayê destekirin" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -251,11 +252,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Bila xebitandina bin SSH'yê were domandin?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -266,11 +267,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "sshdyeke nû tê destpêkirin" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -278,7 +279,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -287,29 +288,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Bilinkirin çênabe" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Ev amûr piştgiriya bilindkirina ji '%s' ber ve '%s nade." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -319,30 +320,30 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Di sazkirina te ya Pythonê de çewtî heye. Ji kerema xwe re girêdana '/usr/" "bin/python' a sembolîk tamîr bike." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -350,11 +351,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Bila rojanekirinên herî dawîn yên di înternetê de lê werine zêdekirin?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -366,16 +367,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Neynikeke derbasdar nehate dîtin." -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -388,11 +389,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Bila depoyên pêşsalixbûyî bên çêkirin?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -401,21 +402,21 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Agahiya depoyê ne derbasdar e" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Ji çavkaniyên partiyên sêyemîn têkilî hate birîn." -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -425,13 +426,13 @@ "bilindkirinê tu dikarî van ketanan bi amûra 'software-properties' yan jî bi " "rêvebirê pakêtan dîsa çalak bikî." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -444,23 +445,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Di rojanekirinê de çewtî derket" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Cihê vala yê diskê têr nake" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -471,32 +472,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Guherandin tê hesibandin" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Tu dixwazî dest bi bilindkirinê bikî?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Bilindkirin hate betalkirin" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Daxistina bilindkirinan bi ser neket" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -504,33 +505,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Çewtî di dema xebitandinê de" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Vedigere rewşa pergala orjînal" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Sazkirina bilindkirinan bi ser neket" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -541,26 +542,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Bila pakêtên ku nayên bikaranîn werin rakirin?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "Bi_parêze" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Jêbirin" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -568,37 +569,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Divêtiyên pêwîst ne barkirî ne" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Divêtiya pêwîst '%s' ne barkirî ye " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Rêvebiriya paketan tê kontrol kirin" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Amadekirinên nûjenkirinê bi ser neketin" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Amadekirinên bilindkirinê bi ser neketin" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -606,79 +607,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Agahiyên çavkaniyan tên rojanekirin" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Agahiya pakêtê nederbasdar e" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Tê daxistin" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Tê bilindkirin" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Bilindkirin temam bû" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Li nivîsbariya kevin tê gerandin" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Bilindkirina pergalê temam bû." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -686,16 +687,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -704,7 +705,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -713,11 +714,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -725,11 +726,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "CPU ya ARMv6 tune" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -737,11 +738,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -751,73 +752,73 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Ji bo lêgerîna cdroma ku tê de pakêtên bilindbar hene, rêça ku hatiye " "destnîşankirin bikar bîne" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Ji kerema xwe '%s' bixe nav ajokera '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Rojanekirin temam bû" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Pelê %li ji %li bi %sB/ç tê anîn" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Nêzîka %s ma" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Pelê %li ji %li tê daxistin" @@ -827,27 +828,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Guherandin tê bi kar anîn" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "pirsgirêkên girêdanan - bê veavakirinê dimîne" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Nikarî '%s' saz bike" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -857,7 +858,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -868,7 +869,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -876,20 +877,20 @@ "Heke tu vê guhertoyê bi yeke nû biguherînî tu yê hemû guhertinên xwe yên di " "pelê mîhengkirinê de winda bikî." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Fermana 'diff' nehatiye dîtin" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Çewtiyeke cîdî derket holê" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -897,149 +898,149 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "Ji bo ku dane winda nebin hemû sepan û pelgeyên ku vekirî ne bigire." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Guhartina Medyayê" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Cudahiyan Nîşân bide >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Cudahiyan veşêre" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Çewtî" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Betalkirin" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Girtin" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Termînalê Nîşân bide >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "Termînalê veşêre" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Agahî" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Kîtekît" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "%s rake" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "%s saz bike" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "%s bilind bike" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Destpêkirina nû pêwîst e" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" "Ji bo bidawîanîna bilindkirinê pergalê ji nû ve bide destpêkirin" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "Niha _ji nû ve bide destpêkirin" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1047,32 +1048,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Ji Bilindkirinê derkeve?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li roj" msgstr[1] "%li roj" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li demjimêr" msgstr[1] "%li demjimêr" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li xulek" msgstr[1] "%li xulek" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1088,7 +1089,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1102,14 +1103,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1117,34 +1118,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Bi girêdana te, daxistin dê %s biajo. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Bilinkirin amade dibe" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Çavkaniyên nû yên nivîsbariyê tên anîn" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Pakêtên nû tên anîn" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Bilindkirin tên sazkirin" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Tê pakij kirin" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1157,28 +1156,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d pakêt dê were rakirin." msgstr[1] "%d pakêt dê werine rakirin." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "Dê %d pakêta nû were sazkirin." msgstr[1] "Dê %d pakêtên nû werine sazkirin." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "Dê %d pakêt were bilindkirin" msgstr[1] "Dê %d pakêt werine bilindkirin" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1189,28 +1188,28 @@ "\n" "Pêwîst e tu %s bi tevahî daxî. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1218,82 +1217,82 @@ "Ji bo pergala te bilindkirin tuneye. Karê bilindkirinê wê a niha were " "betalkirin." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Destpêkirina nû pêwîst e" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Bilindkirin bi dawî bû û destpêkirina nû pêwîst e. Tu dixwazî niha bikî?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Amûra bilindkirinê nikaribû bimeşîne" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Destnîşana amûra bilindkirinê" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Amûra bilindkirinê" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Anîn biserneket" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Anîna bilindkirinê biserneket. Dibe ku pirsgirêkeke torê hebe. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Naskirin lê nehat" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" "Naskirina bilindkirnê lê nehat. Dibe ku pirsgirekeke tor an pêşkêşkarê hebe. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Derxistin biserneket" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1301,13 +1300,13 @@ "Derxistina bilindkirinê biserneket. Dibe ku pirsgirekeke tor an pêşkêşkarê " "hebe. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1315,27 +1314,27 @@ "Di dema erêkirina bilindkirinê de çewtî. Dibe ku yan di torê de yan jî di " "pêşkêşkerê de pirsgirêk hebe " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Bilindkirin nayê xebitandin" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Peyama çewtiyê '%s' e." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1343,73 +1342,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Tê betalkirin" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Domandin [eN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Kîtekît [k]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "e" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "k" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Rakirin: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Sazkirin: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Bilindkirin: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1472,7 +1471,7 @@ msgstr "Bilindkirina Distrîbusiyonê" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1491,166 +1490,180 @@ msgid "Terminal" msgstr "Termînal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Divê raweste, dibe ku ev hinekî demdirêj be." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Rojanekirin temam bû" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "nîşeyên derxistinan nayên dîtin" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Dibe ku barê pêşkêşkerê pir zêde be " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Nîşeyên weşanê nehate daxistin" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Ji kerema xwe girêdana înternetê kontrol bike." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Nîşeyên Weşanê" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Pelê %(current)li ji %(total)li bi %(speed)s/ç tê daxistin" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Pelê %(current)li ji %(total)li tê daxistin" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Guhartoya %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Lîsteya guhartinan tê daxistin..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "Dibe ku barê pêşkêşkerê pir zêde be " -msgstr[1] "Dibe ku barê pêşkêşkerê pir zêde be " +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1659,34 +1672,44 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Rojanekirinên nivîsbariyê çewtiyan serrast dikin, valahiyên ewlêkariyê " +"dadigirin û funksiyonên nû tînin." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1694,29 +1717,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Agahiya pakêtê tê xwendin" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1725,7 +1748,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1733,52 +1756,52 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Mezinahî: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Ji guhertoya %(old_version)s ta %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Guhertoya %s:" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Pêrista nivîsbariyê xera bûye" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1788,6 +1811,16 @@ "tiştî vê pirsgirêkê bi gerînendeyê pakêtan ya \"Synaptic\" and jî bi fermana " "\"sudo apt-get install -f\" re di termînalê de çareser bike." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1797,22 +1830,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1826,20 +1855,20 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -1847,7 +1876,7 @@ "Daxistina lîsteya guhertinan biserneket.\n" "Ji kerema xwe re girêdana internetê kontrol bike." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1856,7 +1885,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1865,7 +1894,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1874,52 +1903,43 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Rojanekirinên ewlekariyê yên girîng (security)" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Rojanekirinên têne tewsiyekirin (recommended)" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Rojanekirinên hatine pêşniyarkirin (proposed)" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Nivîsbariyên bi paş de şandî (backports)" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Rojanekirinên dîstrîbusiyonê" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Rojanekirinên din" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Rêveberê Rojanekirinê tê destpêkirin" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Rojanekirinên nivîsbariyê çewtiyan serrast dikin, valahiyên ewlêkariyê " -"dadigirin û funksiyonên nû tînin." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Bilindkirina Qismen" @@ -1978,59 +1998,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Rojanekirinên Nivîsbariyê" +msgid "Update Manager" +msgstr "Rêveberiya rojanekirinê" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Rojanekirinên Nivîsbariyê" +msgid "Starting Update Manager" +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Bilindkirin" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "rojanekirin" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "%s saz bike" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Guhartin" +msgid "updates" +msgstr "rojanekirin" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Rave" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Raveya rojanekirinê" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "Rojanekirinan _saz bike" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Guhartin" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Vebijêrk..." +msgid "Description" +msgstr "Rave" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "%s saz bike" +msgid "Description of update" +msgstr "Raveya rojanekirinê" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Vebijêrk..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2054,7 +2074,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -2066,226 +2086,286 @@ msgid "Show and install available updates" msgstr "Rojanekirinên amade nîşan bide û saz bike" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Guhartoyê nîşan bide û derkeve" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "Kontrol bike ma bilindkirina bi weşana pêşdebiran ya dawî gengaz e an na" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Xebitandina dist-upgrade biceribîne" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Bilindkirina qismen tê xebitandin" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Weşaneke nû nehat dîtin" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Rêveberiya rojanekirinê" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "Rojanekirinan _saz bike" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "Checking for a new ubuntu release" #~ msgstr "Li weşaneke nû ya Ubuntu'yê bigere" diff -Nru update-manager-17.10.11/po/ky.po update-manager-0.156.14.15/po/ky.po --- update-manager-17.10.11/po/ky.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/ky.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2010. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2010-10-22 20:11+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Kirghiz \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "" @@ -42,30 +43,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -75,13 +76,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -96,22 +97,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -124,65 +125,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -191,25 +192,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -218,11 +219,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -233,11 +234,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -245,7 +246,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -254,29 +255,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -286,28 +287,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -315,11 +316,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -331,16 +332,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -353,11 +354,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -366,34 +367,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -406,23 +407,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -433,32 +434,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -466,33 +467,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -503,26 +504,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -530,37 +531,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -568,79 +569,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -648,16 +649,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -666,7 +667,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -675,11 +676,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -687,11 +688,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -699,11 +700,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -713,71 +714,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -787,27 +788,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -817,7 +818,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -826,26 +827,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -853,147 +854,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1001,32 +1002,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1042,7 +1043,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1056,14 +1057,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1071,34 +1072,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1111,28 +1110,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1140,145 +1139,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1286,73 +1285,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1410,7 +1409,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1429,164 +1428,180 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1595,34 +1610,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1630,29 +1653,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1661,7 +1684,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1669,58 +1692,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1730,22 +1763,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1759,26 +1788,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1787,7 +1816,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1796,7 +1825,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1805,47 +1834,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1906,54 +1929,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1978,7 +2004,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1990,216 +2016,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/lb.po update-manager-0.156.14.15/po/lb.po --- update-manager-17.10.11/po/lb.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/lb.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2011. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-12-06 06:46+0000\n" "Last-Translator: Laurent Kap \n" "Language-Team: Luxembourgish \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Server fir %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Haaptserver" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Benotzerdefinéierten Server" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Et wor net méiglech ee Pak ze fannen, villäicht ass dëst keng Ubuntu CD oder " "et ass di falsch Architektur." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "D'CD konnt net bäigefügt ginn" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,13 +83,13 @@ "D'Fehlermeldung wor:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Feelerhafte Pak läschen" msgstr[1] "Feelerhaft Päck läschen" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -107,15 +108,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "De Server kéint iwwerlaascht sinn" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Defekt Päck" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -124,7 +125,7 @@ "ginn. W.e.g. fléckt dës mat synaptic oder apt-get iert Dir virufuert." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -137,67 +138,67 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Dëst ass héchstwahrscheinlech ee kuerzzäitege Problem, probéiert w.e.g. " "spéider nach eng Kéier." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -206,25 +207,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -233,11 +234,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -248,11 +249,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -260,7 +261,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -269,29 +270,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -301,28 +302,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -330,11 +331,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -346,16 +347,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -368,11 +369,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -381,34 +382,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -421,23 +422,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -448,32 +449,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -481,33 +482,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -518,26 +519,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -545,37 +546,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -583,79 +584,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -663,16 +664,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -681,7 +682,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -690,11 +691,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -702,11 +703,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -714,11 +715,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -728,71 +729,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -802,27 +803,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -832,7 +833,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -841,26 +842,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -868,147 +869,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1016,32 +1017,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1057,7 +1058,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1071,14 +1072,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1086,34 +1087,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1126,28 +1125,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1155,145 +1154,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1301,73 +1300,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1425,7 +1424,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1444,133 +1443,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1578,31 +1585,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1611,34 +1625,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1646,29 +1668,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1677,7 +1699,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1685,58 +1707,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1746,22 +1778,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1775,26 +1803,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1803,7 +1831,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1812,7 +1840,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1821,47 +1849,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1922,54 +1944,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1994,7 +2019,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -2006,216 +2031,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/lo.po update-manager-0.156.14.15/po/lo.po --- update-manager-17.10.11/po/lo.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/lo.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2008. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2009-06-29 03:09+0000\n" "Last-Translator: Launchpad Translations Administrators \n" "Language-Team: Lao \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "" @@ -42,30 +43,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -75,13 +76,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -96,22 +97,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -124,65 +125,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -191,25 +192,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -218,11 +219,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -233,11 +234,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -245,7 +246,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -254,29 +255,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -286,28 +287,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -315,11 +316,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -331,16 +332,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -353,11 +354,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -366,34 +367,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -406,23 +407,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -433,32 +434,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -466,33 +467,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -503,26 +504,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -530,37 +531,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -568,79 +569,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -648,16 +649,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -666,7 +667,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -675,11 +676,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -687,11 +688,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -699,11 +700,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -713,71 +714,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -787,27 +788,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -817,7 +818,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -826,26 +827,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -853,147 +854,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1001,32 +1002,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1042,7 +1043,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1056,14 +1057,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1071,34 +1072,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1111,28 +1110,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1140,145 +1139,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1286,73 +1285,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1410,7 +1409,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1429,164 +1428,180 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1595,34 +1610,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1630,29 +1653,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1661,7 +1684,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1669,58 +1692,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1730,22 +1763,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1759,26 +1788,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1787,7 +1816,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1796,7 +1825,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1805,47 +1834,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1906,54 +1929,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1978,7 +2004,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1990,216 +2016,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/lt.po update-manager-0.156.14.15/po/lt.po --- update-manager-17.10.11/po/lt.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/lt.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # Žygimantas Beručka , 2005. # Žygimantas Beručka , 2009. +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-21 21:16+0000\n" "Last-Translator: Aurimas Fišeras \n" "Language-Team: Lithuanian\n" @@ -21,7 +22,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -30,13 +31,13 @@ msgstr[2] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s serveris" @@ -44,20 +45,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Pagrindinis serveris" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Pasirinktiniai serveriai" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Nepavyko apskaičiuoti sources.list įrašo" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -65,11 +66,11 @@ "Nepavyko rasti jokių paketų failų, galbūt tai ne Ubuntu diskas arba ne ta " "architektūra?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Nepavyko įtraukti CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -84,14 +85,14 @@ "Klaidos pranešimas:\n" "„%s“" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Pašalinti paketą blogoje būsenoje" msgstr[1] "Pašalinti paketus blogoje būsenoje" msgstr[2] "Pašalinti paketą blogoje būsenoje" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -113,15 +114,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Serveris gali būti labai apkrautas" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Sugadinti paketai" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -131,7 +132,7 @@ "arba „apt-get“." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -152,11 +153,11 @@ " * Neoficialių programinės įrangos, kurios neteikia Ubuntu, paketų\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Tai greičiausiai yra laikina problema, pabandykite vėliau dar kartą." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -164,16 +165,16 @@ "Jei niekas nepadeda, tuomet prašome pranešti apie klaidą - įvykdykite " "komandą „ubuntu-bug update-manager“ komandų terminale." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Nepavyko apskaičiuoti atnaujinimo" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Klaida nustatant kai kurių paketų tapatybę" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -183,29 +184,29 @@ "problema. Galite pabandyti vėliau. Žemiau parodytas paketų, kurių tapatybė " "nepatvirtinta, sąrašas." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" "Paketas „%s“ pažymėtas pašalinimui, tačiau jis yra juodajame šalinimo sąraše." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Esminis paketas „%s“ pažymėtas pašalinimui." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Bandoma įdiegti juodajame sąraše įtrauką versiją „%s“" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Negalima įdiegti „%s“" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -214,11 +215,11 @@ "terminale parašius „ubuntu-bug update-manager“." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Nepavyko atspėti metapaketo" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -232,15 +233,15 @@ " Prieš tęsdami pirmiausia įdiekite vieną iš šių paketų naudodamiesi " "„synaptic“ arba „apt-get“ priemonėmis." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Skaitomas podėlis" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Nepavyko gauti išskirtinio užrakto" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -248,11 +249,11 @@ "Tai dažniausiai reiškia, kad jau veikia kita programų paketų tvarkymo " "programa (pvz., apt-get arba aptitude). Pirma užverkite tą programą." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Atnaujinimas naudojant nuotolinį prisijungimą nepalaikomas" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -266,11 +267,11 @@ "\n" "Atnaujinimas bus nutrauktas. Mėginkite be ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Tęsti naudojant SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -286,11 +287,11 @@ "Jei tęsite, papildoma ssh tarnyba bus paleista su prievadu „%s“.\n" "Ar norite tęsti?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Paleidžiamas papildomas nuotolinio prisijungimo serveris (sshd)" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -301,7 +302,7 @@ "kopija. Jei kažkas atsitiks veikiančiam ssh, vis dar galėsite prisijungti " "prie to papildomo.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -314,29 +315,29 @@ "galite atverti prievadą, pavyzdžiui, su:\n" "„%s“" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Negalima atnaujinti" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Šis įrankis negali atnaujinti nuo „%s“ iki „%s“." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Sandbox sąranka nesėkminga" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Buvo neįmanoma sukurti sandbox aplinkos." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Sandbox veiksena" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -351,18 +352,18 @@ "*Jokie* pakeitimai įrašyti į sistemos katalogą nuo dabar iki kito paleidimo " "iš naujo nėra pastovūs." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Jūsų python įdiegtas netinkamai. Pataisykite „/usr/bin/python“ simbolinę " "nuorodą." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Paketas „debsig-verify“ įdiegtas" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -372,12 +373,12 @@ "Iš pradžių pašalinkite jį su synaptic ar „apt-get remove debsig-verify“ ir " "paleiskite atnaujinimą iš naujo." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Negalima rašyti į „%s“" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -388,11 +389,11 @@ "negali tęstis.\n" "Įsitikinkite, kad į sistemos katalogą galima rašyti." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Įtraukti naujausius atnaujinimus iš interneto?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -412,16 +413,16 @@ "atnaujinimus po atnaujinimo.\n" "Jei pasirinksite „Ne“, tinklo ryšiu nebus naudojamasi." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "išjungtas atnaujinant į %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Nerasta tinkamų programinės įrangos saugyklų (veidrodžių)" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -440,11 +441,11 @@ "Jei pasirinksite „Ne“, atnaujinimas bus nutrauktas." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Sugeneruoti numatytąsias saugyklas?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -457,11 +458,11 @@ "Ar pridėti numatytuosius „%s“ įrašus? Jei pasirinksite „Ne“, atnaujinimas " "bus nutrauktas." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Saugyklų informacija netinkama" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -469,11 +470,11 @@ "Saugyklos informacijos atnaujinimas baigėsi neteisingu failu, todėl " "paleidžiamas pranešimo apie klaidą procesas." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Trečiųjų šalių programinės įrangos saugyklos išjungtos" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -484,14 +485,14 @@ "atnaujinimą, su „programinės įrangos saugyklų“ įrankiu arba paketų " "tvarkytuve." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Paketas nesuderinamoje būsenoje" msgstr[1] "Paketai nesuderinamoje būsenoje" msgstr[2] "Paketai nesuderinamoje būsenoje" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -514,11 +515,11 @@ "tačiau nerasta tam reikalingų archyvų. Iš naujo įdiekite juos rankiniu būdu " "arba pašalinkite iš sistemos." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Klaida atnaujinant" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -526,13 +527,13 @@ "Atnaujinant kilo problema. Tai greičiausiai kokia nors su tinklu susijusi " "problema; patikrinkite savo tinklo ryšį ir bandykite dar kartą." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Diske nepakanka laisvos vietos" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -547,21 +548,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Apskaičiuojami pakeitimai" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Ar norite pradėti atnaujinimą?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Atnaujinimas atšauktas" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -569,12 +570,12 @@ "Atnaujinimas bus nutrauktas dabar ir bus atkurta originali sistemos būsena. " "Galite pratęsti atnaujinimą vėliau." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Nepavyko atsiųsti atnaujinimų" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -585,27 +586,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Klaida vykdant" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Atstatoma pradinė sistemos būsena" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Nepavyko įdiegti atnaujinimų" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -613,7 +614,7 @@ "Atnaujinimas nutrauktas. Jūsų sistema gali būti netinkamoje naudoti " "būsenoje. Dabar bus paleistas atkūrimas (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -630,7 +631,7 @@ "dist-upgrade/ prie pranešimo apie klaidą.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -638,20 +639,20 @@ "Atnaujinimas nutrauktas. Patikrinkite savo interneto ryšį ar diegimo " "laikmeną ir bandykite dar kartą. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Pašalinti pasenusius paketus?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Palikti" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "P_ašalinti" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -661,27 +662,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Reikalaujamos priklausomybės neįdiegtos" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Reikalaujama priklausomybė „%s“ neįdiegta. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Tikrinama paketų tvarkyklė" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Nepavyko paruošti atnaujinimo" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -689,11 +690,11 @@ "Sistemos paruošimas atnaujinimui nepavyko, todėl paleidžiamas pranešimo apie " "klaidą procesas." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Nepavyko gauti išankstinių atnaujinimo sąlygų" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -705,68 +706,68 @@ "\n" "Papildomai paleidžiamas pranešimo apie klaidą procesas." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Atnaujinama saugyklų informacija" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Nepavyko pridėti kompaktinio disko" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Atsiprašome, kompaktinio disko pridėjimas nesėkmingas." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Netinkama paketo informacija" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Atsiunčiama" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Atnaujinama" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Atnaujinimas užbaigtas" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "Atnaujinimas baigtas, bet atnaujinimo proceso metu įvyko klaidų." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Ieškoma pasenusios programinės įrangos" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Sistemos atnaujinimas baigtas." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Dalinis atnaujinimas baigtas." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "Naudojamas evms" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -776,13 +777,13 @@ "programinė įranga nebepalaikoma, prašome ją išjungti ir paleisti atnaujinimą " "iš naujo." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "Jūsų grafikos aparatinė įranga gali būti nevisiškai palaikoma Ubuntu 12.04 " "LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -794,9 +795,9 @@ "informacijos rasite https://wiki.ubuntu.com/X/Bugs/" "UpdateManagerWarningForI8xx Ar norite tęsti atnaujinimą?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -804,8 +805,8 @@ "Atlikus atnaujinimą gali sumažėti darbo aplinkos efektų, žaidimų ir kitų " "grafiškai reiklių programų našumas." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -819,7 +820,7 @@ "\n" "Ar norite tęsti?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -832,11 +833,11 @@ "\n" "Ar norite tęsti?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Ne i686 CP" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -848,11 +849,11 @@ "architektūros. Su šia aparatine įranga neįmanoma atnaujinti jūsų sistemos į " "naują Ubuntu laidą." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Ne ARMv6 procesorius" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -864,11 +865,11 @@ "negu ARMv6 architektūra. Su šia aparatine įranga negalima atnaujinti jūsų " "sistemos į naują Ubuntu laidą." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Neprieinamas init" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -883,15 +884,15 @@ "\n" "Ar tikrai norite tęsti?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Sandbox atnaujinimas naudojant aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Naudoti nurodytą kelią CD įrenginio su naujintinais paketais paieškai" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -899,57 +900,57 @@ "Naudokite sąsają. Šiuo metu prieinamos: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*PASENUS* ši pasirinktis bus ignoruojama" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "Atlikti tik dalinį atnaujinimą (neperrašant sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Išjungti „GNU screen“ palaikymą" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Nustatyti duomenų katalogą" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Įdėkite „%s“ į įrenginį „%s“" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Siuntimas baigtas" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Atsiunčiamas %li failas iš %li %sB/s greičiu" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Liko apie %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Atsiunčiamas %li failas iš %li" @@ -959,27 +960,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Pritaikomi pakeitimai" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "priklausomybių problemos – paliekama nekonfigūruota" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Nepavyko įdiegti „%s“" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -991,7 +992,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1002,7 +1003,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1010,20 +1011,20 @@ "Jei pakeisite šį failą naujesne versija, jūs prarasite visus faile padarytus " "pakeitimus." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Komanda „diff“ nerasta" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Įvyko lemtinga klaida" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1036,13 +1037,13 @@ "Jūsų originalus „sources.list“ buvo išsaugotas kaip /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Paspausta Ctrl-C" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1051,138 +1052,138 @@ "tai padaryti?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Norėdami išvengti duomenų praradimo turite užverti visas atvertas programas " "ir dokumentus." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Canonical daugiau nepalaikoma (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Pasendinti (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Pašalinti (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Daugiau nebereikalingi (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Įdiegti (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Atnaujinti (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Laikmenos keitimas" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Rodyti skirtumus >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Slėpti skirtumus" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Klaida" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Atsisakyti" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Užverti" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Rodyti terminalą >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Slėpti terminalą" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Informacija" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Išsami informacija" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Daugiau nepalaikoma %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Pašalinti %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Pašalinti (buvo automatiškai įdiegta) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Įdiegti %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Atnaujinti %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Reikia paleisti iš naujo" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" "Norėdami užbaigti atnaujinimą paleiskite operacinę sistemą iš naujo" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Paleisti iš naujo dabar" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1194,11 +1195,11 @@ "Sistema gali likti sugadinta, jei nutrauksite atnaujinimą. Labai " "rekomenduojama tęsti atnaujinimą." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Atšaukti atnaujinimą?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" @@ -1206,7 +1207,7 @@ msgstr[1] "%li dienos" msgstr[2] "%li dienų" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" @@ -1214,7 +1215,7 @@ msgstr[1] "%li valandos" msgstr[2] "%li valandų" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" @@ -1222,7 +1223,7 @@ msgstr[1] "%li minutės" msgstr[2] "%li minučių" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1239,7 +1240,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1253,14 +1254,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1270,34 +1271,32 @@ "modemu." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Naudojant jūsų ryšį šis siuntimas užtruks apie %s. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Ruošiamasi atnaujinimui" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Gaunami nauji programinės įrangos kanalai" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Gaunami nauji paketai" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Diegiami atnaujinimai" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Išvaloma" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1317,7 +1316,7 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." @@ -1325,7 +1324,7 @@ msgstr[1] "Bus pašalinti %d paketai." msgstr[2] "Bus pašalinta %d paketų." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." @@ -1333,7 +1332,7 @@ msgstr[1] "Bus įdiegti %d nauji paketai." msgstr[2] "Bus įdiegta %d naujų paketų." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." @@ -1341,7 +1340,7 @@ msgstr[1] "Bus atnaujinti %d paketai." msgstr[2] "Bus atnaujinta %d paketų." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1352,7 +1351,7 @@ "\n" "Iš viso reikia atsiųsti %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1360,7 +1359,7 @@ "Atnaujinimo įdiegimas gali užtrukti kelias valandas. Kai atsiuntimas bus " "baigtas, proceso nebebus galima nutraukti." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1368,53 +1367,53 @@ "Gauti ir įdiegti atnaujinimą gali užtrukti kelias valandas. Kai atsiuntimas " "baigtas, procesas negali būti nutrauktas." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Paketų pašalinimas gali užtrukti keletą valandų. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Programinė įranga šiame kompiuteryje yra atnaujinta." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "Šiuo metų sistemos atnaujinimų nėra. Atnaujinimas atšaukiamas." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Reikia paleisti kompiuterį iš naujo" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Atnaujinimas baigtas ir reikia paleisti kompiuterį iš naujo. Ar norite tai " "atlikti dabar?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "nustatyti „%(file)s“ tapatumą pagal „%(signature)s“ " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "išskleidžiama „%s“" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Nepavyko paleisti atnaujinimo įrankio" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1422,33 +1421,33 @@ "Tai greičiausiai klaida atnaujinimo įrankyje. Prašau pranešti apie šią " "klaidą naudojantis „ubuntu-bug update-manager“ komanda." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Atnaujinimo įrankio parašas" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Atnaujinimo įrankis" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Atsiųsti nepavyko" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Nepavyko gauti atnaujinimo. Tai gali būti tinklo problema. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Nepavyko nustatyti tapatybės" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1456,41 +1455,41 @@ "Nepavyko nustatyti atnaujinimo tapatybės. Gali būti tinklo arba serverio " "problema. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Nepavyko išpakuoti" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" "Nepavyko išpakuoti atnaujinimo. Gali būti tinklo arba serverio problema. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Nepavyko patikrinti" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" "Nepavyko patikrinti atnaujinimo. Tai gali būti ryšio arba serverio problema. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Negalima paleisti atnaujinimo" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1499,13 +1498,13 @@ "parametru. Prašau prijunkite iš naujo be „noexec“ parametro ir atnaujinkite " "dar kartą." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Klaidos pranešimas yra „%s“." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1517,73 +1516,73 @@ "Jūsų originalus „sources.list“ buvo išsaugotas kaip /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Nutraukiama" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Pažemintas:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Norėdami tęsti spauskite [ĮVEDIMAS]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Tęsti [tN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Išsami informacija [i]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "t" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "i" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Daugiau nepalaikoma: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Pašalinti: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Įdiegti: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Atnaujinti: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Tęsti [Tn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1650,9 +1649,8 @@ msgstr "Distributyvo atnaujinimas" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Ubuntu atnaujinimas iki 11.10 versijos" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Atnaujinama Ubuntu į versiją 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1670,84 +1668,85 @@ msgid "Terminal" msgstr "Terminalas" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Palaukite, tai gali užtrukti." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Atnaujinimas baigtas" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Nepavyko rasti laidos informacijos" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Serveris gali būti labai apkrautas. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Nepavyko atsiųsti laidos informacijos" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Patikrinkite savo interneto ryšį." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Atnaujinti" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Laidos informacija" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Atsisiunčiami papildomi paketai..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "%s failas iš %s %sB/s greičiu" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "%s failas iš %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Atverti saitą naršyklėje" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Kopijuoti saitą į atmintinę" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Atsiunčiamas %(current)li failas iš %(total)li, %(speed)s/s greičiu" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Atsiunčiamas %(current)li failas iš %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Jūsų Ubuntu laida daugiau nepalaikoma." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1755,52 +1754,59 @@ "Jūs nebegausite jokių saugumo ar kritinių atnaujinimų. Prašome atnaujinti " "Ubuntu į naujesnę versiją." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Atnaujinimo informacija" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Įdiegti" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Pavadinimas" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Versija %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Neaptiktas joks tinklo ryšys, jūs negalėsite atsiųsti pakeitimų žurnalo." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Atsiunčiamas pakeitimų sąrašas..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Nepasirinkti nieko" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Pasirinkti _visus" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s atnaujinimas pažymėtas." +msgstr[1] "%(count)s atnaujinimai pažymėti." +msgstr[2] "%(count)s atnaujinimų pažymėti." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s bus atsiųsta." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "Atnaujinimas jau buvo atsiųstas, bet neįdiegtas." msgstr[1] "Atnaujinimai jau buvo atsiųsti, bet neįdiegti." msgstr[2] "Atnaujinimai jau buvo atsiųsti, bet neįdiegti." @@ -1809,11 +1815,18 @@ msgid "There are no updates to install." msgstr "Nėra atnaujinimų įdiegimui." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Nežinomas atsiuntimo dydis." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1821,7 +1834,7 @@ "Nežinoma kada sistema buvo atnaujinta paskutinį kartą. Prašau paspauskite " "„Tikrinti“ mygtuką informacijai atnaujinti." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1831,7 +1844,7 @@ "Spauskite žemiau esantį mygtuką „Tikrinti“ naujiems programinės įrangos " "atnaujinimams." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1842,7 +1855,7 @@ msgstr[2] "" "Paketų informacija paskutinį kartą atnaujinta prieš %(days_ago)s dienų." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1855,36 +1868,48 @@ "Paketų informacija paskutinį kartą atnaujinta prieš %(hours_ago)s valandų." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" "Paskutinį kartą paketo informacija buvo atnaujinta maždaug prieš %s minutes." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Paketo informacija buvo atnaujinta." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Programinės įrangos atnaujinimai ištaiso klaidas, pašalina saugumo spragas " +"ir suteikia naujų funkcijų." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" "Jūsų kompiuteriui gali būti prieinami programinės įrangos atnaujinimai." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Sveikiname paleidus Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Šie programinės įrangos atnaujinimai buvo išlesti nuo šios Ubuntu versijos " +"išleidimo." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Šiam kompiuteriui yra programinės įrangos atnaujinimų." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1895,7 +1920,7 @@ "papildomos vietos diske „%s“. Išvalykite šiukšlinę ir naudodami „sudo apt-" "get clean“ pašalinkite laikinus nuo ankstesnių diegimų likusius paketus." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1903,23 +1928,23 @@ "Reikia paleisti kompiuterį iš naujo atnaujinimų diegimui užbaigti. Prašome " "išsaugoti savo darbus prieš tęsiant." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Skaitoma paketų informacija" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Jungiamasi..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "Jūs galite negalėti ieškoti ar parsisiųsti naujų atnaujinimų." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Nepavyko inicijuoti paketų informacijos" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1932,7 +1957,7 @@ "Praneškite apie šią „update-manager“ paketo klaidą ir į pranešimą apie " "klaidą įtraukite šį pranešimą:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1944,31 +1969,31 @@ "Praneškite apie šią „update-manager“ paketo klaidą ir į pranešimą apie " "klaidą įtraukite šį pranešimą:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (naujas diegimas)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Dydis: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Iš versijos %(old_version)s į %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Versija %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Laidos atnaujinimas dabar negalimas" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1976,21 +2001,21 @@ msgstr "" "Laidos atnaujinimas dabar negalimas, mėginkite vėliau. Serveris pranešė: „%s“" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Atsiunčiamas laidos atnaujinimo įrankis" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Prieinama nauja Ubuntu laida „%s“" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Programinės įrangos indeksas sugadintas" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -2000,6 +2025,17 @@ "ištaisykite šią problemą pasinaudodami „Synaptic“ arba terminale paleisdami " "komandą „sudo apt-get install -f“." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Yra nauja laida „%s“." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Atsisakyti" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Tikrinti ar yra atnaujinimų" @@ -2009,22 +2045,18 @@ msgstr "Įdiegti visus prieinamus atnaujinimus" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Atsisakyti" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Pakeitimų žurnalas" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Atnaujinimai" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Kuriamas atnaujinimų sąrašas" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2048,22 +2080,22 @@ " * Neoficialūs, Ubuntu netiekiami, programinės įrangos paketai\n" " * Normalūs dar neišleistos Ubuntu versijos pakeitimai" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Atsiunčiamas pakeitimų žurnalas" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Kiti atnaujinimai (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" "Šis atnaujinimas buvo gautas iš tokios saugyklos, kuri nepalaiko pakeitimų " "žurnalų." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2071,7 +2103,7 @@ "Nepavyko atsiųsti pakeitimų sąrašo.\n" "Patikrinkite interneto ryšį." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2084,7 +2116,7 @@ "Prieinamos versijos: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2098,7 +2130,7 @@ "+source/%s/%s/+changelog\n" "arba mėginkite vėliau." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2112,52 +2144,43 @@ "+source/%s/%s/+changelog\n" "arba mėginkite vėliau." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Nepavyko atpažinti distributyvo" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Tikrinant, kokią sistemą naudojate, įvyko klaida „%s“." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Svarbūs saugumo atnaujinimai" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Rekomenduojami atnaujinimai" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Svarstomi atnaujinimai" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Iš naujos versijos perkeltos programos" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Distributyvo atnaujinimai" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Kiti atnaujinimai" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Paleidžiama atnaujinimų tvarkyklė" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Programinės įrangos atnaujinimai ištaiso klaidas, pašalina saugumo spragas " -"ir suteikia naujų funkcijų." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Dalinis atnaujinimas" @@ -2228,37 +2251,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Programinės įrangos atnaujinimai" +msgid "Update Manager" +msgstr "Atnaujinimų tvarkyklė" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Programinės įrangos atnaujinimai" +msgid "Starting Update Manager" +msgstr "Paleidžiama atnaujinimų tvarkytuvė" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "At_naujinti" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "atnaujinimai" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Įdiegti" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Pakeitimai" +msgid "updates" +msgstr "atnaujinimai" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Aprašas" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Atnaujinimo aprašymas" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2266,24 +2279,34 @@ "Jūs prisijungęs per tarptinklinį ryšį ir galite būti apmokestinti už " "atnaujinimo metu parsiųstus duomenis." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Jūs prisijungęs per belaidį modemą." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Yra saugiau prijungti kompiuterį prie kintamosios srovės prieš atnaujinant." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "Į_diegti atnaujinimus" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Pakeitimai" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Nustatymai..." +msgid "Description" +msgstr "Aprašas" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Įdiegti" +msgid "Description of update" +msgstr "Atnaujinimo aprašymas" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Nustatymai..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2306,9 +2329,8 @@ msgstr "Jūs atsisakėte atnaujinti Ubuntu į naują versiją" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Jūs galėsite atnaujinti vėliau paleidę Atnaujinimų tvarkyklę ir paspaudę " @@ -2322,60 +2344,60 @@ msgid "Show and install available updates" msgstr "Rodyti ir įdiegti galimus atnaujinimus" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Rodyti versiją ir išeiti" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Katalogas, kuriame saugomi duomenų failai" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Patikrinti, ar yra nauja Ubuntu laida" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "Patikrinti, ar galima atnaujinti iki naujausios dar neišleistos versijos." -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Atnaujinti naudojant naujausią siūlomą laidų atnaujinimų tvarkyklės versiją" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Paleidus nesuaktyvinti plano" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Pabandykite paleisti dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Neieškoti atnaujinimų paleidžiant" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Išbandyti atnaujinimą su sandbox aufs perdanga" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Vykdomas dalinis atnaujinimas" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Rodyti paketo aprašą vietoje pakeitimų žurnalo" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Bandykite atnaujinti į naujausią laidą naudodami atnaujinimo programą iš " "$distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2385,11 +2407,11 @@ "Šiuo metu yra palaikomos „desktop“ – reguliarūs atnaujinimai staliniams " "kompiuteriams – ir „server“ – atnaujinimai serverių sistemoms." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Paleisti nurodytą sąsają" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2397,11 +2419,11 @@ "Patikrinti ar yra nauja distributyvo laida ir pranešti rezultatą pabaigos " "kodu" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Ieškoma naujos Ubuntu laidos" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2409,58 +2431,58 @@ "Atnaujinimų informacijai gauti aplankykite:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Naujų laidų nerasta" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Yra nauja laida „%s“." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Norėdami atnaujinti į ją, paleiskite „do-release-upgrade“." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Prieinamas Ubuntu %(version)s atnaujinimas" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Jūs atsisakėte atnaujinti į Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Pridėti derinimo išvedimą" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Rodyti nepalaikomus paketus šiame kompiuteryje." -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Rodyti palaikomus paketus šiame kompiuteryje." -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Rodyti visus paketus su jų būsena" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Rodyti visus paketus sąraše" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "„%s“ palaikymo būsenos santrauka:" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "Jūs turite %(num)s paketų (%(percent).1f %%) palaikomų iki %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" @@ -2468,11 +2490,11 @@ "Jūs turite %(num)s paketų (%(percent).1f %%), kurie negali/nebegali būti " "atsiųsti" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "Jūs turite %(num)s paketų (%(percent).1 f%%), kurie yra nepalaikomi" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2480,54 +2502,71 @@ "Paleiskite su --show-unsupported, --show-supported arba --show-all " "detalesnei informacijai pamatyti" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Nebegalima atsiųsti:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Nepalaikomi: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Palaikoma iki %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Nepalaikoma" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Neįgyvendintas metodas: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Failas diske" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb paketas" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Įdiegti trūkstamą paketą." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Paketas %s turėtų būti įdiegtas." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb paketas" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s turi būti pažymėtas kaip įdiegtas rankiniu būdu." +msgid "%i obsolete entries in the status file" +msgstr "%i pasenę įrašai būsenos faile" + +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "Pasenę įrašai dpkg būsenoje" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "Pasenę dpkg būsenos įrašai" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2536,69 +2575,81 @@ "įdiegtas. Daugiau informacijos galite rasti bugs.launchpad.net, klaida " "#279621." -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "%i pasenę įrašai būsenos faile" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "Pasenę įrašai dpkg būsenoje" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "Pasenę dpkg būsenos įrašai" +msgid "%s needs to be marked as manually installed." +msgstr "%s turi būti pažymėtas kaip įdiegtas rankiniu būdu." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Pašalinti lilo, kadangi taip pat yra įdiegtas grub. (Daugiau informacijos " "galite rasti bugs.launchpad.net, klaida #314004.)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Po paketų informacijos atnaujinimo būtinas paketas „%s“ daugiau " -#~ "neberandamas, todėl paleidžiamas pranešimo apie klaidą procesas." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Atnaujinama Ubuntu į versiją 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s atnaujinimas pažymėtas." -#~ msgstr[1] "%(count)s atnaujinimai pažymėti." -#~ msgstr[2] "%(count)s atnaujinimų pažymėti." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Sveikiname paleidus Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Šie programinės įrangos atnaujinimai buvo išlesti nuo šios Ubuntu " -#~ "versijos išleidimo." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Šiam kompiuteriui yra programinės įrangos atnaujinimų." - -#~ msgid "Update Manager" -#~ msgstr "Atnaujinimų tvarkyklė" - -#~ msgid "Starting Update Manager" -#~ msgstr "Paleidžiama atnaujinimų tvarkytuvė" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Jūs prisijungęs per belaidį modemą." - -#~ msgid "_Install Updates" -#~ msgstr "Į_diegti atnaujinimus" +#~ "Po paketų informacijos atnaujinimo būtinas paketas „%s“ daugiau " +#~ "neberandamas, todėl paleidžiamas pranešimo apie klaidą procesas." #~ msgid "Your system is up-to-date" #~ msgstr "Jūsų sistema atnaujinta" @@ -2744,6 +2795,9 @@ #~ "„ubuntu-bug update-manager“ taipogi pridedant failus iš /var/log/dist-" #~ "upgrade/." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Ubuntu atnaujinimas iki 11.10 versijos" + #~ msgid "" #~ "These software updates have been issued since this version of Ubuntu was " #~ "released. If you don't want to install them now, choose \"Update Manager" diff -Nru update-manager-17.10.11/po/lv.po update-manager-0.156.14.15/po/lv.po --- update-manager-17.10.11/po/lv.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/lv.po 2017-12-23 05:00:38.000000000 +0000 @@ -6,11 +6,12 @@ # FIRST AUTHOR , 2006. # Raivis Dejus , 2006. # Rūdolfs Mazurs , 2011. +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: lp-upd-manager-lv\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-04-16 13:09+0000\n" "Last-Translator: Rūdolfs Mazurs \n" "Language-Team: Latvian \n" @@ -23,7 +24,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -32,13 +33,13 @@ msgstr[2] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "% serveris" @@ -46,20 +47,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Galvenais serveris" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Pašizvēlētie serveri" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Neizdevās aprēķināt sources.list ierakstu" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -67,11 +68,11 @@ "Neizdevās atrast pakotņu datnes. Varbūt šis nav Ubuntu disks, vai izvēlēta " "nepareiza sistēmas arhitektūra?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Neizdevās pievienot CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -86,14 +87,14 @@ "Kļūdas paziņojums bija:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Noņemt pakotni, kas ir sliktā stāvoklī" msgstr[1] "Noņemt pakotnes, kas ir sliktā stāvoklī" msgstr[2] "Noņemt pakotnes, kas ir sliktā stāvoklī" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -117,15 +118,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Iespējams, ka serveris ir pārslogots" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Bojātas pakotnes" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -134,7 +135,7 @@ "turpināt, lūdzu, salabojiet tās, izmantojot synaptic vai apt-get rīkus." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -155,11 +156,11 @@ " * Neoficiālas programmu pakotnes, kuru piegādātājs nav Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Šī, visdrīzāk, ir īslaicīga problēma. Lūdzu, mēģiniet vēlāk vēlreiz." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -167,16 +168,16 @@ "Ja nekas no tā nav attiecināms, ziņojiet par šo kļūdu, terminālī izpildot " "komandu 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Nevar aprēķināt uzlabojumu" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Kļūda, autentificējot dažas pakotnes" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -186,29 +187,29 @@ "problēma. Pamēģiniet atkārtot šo darbību vēlāk. Skatiet neautentificēto " "pakotņu sarakstu zemāk." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" "Pakotne '%s' ir atzīmēta kā noņemama, bet tā ir noņemšanas melnajā sarakstā." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Būtiska pakotne '%s\" ir atzīmēta noņemšanai." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Mēģina instalēt versiju '%s', kas atrodas melnajā sarakstā" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Neizdodas instalēt '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -217,11 +218,11 @@ "kļūdu, terminālī izpildot 'ubuntu-bug update-manager'." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Neizdodas uzminēt meta-pakotni" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -235,15 +236,15 @@ "Pirms turpināt, lūdzu, instalējiet vienu no augstākminētajām pakotnēm, " "izmantojot synaptic vai apt-get rīkus." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Lasa kešu" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Neizdevās iegūt ekskluzīvu pieeju" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -251,11 +252,11 @@ "Tas parasti nozīmē, ka jau darbojas cita pakotņu pārvaldības lietotne " "(piemēram apt-get vai aptitude). Lūdzu, vispirms tās aizveriet." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Uzlabošana, izmantojot attālināto savienojumu, nav atbalstīta" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -269,11 +270,11 @@ "\n" "Uzlabošana tagad tiks pārtraukta. Lūdzu, mēģiniet bez ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Turpināt, izmantojot SSH pieslēgumu?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -289,11 +290,11 @@ "Ja turpināsiet, tiks palaists papildus ssh dēmons, kas izmantos portu '%s'.\n" "Vai vēlaties turpināt?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Palaiž papildus sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -304,7 +305,7 @@ "'%s' porta. Ja kaut kas noiet greizi ar pašreizējo ssh, jūs joprojām " "varēsiet savienoties ar papildus ssh.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -317,29 +318,29 @@ "portu ar, piemēram:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Neizdodas uzlabot" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "'%s' uzlabošana uz '%s' netiek atbalstīta, izmantojot šo rīku." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Smilškastes iestatīšana neizdevās" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Neizdevās izveidot smilškastes vidi." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Smilškastes režīms" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -353,18 +354,18 @@ "*Nekādas* izmaiņas, kas tiek ierakstītas sistēmas mapē kopš šī brīža līdz " "pārstartēšanai, nav pastāvīgas." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Jūsu python instalācija ir bojāta. Lūdzu, salabojiet `/usr/bin/python` " "simbolisko saiti." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Pakotne 'debsig-verify' ir uzinstalēta" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -374,12 +375,12 @@ "Lūdzu, noņemiet to izmantojot Synaptic vai 'apt-get remove debsig-verify' un " "tad palaidiet uzlabošanu vēlreiz." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Nevar rakstīt '%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -389,11 +390,11 @@ "Nevar rakstīt sistēmas mapē '%s' un turpināt atjauninājuma uzlikšanu. \n" "Pārbaudiet, vai sistēmas mapē rakstāma." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Iekļaut pēdējās izmaiņas no Interneta?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -413,16 +414,16 @@ "pēdējos atjauninājumus pēc uzlabošanas pabeigšanas.\n" "Ja jūs šeit atbildēsiet 'nē', tad tīkls netiks izmantots vispār." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "deaktizivēts uzlabojot uz %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Netika atrasts derīgs spoguļserveris" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -442,11 +443,11 @@ "Ja izvēlēsieties 'Nē', uzlabošana tiks atcelta." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Izveidot noklusētos avotus?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -459,11 +460,11 @@ "Vai nepieciešams pievienot noklusētos '%s' ierakstus? Ja jūs izvēlēsieties " "'Nē', uzlabošana tiks atcelta." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Informācija par krātuvēm ir nederīga" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -471,11 +472,11 @@ "Atjauninot krātuves informāciju, izveidojās nederīgs fails, tāpēc tiek " "uzsākts kļūdu ziņošanas process." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Trešās puses avoti atslēgti" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -485,14 +486,14 @@ "sistēmas uzlabošanas tos varat atkal ieslēgt ar 'software-properties' rīku " "vai pakotņu pārvaldnieku." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Pakotne neatbilstīgā stāvoklī" msgstr[1] "Pakotnes neatbilstīgā stāvoklī" msgstr[2] "Pakotnes neatbilstīgā stāvoklī" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -515,11 +516,11 @@ "arhīvu nevar atrast. Lūdzu, pašrocīgi pārinstalējiet vai noņemiet tās no " "sistēmas." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Kļūda, veicot atjaunināšanu" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -527,13 +528,13 @@ "Atjaunināšanas laikā radusies problēma. Parasti tā ir kāda tīkla problēma. " "Lūdzu, pārbaudiet jūsu tīkla savienojumu un mēģiniet vēlreiz." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Diskā nav pietiekoši daudz brīvas vietas" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -548,21 +549,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Aprēķina izmaiņas" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Vai vēlaties sākt uzlabošanu?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Uzlabošana atsaukta" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -570,12 +571,12 @@ "Uzlabošana tagad tiks pārtraukta. Tiks atjaunots sākotnējais sistēmas " "stāvoklis. Jūs varēsiet turpināt vēlāk." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Neizdevās lejupielādēt uzlabojumus" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -586,27 +587,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Kļūda, apstiprināšanas laikā" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Atjauno sākotnējo sistēmas stāvokli" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Neizdevās instalēt uzlabojumus" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -614,7 +615,7 @@ "Uzlabošana ir pārtraukta. Sistēma varētu būt nelietojamā stāvoklī. Tagad " "tiks veikta atgūšanās (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -631,7 +632,7 @@ "atrodas /var/log/dist-upgrade/ mapē.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -639,20 +640,20 @@ "Uzlabošana tika pārtraukta. Lūdzu, pārbaudiet savu Inertneta savienojumu vai " "instalēšanas datu nesēju un mēģiniet vēlreiz. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Vai aizvākt novecojušās pakotnes?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Paturēt" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Noņemt" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -662,27 +663,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Nav instalētās nepieciešamās atkarības." -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Nav instalēta nepieciešamā atkarība '%s'. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Pārbauda pakotņu pārvaldnieku" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Neizdevās sagatavot uzlabošanu" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -690,11 +691,11 @@ "Sistēmas sagatavošana atjaunināšanai neizdevās, tāpēc tiek uzsākts kļūdu " "ziņošanas process." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Neizdevās iegūt uzlabošanas priekšnosacījumus" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -706,68 +707,68 @@ "\n" "Papildus tiek uzsākts kļūdu ziņošanas process." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Atjaunina krātuvju informāciju" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Neizdevās pievienot cdrom" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Diemžēl neizdevās pievienot cdrom." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Nederīga informācija par pakotnēm" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Iegūst" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Uzlabo" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Uzlabošana pabeigta" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "Uzlabošana ir pabeigta, bet tās laikā bija kļūdas." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Meklē novecojušu programmatūru" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Sistēmas uzlabošana ir pabeigta." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Daļējā uzlabošana pabeigta." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "Tiek izmantots evms" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -777,12 +778,12 @@ "programmatūra vairs nav atbalstīta, tāpēc, lūdzu, izslēdziet to un palaidiet " "uzlabošanu vēlreiz." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "Jūsu grafiskā aparatūra pilnībā varētu netikt atbalstīta Ubuntu 12.04 LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -794,9 +795,9 @@ "ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx . Vai vēlaties turpināt " "atjaunināšanu?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -804,8 +805,8 @@ "Atjaunināšana var samazināt darbvirsmas efektus, datora veiktspēju spēlēs " "vai citās grafiski prasīgās programmās." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -818,7 +819,7 @@ "\n" "Vai vēlaties turpināt?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -831,11 +832,11 @@ "\n" "Vai jūs vēlaties turpināt?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Nav i686 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -847,11 +848,11 @@ "minimālā arhitektūra. Ar esošo aparatūru nav iespējams uzlabot Ubuntu uz " "jaunu laidienu." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Nav ARMv6 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -863,11 +864,11 @@ "minimālo arhitektūru. Diemžēl nav iespējams uzlabot jūsu sistēmu uz jaunāko " "Ubuntu versiju ar šo aparatūru." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Nav pieejams init" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -882,15 +883,15 @@ "\n" "Vai jūs vēlaties turpināt?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Smilškastes uzlabošana, izmantojot aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Izmantot doto ceļu, lai meklētu CD-ROM disku ar uzlabojamām pakotnēm" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -898,57 +899,57 @@ "Lietot saskarni. Šobrīd pieejamās: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*NOVECOJIS* šī opcija tiks ignorēta" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "Veikt tikai daļēju atjaunināšanu (nepārrakstīt sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Deaktivēt GNU ekrāna atbalstu" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Iestatīt datu mapi" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Lūdzu, ievietojiet '%s' diskdzinī '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Pakotnes ir iegūtas" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Iegūst failu %li no %li ar %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Atlikušas aptuveni %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Iegūst failu %li no %li" @@ -958,27 +959,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Pielieto izmaiņas" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "atkarību problēmas - atstāj nekonfigurētu" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Neizdevās instalēt '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -990,7 +991,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1001,7 +1002,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1009,20 +1010,20 @@ "Jūs zaudēsiet visas izmaiņas, kuras esat veicis šajā konfigurācijas failā, " "ja aizvietosiet to ar jaunāku versiju." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Komanda 'diff' netika atrasta" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Notika fatāla kļūda" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1035,13 +1036,13 @@ "Sākotnējais sources.list fails tika saglabāts /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Nospiests Ctrl-C" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1050,134 +1051,134 @@ "vēlaties to darīt?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "Aizveriet lietotnes un dokumentus, lai izvairītos no datu zudumiem." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Canonical vairs neatbalsta (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Pazemina (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Izņemt (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Vairs nav vajadzīgi (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Instalēt (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Uzlabot (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Datu nesēja maiņa" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Rādīt atšķirības >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Nerādīt atšķirības" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Kļūda" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "At&celt" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Aizvērt" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Rādīt termināli >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Nerādīt termināli" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Informācija" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Sīkāka informācija" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Vairs netiek atbalstīts %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Noņemt %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Noņemt (tika instalēts automātiski) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Instalēt %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Uzlabot %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Nepieciešama pārstartēšana" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Lai pabeigtu uzlabošanu, pārstartējiet datoru" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "Pā_rstartēt tagad" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1189,11 +1190,11 @@ "Sistēma varētu būt nelietojama, ja jūs tagad atsauksiet uzlabošanu. Jums " "tiek stingri ieteikts uzlabošanu pabeigt." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Atcelt uzlabošanu?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" @@ -1201,7 +1202,7 @@ msgstr[1] "%li dienas" msgstr[2] "%li dienas" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" @@ -1209,7 +1210,7 @@ msgstr[1] "%li stundas" msgstr[2] "%li stundas" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" @@ -1217,7 +1218,7 @@ msgstr[1] "%li minūtes" msgstr[2] "%li minūtes" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1234,7 +1235,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1248,14 +1249,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1265,34 +1266,32 @@ "56kbit modemu." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Lejupielāde aizņems apmēram %s ar jūsu savienojumu. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Gatavojas uzlabošanai" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Iegūst jaunus programmatūras kanālus" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Iegūst jaunās pakotnes" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Instalē uzlabojumus" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Satīra" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1312,7 +1311,7 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." @@ -1320,7 +1319,7 @@ msgstr[1] "%d pakotnes tiks noņemtas." msgstr[2] "%d pakotnes tiks noņemtas." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." @@ -1328,7 +1327,7 @@ msgstr[1] "%d pakotnes tiks instalētas." msgstr[2] "%d pakotnes tiks instalētas." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." @@ -1336,7 +1335,7 @@ msgstr[1] "%d pakotnes tiks uzlabotas." msgstr[2] "%d pakotnes tiks uzlabotas." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1347,7 +1346,7 @@ "\n" "Jums kopā jālejupielādē %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1355,7 +1354,7 @@ "Atjauninājumu instalēšana var aizņemt vairākas stundas. Kolīdz lejupielāde " "ir pabeigta, atjauninājumu instalēšanu vairs nevar atcelt." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1363,54 +1362,54 @@ "Atjauninājumu saņemšana un instalēšana var aizņemt vairākas stundas. Kolīdz " "lejupielāde ir pabeigta, atjauninājumu instalēšanu vairs nevar atcelt." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Pakotņu izņemšana var aizņemt vairākas stundas. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Programmatūra šajā datorā ir atjaunota." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" "Jūsu sistēmai uzlabojumi nav pieejami. Uzlabošana tagad tiks pārtraukta." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Nepieciešama pārstartēšana" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Uzlabošana ir pabeigta un ir nepieciešama sistēmas pārstartēšana. Vai vēlies " "to veikt tagad?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "autentificēt '%(file)s' ar '%(signature)s' " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "Atspiež '%s'" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Neizdevās palaist uzlabošanas rīku" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1418,33 +1417,33 @@ "Tā visdrīzāk ir kļūda uzlabošanas rīkā. Lūdzu, ziņojiet par to kā par kļūdu, " "ar termināļa komandu 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Uzlabošanas rīka paraksts" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Uzlabošanas rīks" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Neizdevās iegūt" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Neizdevās iegūt uzlabojumus. Tā varētu būt tīkla problēma. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Autentifikācija neveiksmīga" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1452,13 +1451,13 @@ "Neizdevās autentificēt uzlabojumu. Tā varētu būt gan tīkla, gan servera " "problēma. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Neizdevās atarhivēt" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1466,13 +1465,13 @@ "Neizdevās atarhivēt uzlabojumu. Tā varētu būt gan tīkla, gan servera " "problēma. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Pārbaude neizdevās" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1480,15 +1479,15 @@ "Neizdevās uzlabojuma pārbaude. Tā varētu būt gan tīkla, gan servera " "problēma. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Neizdodas palaist uzlabošanu" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1496,13 +1495,13 @@ "To parasti izrausa sistēma, kurā /tmp tiek montēta ar noexec opciju. Lūdzu, " "pārmontējiet bez noexec un uzlabojiet sistēmu atkal." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Kļūdas paziņojums ir '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1514,73 +1513,73 @@ "ir pārtraukta.\n" "Sākotnējais sources.list tika saglabāts /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Pārtrauc" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Pazemināta:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Lai turpinātu, piespiediet [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Turpināt [iN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Sīkāka informācija [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "j" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Vairs netiek atbalstīts: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Noņem: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Instalē: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Uzlabo: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Turpināt [Jn} " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1647,9 +1646,8 @@ msgstr "Distributīva uzlabošana" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Uzlabo Ubuntu uz versiju 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Atjaunina Ubuntu uz 12.04 versiju" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1667,84 +1665,85 @@ msgid "Terminal" msgstr "Terminālis" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Lūdzu, uzgaidiet. Tas var prasīt kādu laiku." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Atjaunināšana ir pabeigta" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Neizdevās atrast piezīmes par laidienu" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Serveris varētu būt pārslogots. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Neizdevās lejupielādēt laidiena piezīmes" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Lūdzu, pārbaudiet savu Interneta savienojumu." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Uzlabot" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Laidiena piezīmes" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Lejupielādē papildus pakotņu failus..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Fails %s no %s ar ātrumu %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Fails %s no %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Atvērt saiti pārlūkā" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Kopēt saiti uz starpliktuvi" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Lejupielādē failu %(current)li no %(total)li ar ātrumu %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Lejupielādē failu %(current)li no %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Jūsu Ubuntu versija vairs netiek atbalstīta." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1752,51 +1751,58 @@ "Jūs vairāk nesaņemsit drošības labojumus vai kritiskus atjauninājumus. " "Lūdzu, uzlabojiet Ubuntu versiju." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Informācija par uzlabošanu" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Instalēt" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Nosaukums" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Versija %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "Netika atrasts tīkla savienojums. Nevar lejupielādēt izmaiņu žurnālu." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Lejuplādē izmaiņu sarakstu..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Neizvēlēties nevienu" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Izvēlēties vis_as" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "Ir izvēlēts %(count)s atjauninājums." +msgstr[1] "Ir izvēlēti %(count)s atjauninājumi." +msgstr[2] "Ir izvēlēti %(count)s atjauninājumu." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s tiks lejupielādēts." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "Šis atjauninājums ir lejupielādēts, bet nav vēl instalēts." msgstr[1] "Šie atjauninājumi ir lejupielādēti, bet nav vēl instalēti." msgstr[2] "Šie atjauninājumi ir lejupielādēti, bet nav vēl instalēti." @@ -1805,11 +1811,18 @@ msgid "There are no updates to install." msgstr "Nav atjauninājumu, ko instalēt." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Nezināms lejupielādes izmērs." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1817,7 +1830,7 @@ "Nav zināms, kad pēdējo reizi tika atjaunināta informācija par pakotnēm. " "Spiediet pogu 'Pārbaudīt', lai atjauninātu informāciju." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1827,7 +1840,7 @@ "dienām.\n" "Spiediet pogu 'Pārbaudīt', lai atjauninātu informāciju par programmatūru." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1838,7 +1851,7 @@ msgstr[2] "" "Pakotņu informācija pēdējo reizi tika atjaunināta pirms %(days_ago)s dienām." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1854,35 +1867,47 @@ "stundām." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" "Informācija par pakotnēm pēdējo reizi tika atjaunināta pirms %s minūtēm." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Informācija par pakotnēm tikko tika atjaunināta." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Programmatūras uzlabojumi labo kļūdas, samazina drošības ievainojamības un " +"nodrošina jaunas programmatūras iespējas." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Iespējams, ka jūsu datoram ir pieejami programmatūras atjauninājumi." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Laipni lūgti Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Šie programmatūras atjauninājumi ir izlaisti kopš šīs Ubuntu versijas " +"publicēšanas." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Šim datoram ir pieejami programmatūras atjauninājumi." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1894,7 +1919,7 @@ "noņemiet iepriekšējo instalēšanu pagaidu pakotnes izmantojot 'sudo apt-get " "clean' komandu." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1902,25 +1927,25 @@ "Datoru nepieciešams pārstartēt, lai pabeigtu atjauninājumu instalēšanu. " "Lūdzu, saglabājiet jūsu darbu pirms turpināt." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Lasa informāciju par pakotnēm" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Savienojas..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Jums var nebūt iespēja pārbaudīt atjauninājumus vai lejupielādēt jaunus " "atjauninājumus." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Neizdevās inicializēt informāciju par pakotnēm" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1933,7 +1958,7 @@ "Lūdzu, ziņojiet par šo kļūdu attiecībā uz 'update-manager' pakotni un " "iekļaujiet šo kļūdas paziņojumu:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1945,31 +1970,31 @@ "Lūdzu, ziņojiet par šo kļūdu attiecībā uz 'update-manager' pakotni un " "iekļaujiet šo kļūdas paziņojumu:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Jauna instalācija)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Izmērs: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "No versijas %(old_version)s uz %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Versija %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Laidiena uzlabošana šobrīd nav iespējama" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1978,21 +2003,21 @@ "Šobrīd nevar veikt laidiena uzlabošanu, lūdzu, mēģiniet vēlāk. Serveris " "ziņoja: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Lejupielādē laidiena uzlabošanas rīku" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Ir pieejama jauna Ubuntu versija '%s'" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Programmatūras indekss ir bojāts" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -2002,6 +2027,17 @@ "\"Synaptic\" pakotņu pārvaldnieku vai termināļa komandrindā izpildiet " "komandu \"sudo apt-get install -f\", lai šo problēmu novērstu." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Jauns laidiens '%s' ir pieejams." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Atsaukt" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Pārbaudīt atjauninājumus" @@ -2011,22 +2047,18 @@ msgstr "Instalēt visus pieejamos atjauninājumus" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Atsaukt" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Izmaiņu saraksts" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Atjauninājumi" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Veido atjauninājumu sarakstu" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2050,20 +2082,20 @@ " * Neoficiālas programmatūras pakotnes, kuras nenodrošina Ubuntu\n" " * Normālas izmaiņas Ubuntu pirmslaidiena versijā" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Lejupielādē izmaiņu žurnālu" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Citi atjauninājumi (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "Šis atjauninājums nenāk no avota, kas atbalsta izmaiņu žurnālus." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2071,7 +2103,7 @@ "Neizdevās lejupielādēt izmaiņu sarakstu. \n" "Lūdzu, pārbaudiet jūsu Interneta savienojumu." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2084,7 +2116,7 @@ "Pieejamā versija: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2097,7 +2129,7 @@ "Lūdzu, izmantojiet http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "līdz izmaiņas kļūst pieejamas vai mēģiniet vēlāk vēlreiz." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2110,52 +2142,43 @@ "Lūdzu, izmantojiet http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "līdz izmaiņas kļūst pieejamas vai mēģiniet vēlāk vēlreiz." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Neizdevās noteikt distributīvu" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Gadījās kļūda '%s', mēģinot noteikt, kāda sistēma tiek izmantota." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Svarīgi drošības atjauninājumi" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Ieteikti atjauninājumi" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Piedāvāti atjauninājumi" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Atpakaļporti" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Distribūcijas atjauninājumi" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Citi atjauninājumi" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Palaiž atjauninājumu pārvaldnieku" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Programmatūras uzlabojumi labo kļūdas, samazina drošības ievainojamības un " -"nodrošina jaunas programmatūras iespējas." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Daļēja uzlabošana" @@ -2226,37 +2249,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Programmatūras atjauninājumi" +msgid "Update Manager" +msgstr "Atjauninājumu pārvaldnieks" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Programmatūras atjauninājumi" +msgid "Starting Update Manager" +msgstr "Palaiž atjauninājumu pārvaldnieku" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "Uz_labot" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "atjauninājumi" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Instalēt" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Izmaiņas" +msgid "updates" +msgstr "atjauninājumi" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Apraksts" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Atjauninājuma apraksts" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2264,23 +2277,33 @@ "Jūs esat savienojies ar tīklu, izmantojot viesabonēšanu. Atjaunināšana var " "radīt papildu izmaksas." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Jūs esat savienojies caur bezvadu modemu." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "Pirms atjaunināšanas, vēlams pievienot datoru maiņstrāvai." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Instalēt atjauninājumus" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Izmaiņas" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "Ie_statījumi..." +msgid "Description" +msgstr "Apraksts" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Instalēt" +msgid "Description of update" +msgstr "Atjauninājuma apraksts" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "Ie_statījumi..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2305,9 +2328,8 @@ "Jūs esat atteicies no jūsu sistēmas uzlabošanas uz jauno Ubuntu versiju" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Jūs varat uzlabot jūsu sistēmu vēlāk, atverot Atjaunināšanas pārvaldnieku un " @@ -2321,58 +2343,58 @@ msgid "Show and install available updates" msgstr "Rādīt un instalēt pieejamos atjauninājumus" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Parāda versiju un iziet" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Mape, kas satur datu failus" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Pārbaudīt, vai ir pieejama jauna Ubuntu versija" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Pārbaudīt, vai ir iespējama uzlabošana uz jaunāko izstrādes laidienu" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "Uzlabot izmantojot jaunāko piedāvāto laidiena uzlabotāja versiju" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Nefokusēties uz karti startējoties" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Mēģiniet lietot dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Palaižoties nepārbaudīt, vai ir atjauninājumi" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Testēt uzlabošanu ar smilškastes aufs pārklājumu" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Darbojas daļēja uzlabošana" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Rādīt pakotņu aprakstus izmaiņu saraksta vietā." -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Mēģiniet uzlabot uz jaunāko laidienu izmantojot $distro-proposed uzlabošanas " "rīku" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2382,11 +2404,11 @@ "Šobrīd ir pieejamas šādas iespējas: 'desktop', lai uzlabotu parastas " "darbstacijas sistēmu un 'server', lai uzlabotu serverus." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Darbināt norādīto saskarni" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2394,11 +2416,11 @@ "Tikai pārbaudīt, vai jaunais distribūcijas laidiens ir pieejams, un paziņot " "rezultātu ar izejas kodu" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Pārbauda, vai pieejams jaunāks Ubuntu laidiens" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2406,68 +2428,68 @@ "Informāciju par uzlabošanu meklējiet:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Jauns laidiens netika atrasts" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Jauns laidiens '%s' ir pieejams." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Palaidiet 'do-release-upgrade', lai uzlabotu sistēmu uz to." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Pieejams Ubuntu sistēmas uzlabojums uz %(version)s" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Jūs esat atteicies no sistēmas uzlabošanas uz Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Pievienot atkļūdošanas izvadi" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Parādīt uz šī datora neatbalstītas pakotnes" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Parādīt uz šī datora atbalstītas pakotnes" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Parādīt visas pakotnes ar to statusiem" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Parādīt visas pakotnes sarakstā" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "'%s' atbalsta statusa kopsavilkums" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "%(num)s pakotnes (%(percent).1f%%) atbalstītas līdz %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "%(num)s pakotnes (%(percent).1f%%) vairs nevar lejupielādēt" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "%(num)s pakotnes (%(percent).1f%%) netiek atbalstītas" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2475,124 +2497,153 @@ "Palaidiet ar parametriem --show-unsupported, --show-supported vai --show-" "all , lai redzētu vairāk detaļas" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Vairs nav lejupielādējams:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Neatbalstīts: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Līdz %s tiek atbalstīts:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Neatbalstīts" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Neieviesta metode: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Fails diskā" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb pakotne" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Instalēt trūkstošo pakotni." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Pakotni %s vajadzētu instalēt." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb pakotne" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s nepieciešams atzīmēt kā pašrocīgi instalētu." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"Ja uzlabojot kdelibs4-dev ir instalēts, ir nepieciešams instalēt kdelibs5-" -"dev. Skatiet bugs.launchpad.net kļūdu #279621, lai uzzinātu ko vairāk." - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i novecojuši ieraksti statusa failā" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Novecojuši ieraksti dpkg statusā" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Novecojuši dpkg statusa ieraksti" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"Ja uzlabojot kdelibs4-dev ir instalēts, ir nepieciešams instalēt kdelibs5-" +"dev. Skatiet bugs.launchpad.net kļūdu #279621, lai uzzinātu ko vairāk." + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s nepieciešams atzīmēt kā pašrocīgi instalētu." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Noņem lilo, jo grub ir arī instalēts. (Skatiet kļūdu #314004, lai uzzinātu " "ko vairāk.)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Pēc tam, kad pakotņu informācija tika atjaunota, vairs nevar atrast " -#~ "pamata pakotni '%s', tāpēc tiek uzsākts kļudas ziņošanas process." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Atjaunina Ubuntu uz 12.04 versiju" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "Ir izvēlēts %(count)s atjauninājums." -#~ msgstr[1] "Ir izvēlēti %(count)s atjauninājumi." -#~ msgstr[2] "Ir izvēlēti %(count)s atjauninājumu." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Laipni lūgti Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Šie programmatūras atjauninājumi ir izlaisti kopš šīs Ubuntu versijas " -#~ "publicēšanas." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Šim datoram ir pieejami programmatūras atjauninājumi." - -#~ msgid "Update Manager" -#~ msgstr "Atjauninājumu pārvaldnieks" - -#~ msgid "Starting Update Manager" -#~ msgstr "Palaiž atjauninājumu pārvaldnieku" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Jūs esat savienojies caur bezvadu modemu." - -#~ msgid "_Install Updates" -#~ msgstr "_Instalēt atjauninājumus" +#~ "Pēc tam, kad pakotņu informācija tika atjaunota, vairs nevar atrast " +#~ "pamata pakotni '%s', tāpēc tiek uzsākts kļudas ziņošanas process." #~ msgid "Checking for a new ubuntu release" #~ msgstr "Pārbauda, vai ir pieejams jauns Ubuntu laidiens" @@ -2723,6 +2774,9 @@ #~ "komandu 'ubuntu-bug update-manager' un, kļūdas ziņojumā iekļaujot mapi /" #~ "var/log/dist-upgrade/." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Uzlabo Ubuntu uz versiju 11.10" + #~ msgid "Your graphics hardware may not be fully supported in Ubuntu 11.04." #~ msgstr "Jūsu video karte varētu būt neatbalstīta Ubuntu 11.04 laidienā." diff -Nru update-manager-17.10.11/po/Makefile update-manager-0.156.14.15/po/Makefile --- update-manager-17.10.11/po/Makefile 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/Makefile 2017-12-23 05:00:38.000000000 +0000 @@ -4,19 +4,16 @@ DOMAIN=update-manager PO_FILES := $(wildcard *.po) CONTACT=sebastian.heinlein@web.de -XGETTEXT_ARGS = --msgid-bugs-address=$(CONTACT) -XGETTEXT_ARGS += --keyword=unicode_gettext:2 --keyword=unicode_ngettext:2,3 -XGETTEXT_ARGS += --language=python all: update-po # update the pot $(DOMAIN).pot: - XGETTEXT_ARGS="$(XGETTEXT_ARGS)" intltool-update -p -g $(DOMAIN) + XGETTEXT_ARGS=--msgid-bugs-address=$(CONTACT) intltool-update -p -g $(DOMAIN) # merge the new stuff into the po files merge-po: $(PO_FILES) - XGETTEXT_ARGS="$(XGETTEXT_ARGS)" intltool-update -r -g $(DOMAIN); + XGETTEXT_ARGS=--msgid-bugs-address=$(CONTACT) intltool-update -r -g $(DOMAIN); # create mo from the pos %.mo : %.po diff -Nru update-manager-17.10.11/po/mk.po update-manager-0.156.14.15/po/mk.po --- update-manager-17.10.11/po/mk.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/mk.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER. # Арангел Ангов , 2005. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: mk\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-01-03 08:51+0000\n" "Last-Translator: Јован Наумовски \n" "Language-Team: Macedonian \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Сервер за %s" @@ -42,30 +43,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Главен сервер" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Други сервери" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Не можам да го додадам CD-то" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -80,13 +81,13 @@ "Пораката со грешка беше:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Отстрани го пакетот во лоша состојба" msgstr[1] "Отстрани ги пакетите во лоша состојба" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -101,15 +102,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Оштетени пакети" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -118,7 +119,7 @@ "софтвер. Ве молам поправете ги со Синаптик или apt-get пред да продолжите." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -131,26 +132,26 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Ова најверојатно е минлив проблем, пробајте подоцна." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Не може да се одреди надградбата" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Грешка при автентикација на некои пакети" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -159,39 +160,39 @@ "Не можат да се автентицираат некои пакети. Може да има мрежни пречки. " "Обидете се повторно. Видете подолу за листа на неавтентицирани пакети." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Не може да се инсталира %s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Не може да се погоди мета пакетот" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -205,15 +206,15 @@ " Ве молам, инсталирајте еден од пакетите погоре со synaptic или apt-get пред " "да продолжите." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Читање на кешот" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Не можам да добијам ексклузивно заклучување" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -222,11 +223,11 @@ "пакети (како apt-get или aptitude). Ве молам прво затворете ја таа " "апликација." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -235,11 +236,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Да продолжам да се извршувам под SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -250,11 +251,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Стартувам додатен sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -262,7 +263,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -271,29 +272,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Не можам да извршам надградба" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Надградбата од „%s“ во „%s“ не е поддржано со оваа алатка." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -303,30 +304,30 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Вашата инсталација на python e расипана. Ве молам, поправете ја симболичката " "врска „/usr/bin/python“." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -334,11 +335,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Да ги вклучам најновите ажурирања од Интернет?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -350,16 +351,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Не е пронајден валиден помошен сервер" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -372,11 +373,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Да ги генерирам стандардните извори?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -385,21 +386,21 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Информациите за складиштето се невалидни" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Додатните извори се оневозможени" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -409,13 +410,13 @@ "овозможите повторно по надградбата со алатката „software-properties“ или со " "Вашиот менаџер на пакети." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Пакет во неправилна состојба" msgstr[1] "Пакети во неправилна состојба" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -428,11 +429,11 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Грешка при ажурирањето" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -440,13 +441,13 @@ "Се случи проблем при надградбата. Ова е обично некој проблем со мрежата и Ве " "молиме да ја проверете Вашата мрежна врска и да се обидете повторно." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Нема доволно место на дискот" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -457,32 +458,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Ги проценувам промените" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Дали сакате да ја започнете надградбата?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Не можам да ги симнам надградбите" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -490,33 +491,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Грешка при испраќањето" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Ја враќам првичната состојба на системот" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Не можам да ги инсталирам надградбите" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -527,26 +528,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Да ги отстранам застарените пакети?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Чувај" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Отстрани" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -556,37 +557,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Не се инсталирани потребните зависности" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Потребната зависност „%s“ не е инсталирана. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Проверете го менаџерот за пакети" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Подготвувањето на надградбата не успеа" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Земањето на почетните потребни пакети не успеа" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -594,79 +595,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Ги ажурирам информациите за складиштето" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Невалидни информации за пакетот" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Земам" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Надградувам" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Надградбата е завршена" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Барам застарен софтвер" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Надградбата на системот е завршена." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -674,16 +675,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -692,7 +693,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -701,11 +702,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -713,11 +714,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -725,11 +726,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -739,16 +740,16 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Користи ја дадената патека за пребарување на cdrom со пакети за надградба" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -756,57 +757,57 @@ "Користи фронтенд. Моментално достапни: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Внесете '%s' во драјвот '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Земањето заврши" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Преостануваат околу %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Земам датотека %li од %li" @@ -816,27 +817,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Применувам промени" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Не можам да инсталирам '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -846,7 +847,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -857,7 +858,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -865,20 +866,20 @@ "Ќе ги загубите сите промени кои ги направивте на оваа конфигурациска " "датотека ако изберете да ја замените со понова верзија." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Командата „diff“ не беше пронајдена" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Се случи фатална грешка" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -886,150 +887,150 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "За да спречите загуба на податоци, затворете ги сите отворени апликации и " "документи." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Промена на медиум" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Покажи ја разликата >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Скриј ја разлаката" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Покажи терминал >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Скриј го терминалот" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Детали" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Отстрани го %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Инсталирај %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Надгради %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Потребно е рестартирање" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" "Рестартирајте го системот за да ја завршите надградбата" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Рестартирај сега" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1037,32 +1038,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Да ја прекинам надградбата?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1078,7 +1079,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1092,14 +1093,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1107,34 +1108,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Ова преземање ќе трае околу %s со Вашата врска. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Ја подготвувам надградбата" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Земам нови софтверски канали" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Земам нови пакети" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Ги инсталирам надградбите" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Расчистувам" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1147,28 +1146,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "Ќе биде отстранет %d пакет." msgstr[1] "Ќе бидат отстранети %d пакети." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "Ќе се инсталира %d нов пакет." msgstr[1] "Ќе се инсталираат %d нови пакети." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "Ќе се надгради %d пакет." msgstr[1] "Ќе се надградат %d пакети." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1179,98 +1178,98 @@ "\n" "Мора да преземете вкупно %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" "Нема достапни надградби за Вашиот систем. Надградбата сега ќе се прекине." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Потребно е рестартирање" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Надградбата е завршена и потребно е рестартирање. Дали сакате да го " "направите сега?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Не можам да ја извршам алатката за надградба" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Потпис на алатката за надградба" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Алатка за надградба" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Не можам да симнам" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Симнувањето на надградбите не успеа. Можеби има проблем со мрежата. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Проверката беше неуспешна" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1278,13 +1277,13 @@ "Проверката на автентичност на надградбата не успеа. Можеби има проблем со " "мрежата или серверот. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Не можам да отпакувам" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1292,13 +1291,13 @@ "Отпакувањето на надградбата не успеа. Можеби има проблем со мрежата или " "серверот. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1306,27 +1305,27 @@ "Проверката на надградбата не успеа. Можеби има проблем со мережата или со " "серверот. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1334,73 +1333,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Прекинувам" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Снижено:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Продолжи [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Детали [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Отстрани го: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Инсталирај: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Надгради: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1464,7 +1463,7 @@ msgstr "Надградба на дистрибуцијата" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1483,166 +1482,180 @@ msgid "Terminal" msgstr "Терминал" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Ве молам, почекајте, ова може да потрае." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Надградбата е завршена" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Не можам да ги најдам белешките за изданието" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Серверот може да е преоптоварен. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Не можам да ги преземам белешките за изданието" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Ве молам проверете ја Вашата интернет врска." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Белешки за изданието" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Ја преземам датотеката %(current)li од %(total)li со %(speed)s/сек." -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Ја преземам датотеката %(current)li од %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Верзија %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Преземам листа на промени..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "Серверот може да е преоптоварен. " -msgstr[1] "Серверот може да е преоптоварен. " +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1651,34 +1664,44 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Надградбата на софтверот ги поправа грешките, ги елиминира сигурносните " +"пропусти и овозможува нови карактеристики." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1686,29 +1709,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Ги читам податоците за пакетот" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Не можам да ги иницијализирам информациите за пакетот" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1717,7 +1740,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1725,52 +1748,52 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(големина: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Од верзијата %(old_version)s во %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Верзија %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Индексот на софтвер е расипан" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1780,6 +1803,16 @@ "менаџерот за пакети Синаптик или прво извршете „sudo apt-ge install -f“ во " "терминал за да го надминете овој проблем." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1789,22 +1822,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1818,20 +1847,20 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -1839,7 +1868,7 @@ "Не успеав ја преземам листата со промени. \n" "Ве молам проверете дали Вашата интернет врска е активна." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1848,7 +1877,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1857,7 +1886,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1866,52 +1895,43 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Важни безбедносни ажурирања" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Препорачливи ажурирања" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Предложени ажурирања" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Надградени пакети од понови верзии на Ubuntu" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Надградби на дистрибуцијата" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Други надградби" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Го стартувам менаџерот за ажурирање" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Надградбата на софтверот ги поправа грешките, ги елиминира сигурносните " -"пропусти и овозможува нови карактеристики." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Парцијална надградба" @@ -1975,59 +1995,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Надградба на софтвер" +msgid "Update Manager" +msgstr "Менаџер за надградба" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Надградба на софтвер" +msgid "Starting Update Manager" +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "Н_адгради" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "ажурирања" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Инсталирај %s" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Промени" +msgid "updates" +msgstr "ажурирања" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Опис" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Опис на ажурирањето" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Инсталирај надградби" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Промени" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "" +msgid "Description" +msgstr "Опис" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Инсталирај %s" +msgid "Description of update" +msgstr "Опис на ажурирањето" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2051,7 +2071,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -2063,58 +2083,58 @@ msgid "Show and install available updates" msgstr "Прикажи и инсталирај ги достапните надградби" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Прикажи верзија и излези" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Провери дали е можна надградбата до најновата развојна верзија" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Пробајте да извршите dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Извршувам парцијална надградба" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Пробајте да го надградите системот до најновото издание со користење на " "надградувачот од $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2124,169 +2144,229 @@ "Моментално се поддржани „desktop“ за регуларни надградби за десктоп систем и " "„server“ за серверски системи." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Изврши го одредениот фронтенд" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Не е пронајдено ново издание" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Менаџер за надградба" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "_Инсталирај надградби" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "Checking for a new ubuntu release" #~ msgstr "Провери за нови изданија од дистрибуцијата" diff -Nru update-manager-17.10.11/po/ml.po update-manager-0.156.14.15/po/ml.po --- update-manager-17.10.11/po/ml.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/ml.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2007. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-10-13 09:13+0000\n" "Last-Translator: nithin_aneesh \n" "Language-Team: Malayalam \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s -ന്റെ സര്‍വര്‍" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "പ്രധാന സര്‍വര്‍" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "മറ്റെതെങ്ങിലും കേന്ദ്ര കമ്പ്യൂട്ടര്‍" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "sources.list ഇല്‍ കണക്കാക്കാന്‍ കഴിഞ്ഞില്ല" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "ആവശ്യമായ സോഫ്റ്റ്‌വെയര്‍ കണ്ടെത്താന്‍ കഴിയുന്നില്ല! നിങ്ങള്‍ 'Ubuntu' വിന്റെ ഡിസ്ക് തന്നെയാണൊ " "ഉപയോഗിക്കുന്നത് ?! അതോ, മറ്റൊരു processor ആണോ ഉപയോഗിക്കുന്നത്?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "സി ഡി(CD ) ഉള്‍പ്പെടുത്തുന്നതില്‍ പരാജയപ്പെട്ടു!" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,13 +83,13 @@ "തകരാറിനെ കുറിച്ചുള്ള വിശദീകരണം ഇപ്രകാരമാണ്:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "മോശം നിലയില്‍ ഉള്ള സോഫ്റ്റ്‌വെയര്‍ നീക്കം ചെയ്യുന്നു" msgstr[1] "മോശം നിലയില്‍ ഉള്ള സോഫ്റ്റ്‌വെയറുകള്‍ നീക്കം ചെയ്യുന്നു" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -107,15 +108,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "അപൂര്‍ണ്ണമായ പാക്കേജുകള്‍" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -124,7 +125,7 @@ "ഉണ്ട്. ദയവായി synaptic അല്ലെങ്കില്‍ apt-get ഉപയോഗച്ച് അവ ശരിയാക്കിയ ശേഷം തുടരുക." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -145,11 +146,11 @@ " *ഉബുണ്ടുവില്‍ ഔദ്യോഗികമായി ഇല്ലാത്ത സോഫ്റ്റ്‌വെയര്‍ ഉപയോഗിച്ചത് കൊണ്ട്\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "ഇരു് മിക്കവാറും താത്കാലികമായ തകരാറ് മാത്രമാണ്, അല്‍പസമയം കഴിഞ്ഞു ശ്രമിക്കുക." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -157,16 +158,16 @@ "ഇത് ഒന്നും പ്രായോഗികമല്ലെങ്കില്‍ 'ubuntu-bug update-manager' എന്ന നിര്‍ദേശം ഉപയോഗിച്ച് " "റ്റെര്‍മിനലില്‍ നിന്നും ബഗ് പ്രസ്താവിക്കുക" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "നവീകരണം കണക്കുകൂട്ടാന്‍ കഴിഞ്ഞില്ല" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "ചില പാക്കേജുകള്‍ അധികാരപ്പെടുത്തുന്നതില്‍ പിഴവ്" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -176,7 +177,7 @@ "താങ്കള്‍ക്ക് പന്നീട് ശ്രമിക്കാവുന്നതാണ്. അധികാരപ്പെടുത്തുന്നതില്‍ പിഴവ് പറ്റിയ പാക്കേജുകളുടെ പട്ടിക " "താഴെ കൊടുക്കുന്നു." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -184,22 +185,22 @@ "പാക്കേജ് '%s' ഒഴിവാക്കന്നതിനായി തെരഞ്ഞെടുത്തിരിക്കുന്നു. പക്ഷേ ഈ പാക്കേജ് ഒഴിവാക്കല്‍ " "പ്രതിരോധിക്കുന്ന പട്ടികയില്‍ ഉള്‍പെട്ടതാണ്." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "അവശ്യം ഉണ്ടായിരിക്കേണ്ട പാക്കേജ് '%s' ഒഴിവാക്കുന്നതിനായി തെരെഞ്ഞെടുത്തിരിക്കുന്നു." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "പ്രതിരോധപ്പട്ടികയില്‍ ഉള്ള പതിപ്പ് '%s' ഇന്‍സ്റ്റാള്‍ ചെയ്യാന്‍ ശ്രമിക്കുന്നു." -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "'%s' ഇന്‍സ്റ്റാള്‍ ചെയ്യാന്‍ കഴിയില്ല." -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -208,11 +209,11 @@ "നിര്‍ദേശം ഉപയോഗിച്ച് റ്റെര്‍മിനലില്‍ നിന്നും ബഗ് പ്രസ്താവിക്കുക" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "meta-package അനുമാനിക്കാന്‍ കഴിയില്ല." -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -226,25 +227,25 @@ " ദയവായി ആദ്യം ഏതെങ്കിലും ഒരു പാക്കേജ് synaptic അല്ലെങ്കില്‍ apt-get ഉപയോഗച്ച് ഇന്‍സ്റ്റാള്‍ " "ചെയ്ത ശേഷം തുടരുക." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "കാഷ് മെമ്മറി വായിക്കുക." -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -253,11 +254,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -268,11 +269,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -280,7 +281,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -289,29 +290,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "അപ്ഗ്രേഡ്‌ ചെയ്യാൻ സാധിച്ചില്ലാ" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -321,28 +322,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -350,11 +351,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -366,16 +367,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -388,11 +389,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -401,34 +402,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -447,11 +448,11 @@ "പാക്കേജ് സംഭരണിയില്‍ പ്രസ്തുത പാക്കേജുകള്‍ ലഭ്യമല്ല. ദയവായി ഈ പാക്കേജുകള്‍ സ്വന്തമായി ഇന്‍സ്റ്റാള്‍ " "ചെയ്യുകയോ സിസ്റ്റത്തില്‍നിന്ന് ഒഴിവാക്കുകയോ ചെയ്യുക." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "അപ്ഡേറ്റ് ചെയ്യുന്നതിനിടയില്‍ തകരാറ് സംഭവിച്ചിരിക്കുന്നു" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -459,13 +460,13 @@ "അപ്ഡേറ്റ് ചെയ്യുന്നതിനിടയില്‍ തകരാറ് സംഭവിച്ചിരിക്കുന്നു. ഇത് മിക്കവാറും നെറ്റ്‍വര്‍ക്ക് പ്രശ്നമാവാം, " "താങ്കളുടെ നെറ്റ്‍വര്‍ക്കുമായുള്ള ബന്ധം പരിശോധിച്ച ശേഷം വീണ്ടും ശ്രമിക്കുക." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "ഡിസ്കില്‍ വേണ്ടത്ര സ്ഥലമില്ല" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -476,32 +477,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "മാറ്റങ്ങള്‍ കണക്കാക്കന്നു." #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "അപ്ഗ്രേഡ് ആരംഭിക്കട്ടെ?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -509,33 +510,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -546,26 +547,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "സൂക്ഷിക്കുക (_K)" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_നീക്കം ചെയ്യുക (Remove)" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -573,37 +574,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -611,79 +612,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -691,16 +692,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -709,7 +710,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -718,11 +719,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -730,11 +731,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -742,11 +743,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -756,71 +757,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -830,27 +831,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -860,7 +861,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -869,26 +870,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -896,147 +897,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1044,32 +1045,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1085,7 +1086,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1099,14 +1100,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1114,34 +1115,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1154,28 +1153,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1183,145 +1182,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1329,73 +1328,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1453,7 +1452,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1472,133 +1471,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1606,31 +1613,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1639,34 +1653,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1674,29 +1696,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1705,7 +1727,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1713,58 +1735,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1774,22 +1806,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1803,26 +1831,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1831,7 +1859,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1840,7 +1868,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1849,47 +1877,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1950,54 +1972,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -2022,7 +2047,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -2034,218 +2059,284 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" #~ msgid "0 kB" diff -Nru update-manager-17.10.11/po/mn.po update-manager-0.156.14.15/po/mn.po --- update-manager-17.10.11/po/mn.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/mn.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2009. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2010-05-25 10:48+0000\n" "Last-Translator: Н.Энхбат \n" "Language-Team: Mongolian \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f МБ" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s улсын сервер" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Төв сервер" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "sources.list бичлэгийг тооцоолж чадсангүй" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Ямар нэг багц файл олдсонгүй. Үбүнтүгийн диск биш эсвэл буруу бүтэцтэй байж " "магадгүй." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "СD-г нэмэхэд алдаа гарлаа" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -77,12 +78,12 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Буруу төлөвт байгаа багцыг устгах" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -97,15 +98,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Эвдэрхий боодол" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -114,7 +115,7 @@ "Үргэлжлүүлэхээс өмнө synaptic эсвэл apt-get хэрэглэн тэднийг засна уу" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -127,26 +128,26 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Энэ бол хамгийн боломжтой тогтворгүй асуудал. Дараа дахин оролдоно уу." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Шинэчлэлийг тооцоолж чадахгүй байна" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Баталгаажуулж байгаа зарим боодолд алдаа гарлаа" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -156,39 +157,39 @@ "зуурын алдаа байсан байх. Та магадгүй хүсвэл дараа дахин оролдож болно. Доор " "баталгаажаагүй боодлуудыг харуулав." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "'%s'-ийг суулгаж чадахгүй байна" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "meta-боодлыг таамаглаж чадахгүй байна" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -197,25 +198,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Нөөцийг уншиж байна" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Онцгой түгжээг өгөх чадваргүй" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -224,11 +225,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "SSH-д тохируулахгүй үргэлжлүүлэн ажиллуулах уу?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -239,11 +240,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Нэмэлт sshd ажиллаж эхлэж байна" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -251,7 +252,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -260,29 +261,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Шинэчлэгдэж чадахгүй байна" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -292,28 +293,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "'debsig-verify' гэх боодол суусан" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -321,11 +322,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Интернэтээс хамгийн сүүлийн үеийн шинэчлэлийг авах уу?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -337,16 +338,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -359,11 +360,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -372,21 +373,21 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "3 дах хэсгийн үүсвэрүүд гэмтсэн байна." -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -396,12 +397,12 @@ "properties' хэрэгсэл болох таны багцын менежерийг сайжруулсны дараа дахин " "ажиллуулж болно." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Тохиромжгүй төлөв дэх багц" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -414,23 +415,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Шинэчлэх үед алдаа гарав" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -441,32 +442,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -474,33 +475,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -511,26 +512,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -538,37 +539,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -576,79 +577,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -656,16 +657,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -674,7 +675,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -683,11 +684,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -695,11 +696,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -707,11 +708,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -721,71 +722,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Өгсөн замыг хэрэглэн СД уншигчнаас шинэчлэх боодлыг хай" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "Зөвхөн хэсэгчилсэн шинэчлэлийг гүйцэтгэнэ" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "datadir -ыг байрлуул" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -795,27 +796,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -825,7 +826,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -834,26 +835,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -861,147 +862,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1009,32 +1010,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1050,7 +1051,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1064,14 +1065,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1079,34 +1080,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1119,28 +1118,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1148,145 +1147,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1294,73 +1293,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1418,7 +1417,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1437,164 +1436,180 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1603,34 +1618,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1638,29 +1661,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1669,7 +1692,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1677,58 +1700,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1738,22 +1771,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1767,26 +1796,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1795,7 +1824,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1804,7 +1833,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1813,47 +1842,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1914,54 +1937,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1986,7 +2012,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1998,216 +2024,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/mr.po update-manager-0.156.14.15/po/mr.po --- update-manager-17.10.11/po/mr.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/mr.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-12-06 06:42+0000\n" "Last-Translator: kunj juhhu \n" "Language-Team: Marathi \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f मेगाबाइट्स" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s साठी सर्व्हर" @@ -42,31 +43,31 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "मुख्य सर्व्हर" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "कस्टम सर्व्हर्स" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "sources.list नोंदींची गणना करू शकत नाही" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" "पॅकेज फाईल्स मिळाल्या नाहीत, बहुतेक हि उबुंटूची CD नाही किंवा architecture वेगळे आहे." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "CD घेऊ शकले नाही." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -81,13 +82,13 @@ "चुकीबाबतचा संदेश: \n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "खराब स्थितीत असलेले पॅकेज काढून टाका" msgstr[1] "खराब स्थितीत असलेले पॅकेजेस काढून टाका" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -106,15 +107,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "कदाचित सर्व्हर वर अतिरिक्त भार असावा" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "अपुर्ण पॅकेजेस" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -124,7 +125,7 @@ "पॅकेजेस दुरुस्त करा." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -145,26 +146,26 @@ " * उबुन्टूकडून न पुरविल्या गेलेल्या अनधिकृत सॉफ्टवेअर पॅकेजेस मुळे\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "ही तात्पुरती समस्या आहे, काही क्षणांनंतर पुन्हा प्रयत्न करा." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "अपग्रेडची गणना करू शकले नाही" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "काही पॅकेजेसचे अधिप्रमाणन करताना त्रुटी येत आहेत" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -174,40 +175,40 @@ "काही वेळाने पुन्हा प्रयत्न करून पहा. काही अधिप्रमाणित न केलेल्या पॅकेजेसची यादी पाहण्यासाठी " "खाली पहा." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" "'%s' हे पॅकेज काढून टाकण्यासाठी चिन्हांकित केले आहे पण ते काढून टाकलेल्या ब्लॅकलिस्ट मध्ये आहे." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "'%s' हे अत्यावश्यक पॅकेज काढून टाकण्यासाठी चिन्हांकित केलेले आहे." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "ब्लॅकलिस्ट केलेली '%s' आवृत्ती स्थापित करण्याचा प्रयत्न करीत आहे" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "'%s' हे स्थापित करू शकत नाही" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "meta-package ओळखू शकत नाही" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -221,15 +222,15 @@ " कृपया पुढे जाण्याअगोदर वरीलपैकी कोणतेही एखादे पॅकेज synaptic किंवा apt-get द्वारे " "स्थापित करा." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "कॅशे (cache) वाचत आहे" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "एक्स्क्ल्युजिव्ह लॉक मिळविण्यात असमर्थ" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -238,11 +239,11 @@ "कृपया ते ऍप्लिकेशन प्रथम बंद करा. (कारण apt-get किंवा aptitude द्वारे एकाच वेळी " "एकापेक्षा अधिक पॅकेजेस स्थापित करता येत नाहीत.)" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "रीमोट कनेक्शन वरून अपग्रेड करण्यास समर्थन नाही" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -256,11 +257,11 @@ "\n" "अपग्रेड आता थांबविले जाईल. कृपया ssh च्या शिवाय प्रयत्न करून पहा." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "SSH च्या अंतर्गत चालू ठेवायचे का?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -276,11 +277,11 @@ "जर तुम्ही चालू ठेवले, तर '%s' या पोर्टवर एक शिल्ल्कचे ssh daemon सुरू होईल.\n" "तुम्ही पुढे चालू ठेवू इच्छिता का?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "शिल्लकचे sshd सुरू करीत आहे" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -291,7 +292,7 @@ "पोर्टवर एक शिल्लकचे sshd चालू होईल. सध्या चालू असलेल्या ssh सोबत जरी काही अनुचित " "प्रकार घडलाच, तरीही तुम्ही एका शिल्लकच्या sshd ला कनेक्ट करू शकता.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -300,29 +301,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "अपग्रेड करू शकत नाही" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "या साधनासह '%s' पासून '%s' कडे अपग्रेड करण्यास समर्थन नाही." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Sandbox चे सेटअप अयशस्वी झाले" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "sandbox वातावरणनिर्मिती तयार करणे शक्य नव्हते." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Sandbox मोड" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -332,18 +333,18 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "तुमची python ची स्थापना बिघडली आहे किंवा दूषित झाली आहे. कृपया '/usr/bin/python' " "symlink दुरुस्त करा." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "'debsig-verify' पॅकेज स्थापित केले आहे" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -353,12 +354,12 @@ "प्रथमतः ते पॅकेज synaptic द्वारे किंवा 'apt-get remove debsig-verify' द्वारे काढून " "टाका आणि पुन्हा एकदा अपग्रेड चालू करा." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -366,11 +367,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "इंटरनेटवरून सध्या उपलब्ध असलेले ताजे अद्ययावत जोडायचे का?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -390,16 +391,16 @@ "जर तुम्ही येथे 'नाही' असे उत्तर दिले, तर अपग्रेड प्रणाली तुमच्या नेटवर्कचा मुळीच उपयोग " "करणार नाही." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "%s साठी अपग्रेड अकार्यान्वीत केलेले आहे" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "योग्य प्रतिमा सापडली नाही" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -412,11 +413,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -425,34 +426,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "पैकेज अपुर्णावस्थेत आहे." msgstr[1] "पैकेजेस अपुर्णावस्थेत आहेत." -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -465,23 +466,23 @@ msgstr[0] "पैकेज अपुर्णावस्थेत आहे आणि पुन:प्रस्थापित करावे लागेल," msgstr[1] "पैकेजेस अपुर्णावस्थेत आहेत आणि पुन:प्रस्थापित करावी लागतील," -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "नवीकरण करताना त्रुटि." -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "डिस्कवर पुरेशी जागा उपलब्ध नाही" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -492,32 +493,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -525,33 +526,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -562,26 +563,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -589,37 +590,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -627,79 +628,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -707,16 +708,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -725,7 +726,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -734,11 +735,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -746,11 +747,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -758,11 +759,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -772,71 +773,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -846,27 +847,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -876,7 +877,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -885,26 +886,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -912,147 +913,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "फरक दाखवा. >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< फरक लपवा" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "माहिती" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1060,32 +1061,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "अपग्रेड थांबवायचा का?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li दिवस" msgstr[1] "%li दिवस" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li तास" msgstr[1] "%liतास" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li मिनिट" msgstr[1] "%li मिनिटे" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1101,7 +1102,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1115,14 +1116,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1130,34 +1131,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1170,28 +1169,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1199,145 +1198,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "तुमच्या प्रणालीसाठी अपग्रेडस उपलब्ध नाहीत. हा अपग्रेड थांबवला जाईल." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "अपग्रेड सुरु करू शकत नाही." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1345,73 +1344,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "हो" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "नाही" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "काढून टाका: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "अपग्रेड: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "पुढे चला[Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1472,7 +1471,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1491,133 +1490,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "कृपया थोडा वेळ थांबा." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "अपडेट पूर्ण झालेला आहे." -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "अपग्रेड" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1625,31 +1632,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1658,34 +1672,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1693,29 +1715,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "पॅकेजची माहिती वाचत आहे" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1724,7 +1746,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1732,58 +1754,69 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "वर्जन %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "नवीन रिलीज %s उपलब्ध आहे." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1793,22 +1826,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1822,26 +1851,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1850,7 +1879,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1859,7 +1888,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1872,48 +1901,41 @@ "बदल उपलब्ध होईपर्यंत http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" " वापरा किंवा थोड्या वेळाने परत प्रयत्न करा." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "डीस्ट्रीब्युशनची माहिती काढू शकत नाही." -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "महत्वाचे सुरक्षा अपडेट्स" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "इतर अपडेट्स." #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" -msgstr "प्रणाली बॅटरीवर सुरु आहे." - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1974,59 +1996,58 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "अपडेट व्यवस्थापक सुरु होत आहे." +msgid "Update Manager" +msgstr "अपडेट व्यवस्थापक" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "अपडेट व्यवस्थापक सुरु होत आहे." #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "अपग्रेड" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "अपडेट्स" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "बदल" +msgid "updates" +msgstr "अपडेट्स" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "माहिती" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "अपडेटची माहिती" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "अपडेट्स प्रस्थापित करा." + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "बदल" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "" +msgid "Description" +msgstr "माहिती" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "अपडेट्स प्रस्थापित करा." +msgid "Description of update" +msgstr "अपडेटची माहिती" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2049,9 +2070,8 @@ msgstr "तुम्ही नवीन उबुंटूला अपग्रेड करायला नकार दिला आहे." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "तुम्ही नंतर कधीही अपडेट व्यवस्थापक उघडून \"अपग्रेड\" वर क्लिक करून अपग्रेड करू शकता." @@ -2063,197 +2083,214 @@ msgid "Show and install available updates" msgstr "उपलब्ध अपडेट्स दाखवा आणि प्रस्थापित करा." -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "फक्त वर्जन दाखवा." -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "उबुंटूची नवीन रिलीज उपलब्ध आहे का ते पहा." -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "एकही नवीन रिलीज मिळाली नाही." -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "नवीन रिलीज %s उपलब्ध आहे." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "त्याला अपग्रेड करण्यासाठी 'do-release-upgrade' चालवा." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "उबुंटू %s(वर्जन) अपग्रेड उपलब्ध" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "तुम्ही उबुंटूला अपग्रेड करण्यास नकार करत आहात. %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Unimplemented method: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "डिस्कवरील फाईल." -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb पॅकेज" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "पॅकेज %s प्रस्थापित केले पाहिजे." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb पॅकेज" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s समोर manually installed अशी खूण केली पाहिजे." +msgid "%i obsolete entries in the status file" +msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "dpkg जुन्या स्थितीदर्शक नोंदी" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2261,28 +2298,74 @@ "अपग्रेड करताना जर kdelibs4-dev प्रस्थापित असेल, तर kdelibs5-dev हे देखील प्रस्थापित " "करावे लागेल. अधिक माहितीसाठी bugs.launchpad.net वरती बग #२७९६२१ पहा." -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." +msgstr "%s समोर manually installed अशी खूण केली पाहिजे." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" +"लिलो काढून टाका कारण ग्रब प्रणालीत प्रस्थापित आहे. (अधिक माहितीसाठी बग #३१४००४ " +"पहा.)" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "dpkg जुन्या स्थितीदर्शक नोंदी" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." msgstr "" -"लिलो काढून टाका कारण ग्रब प्रणालीत प्रस्थापित आहे. (अधिक माहितीसाठी बग #३१४००४ " -"पहा.)" -#~ msgid "Update Manager" -#~ msgstr "अपडेट व्यवस्थापक" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "Checking for a new ubuntu release" #~ msgstr "उबुंटूची नवीन रिलीज शोधात आहे." diff -Nru update-manager-17.10.11/po/ms.po update-manager-0.156.14.15/po/ms.po --- update-manager-17.10.11/po/ms.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/ms.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-21 00:04+0000\n" "Last-Translator: abuyop \n" "Language-Team: Malay \n" @@ -22,7 +23,7 @@ "X-Poedit-Language: Malay\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -30,13 +31,13 @@ msgstr[1] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Pelayan untuk %s" @@ -44,20 +45,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Pelayan Utama" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Pelayan Suai" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Tidak dapat mengira masukan sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -65,11 +66,11 @@ "Tidak boleh mengenalpasti sebarang fail pakej, mungkin ini bukan Cakera " "Ubuntu atau arkitektur yang sesuai?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Gagal menyenaraikan CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -83,13 +84,13 @@ "Mesej ralat adalah:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Buang pakej yang rosak" msgstr[1] "Buang pakej-pakej yang rosak" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -110,15 +111,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Kemungkinan pelayan melebihi had" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Pakej rosak" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -128,7 +129,7 @@ "sebelum meneruskan tindakan yang lain." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -148,12 +149,12 @@ " *Pakej perisian yang tidak rasmi tidak disokong oleh Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Kemungkinan ini adalah masalah sementara sahaja. Sila cuba lagi kemudian." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -161,16 +162,16 @@ "Jika tiada dilaksanakan, maka sila laporkan pepijat ini menggunakan perintah " "'ubuntu-bug update-manager' di terminal." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Tidak dapat mengira penataran" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Ralat mengesahkan sesetengah pakej" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -180,7 +181,7 @@ "masalah sementara rangkaian. Anda mungkin mahu mencuba lagi kemudian. Lihat " "dibawah untuk pakej-pakej yang belum disahkan." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -188,22 +189,22 @@ "Pakej '%s' telah ditanda untuk pembuangan tetapi ia ada di dalam senarai " "hitam pembuangan." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Pakej yang diperlukan '%s' telah ditanda untuk dibuang" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Cubaan untul memasang versi '%s' yang disenarai hitam" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Tidak dapat memasang '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -212,11 +213,11 @@ "sebagai pepeijat menggunakan 'ubuntu-bug update-manager' di terminal." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Pakej meta tidak dapat diduga." -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -230,15 +231,15 @@ " Sila pasang salah satu dari pakej diatas terlebih dahulu menggunakan " "synaptic atau apt-get sebelum teruskan." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Membaca cache" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Tidak boleh mengunci secara eksklusif" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -247,11 +248,11 @@ "dijalankan (seperti apt-get atau aptitude). Sila hentikan program tersebut " "dahulu." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Penataran melalui sambungan jauh tidak disokong." -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -259,16 +260,16 @@ "\n" "The upgrade will abort now. Please try without ssh." msgstr "" -"Anda sedang menjalankan penataran melalui sambungan jauh ssh dengan frontend" -"(gui) yang tidak menyokong ini. Sila cuba mod menatar teks dengan 'do-" -"release-upgrade'.\n" +"Anda sedang menjalankan penataran melalui sambungan jauh ssh dengan " +"frontend(gui) yang tidak menyokong ini. Sila cuba mod menatar teks dengan " +"'do-release-upgrade'.\n" "Penataran akan digugurkan sekarang. Sila cuba tanpa ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Teruskan perlaksanaan dengan SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -285,11 +286,11 @@ "Jika anda teruskan, daemon ssh tambahan akan dimulakan pada port '%s'.\n" "Adakah anda ingin meneruskan?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Memulakan sshd tambahan" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -300,7 +301,7 @@ "dimulakan pada port '%s'. JIka terdapat masalah semasa menjalankan ssh anda " "masih boleh membuat sambungan ke satu lagi tambahan sshd.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -313,29 +314,29 @@ "boleh buka port dengan cth.:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Tidak boleh menatar" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Penataran dari '%s' ke '%s' tidak disokong menggunakan alat ini." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Pemasangan kotak pasir gagal" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Tidak mungkin boleh mencipta persekitaran kotak paisr." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Mod kotak pasir" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -350,17 +351,17 @@ "*Tiada* perubahan ditulis ke direktori sistem mulai sekarang hinggalah but " "semula adalah kekal." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Pemasangan python anda telah rosak. Sila baiki symlink di 'usr/bin/python'." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Pakej 'debsig-verify' telah dipasang" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -370,12 +371,12 @@ "Sila buangnya dengan synaptic atau 'apt-get remove debsig-verify' terlebih " "dahulu dan mulakan penataran sekali lagi." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Tidak dapat tulis ke '%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -386,11 +387,11 @@ "tidak boleh diteruskan.\n" "Sila pastikan direktori sistem adalah boleh-tulis." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Sertakan kemaskini yang terkini dari internet?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -410,16 +411,16 @@ "tetapi anda seharusnya memasang kemaskini yang terkini selepas menatar.\n" "Jika jawapan anda 'tidak', rangkaian tidak akan digunakan langsung." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "dilumpuhkan semasa menatar kepada %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Tiada mirror yang sah ditemui" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -439,11 +440,11 @@ "Jika anda pilih 'Tidak' penataran akan dibatalkan." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Janakan sumber lalai?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -456,11 +457,11 @@ "Adakah masukan lalai untuk '%s' ditambah? Jika anda pilih 'Tidak', penataran " "akan dibatalkan." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Maklumat repositori tidak sah" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -468,11 +469,11 @@ "Penataran maklumat repositori menyebabkan fail tidak sah jadi proses " "melaporkan pepijat dimulakan." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Sumber pihak ketiga dilumpuhkan." -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -482,13 +483,13 @@ "boleh membenarkannya semula selepas penataran melalui alat 'software-" "properties' atau pengurus pakej anda." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Keadaan pakej berada dalam keadaan tidak konsisten" msgstr[1] "Keadaan pakej berada dalam keadaan tidak konsisten" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -507,11 +508,11 @@ "tetapi tiada arkib yang berkenaan dengannya ditemui. Sila pasang semula " "pakej tersebut secara manual atau buangkannya dari sistem." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Ralat semasa pengemaskinian." -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -520,13 +521,13 @@ "berkaitan dengan rangkaian, sila semak sambungan rangkaian dan cuba sekali " "lagi." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Ruang cakera keras tidak mencukupi." -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -541,21 +542,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Mengira perubahan" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Anda mahu mulakan penataran?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Penataran dibatalkan" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -563,12 +564,12 @@ "Penataran akan dibatalkan sekarang dan keadaan sistem asal akan dipulihkan. " "Anda boleh sambung semula penataran dilain masa." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Pakej-pakej penaikan taraf tidak dapat dicapai." -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -579,27 +580,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Ralat semasa perlaksanaan" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Mengembalikan sistem ke keadaan asal." -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Pakej-pakej gagal dinaiktaraf." #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -607,7 +608,7 @@ "Penataran telah diabaikan. Sistem anda mungkin dalam keadaan tidak stabil. " "Pemulihan akan dijalankan )dkpg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -624,7 +625,7 @@ "didalam /var/log/dist-upgrade/ ke laporan pepijat.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -632,20 +633,20 @@ "Penataran telah diabaikan. Sila semak sambungan Internet atau media " "pemasangan anda dan cuba lagi. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Buang pakej luput?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Kekalkan" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Buang" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -655,27 +656,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Keperluan yang diperlukan tidak dipasang" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Dependensi %s yang diperlukan tidak dipasang. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Memeriksa pengurus pakej" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Persediaan penataran telah gagal" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -683,11 +684,11 @@ "Penyediaan sistem untuk tatar gagal maka proses pelaporan pepijat sedang " "dimulakan." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Mendapatkan prasyarat penataran gagal" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -699,68 +700,68 @@ "\n" "Disamping itu, satu proses pelaporan pepijat dimulakan." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Mengemaskini maklumat repositori" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Gagal menambah ke cdrom" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Maaf, penambahan ke cdrom tidak berjaya." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Maklumat pakej tidah sah" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Mengambil" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Menatarkan" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Penataran Selesai" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "Penataran selesai tetapi terdapat ralat semasa proses penataran." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Menggelintar perisian luput" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Penataran sistem telah selesai." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Penataran separa telah selesai." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms sedang digunakan" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -770,11 +771,11 @@ "'evms' tidak lagi disokong, sila tutupkannya dan jalankan penataran sekali " "lagi bila tindakan ini selesai dijalankan." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "Perkakasan grafik anda tidak menyokong sepenuhnya Ubuntu 12.04 LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -786,9 +787,9 @@ "lanjut rujuk https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx Anda " "hendak teruskan penataran?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -796,8 +797,8 @@ "Penataran akan mengurangkan kesan desktop, dan prestasi didalam permainan " "serta program bergrafik tinggi yang lain." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -811,7 +812,7 @@ "\n" "Adakah anda ingin meneruskannya?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -825,11 +826,11 @@ "\n" "Adakah anda ingin meneruskannya?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "CPU No i686" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -841,11 +842,11 @@ "senibina minimum. Adalah tidak mungkin menatar sistem anda kepada pelepasan " "Ubuntu baru dengan perkakasan ini." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Tiada CPU ARMv6" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -857,11 +858,11 @@ "sebagai senibina yang minimum. Adalah tidak mungkin sistem anda boleh " "ditatarkan kepada pelepasan Ubuntu yang terbaru menggunakan perkakasan ini." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Tiada init" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -876,17 +877,17 @@ "\n" "Adakah anda ingin meneruskannya?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Tatar kotak pasir menggunakan aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Gunakan laluan yang diberikan untuk menggelintar cdrom dengan pakej boleh " "tatar" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -894,57 +895,57 @@ "Guna bahagian hadapan. Ada buat masa ini: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*LAPUK* pilihan ini akan diabaikan" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "Lakukan penataran separa sahaja (tiada sources.list ditulis semula)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Lumpuhkan sokongan skrin GNU" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Tetapkan datadir" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Sila masukkan '%s' kedalam pemacu '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Pengambilan Selesai" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Memperoleh fail %li dari %li pada kelajuan %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Kira-kira %s berbaki" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Memperoleh fail %li dari %li" @@ -954,27 +955,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Melaksanakan perubahan" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "Masalah dependensi - dibiarkan tidak berkonfigurasi" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Tidak dapat memasang '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -986,7 +987,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -997,7 +998,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1005,20 +1006,20 @@ "Akan akan kehilangan perubahan yang anda lakukan pada fail konfigurasi ini " "jika anda memilih untuk menggantikannya dengan versi yang terbaru." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Perintah 'diff' tidak ditemui" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Ralat mati berlaku" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1031,13 +1032,13 @@ "Sources.list asal anda telah disimpan didalam etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c ditekan" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1046,134 +1047,134 @@ "dalam keadaan rosak. Adakah anda pasti ingin melakukannya?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "Untuk mengelakkan kehilangan data tutup semua aplikasi dan dokumen." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Tidak lagi disokong oleh Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Turun Taraf (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Buang (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Tidak lagi diperlukan (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Pasang (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Tatar (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Perubahan Media" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Papar Perubahan >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Sembunyi Perubahan" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Ralat" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Batal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Tutup" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Papar Terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Sembunyi Terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Maklumat" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Perincian" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Tidak lagi disokong %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Buang %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Buang (dipasang secara automatik) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Pasang %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Tatar %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Mula semula diperlukan" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Mula semula sistem untuk melengkapkan penataran" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Mula Semula Sekarang" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1185,32 +1186,32 @@ "Sistem mungkin tidak stabil jika anda batalkan penataran. Anda sangat " "disarankan menyambung semula penataran tersebut." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Batalkan Penataran?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li hari" msgstr[1] "%li hari" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li jam" msgstr[1] "%li jam" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minit" msgstr[1] "%li minit" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1226,7 +1227,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1240,14 +1241,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1257,35 +1258,33 @@ "dan kira-kira %s dengan modem 56k." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" "Muat turun ini akan mengambil masa kira-kira %s dengan sambungan anda. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Persediaan untuk penataran" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Mendapatkan saluran perisian baru" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Mendapatkan pakej baru" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Memasang tatar" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Membersihkan" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1302,28 +1301,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d pakej yang akan dibuang." msgstr[1] "%d pakej yang akan dibuang." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d pakej baru yang akan dipasang." msgstr[1] "%d pakej baru yang akan dipasang." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d pakej yang akan ditatarkan." msgstr[1] "%d pakej yang akan ditatarkan." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1334,7 +1333,7 @@ "\n" "Anda mesti memuat sejumlah %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1342,7 +1341,7 @@ "Pemasangan tatar boleh mengambil masa beberapa jam. Bilamana muat turun " "selesai, proses tidak boleh dibatalkan." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1350,54 +1349,54 @@ "Mendapatkan dan memasang tatar boleh mengambil masa beberapa jam. Bila muat " "turun selesai, proses tidak boleh dibatalkan." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Pembuangan pakej boleh mengambil masa beberapa jam. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Perisian pada komputer ini sudah dikemaskini." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" "Tiada penataran ada untuk sistem anda. Penataran akan dibatalkan sekarang." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "But semula Diperlukan" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Penataran sudah selesai dan but semula diperlukan. Adakah anda ingin " "melakukannya sekarang?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "sahihkan '%(file)s' terhadap '%(signature)s' " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "mengekstrak '%s'" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Tidak dapat menjalankan alat penataran" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1405,34 +1404,34 @@ "Ini mungkin disebabkan pepijat didalam alat tatar. Sila laporkannya sebagai " "pepijat menggunakan perintah 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Tandatangan alat penataran" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Alat penataran" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Gagal mengambil" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "Proses memperoleh penataran gagal. Mungkin terdapat masalah rangkaian. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Penyahihan gagal" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1440,13 +1439,13 @@ "Pengesahan menatar gagal. Mungkin terdapat masalah dengan rangkaian atau " "dengan pelayan. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Gagal mengekstrak" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1454,13 +1453,13 @@ "Proses mengekstrak penataran gagal. Mungkin terdapat masalah dengan " "rangkaian atau dengan pelayan. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Pengesahan gagal" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1468,15 +1467,15 @@ "Pengesahan menatar gagal. Mungkin terdapat masalah dengan rangkaian atau " "dengan pelayan. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Tidak dapat menjalankan penataran" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1484,13 +1483,13 @@ "Ini biasanya disebabkan oleh sistem yang mana /tmp melekapkan noexec. Sila " "nyahlekap noexec dan jalankan tatar lagi." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Mesej ralat ialah '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1503,73 +1502,73 @@ "Sources.list asal anda telah disimpan didalam etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Dihenti Paksa" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Turun Taraf:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Untuk teruskan tekan [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Teruskan [yT] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Perincian [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Tidak lagi disokong: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Buang: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Pasang: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Tatar: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Teruskan [Yt] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1636,9 +1635,8 @@ msgstr "Tatar Distribusi" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Tatar Ubuntu ke versi 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Menatar Ubuntu ke versi 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1656,85 +1654,86 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Sila tunggu, tindakan ini akan mengambil masa." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Kemaskini selesai" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Tidak dapat mendapatkan nota pelepasan" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Pelayan mungkin terlalu sibuk. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Tidak dapat memuat turun nota pelepasan" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Sila semak sambungan internet anda." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Penataran" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Nota pelepasan" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Memuat turun fail pakej tambahan..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Fail %s dari %s pada kelajuan %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Fail %s dari %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Buka Pautan kedalam Pelayar" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Salin Pautan ke Papan Keratan" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" "Memuat turun fail %(current)li dari %(total)li dengan kelajuan %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Memuat turun fail %(current)li dari %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Pelepasan Ubuntu anda tidak lagi disokong." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1742,53 +1741,59 @@ "Anda tidak akan dapat sebarang pembaikan keselematan atai kemaskini " "kritikal. Sila tatar ke versi terkini Ubuntu." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Maklumat Penataran" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Pasang" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Nama" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Versi %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Tiada sambungan rangkaian dikesan, anda tidak boleh memuat turun maklumat " "log perubahan." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Memuat turun senarai perubahan..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Nyahpilih Semua" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Pilih _Semua" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s kemaskini telah dipilih." +msgstr[1] "%(count)s kemaskini telah dipilih." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s akan dimuat turun." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "Kemaskini sudah dimuat turun, tetapi tidak dipasang." msgstr[1] "Kemaskini sudah dimuat turun, tetapi tidak dipasang." @@ -1796,11 +1801,18 @@ msgid "There are no updates to install." msgstr "Tiada kemaskini untuk dipasangkan." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Saiz muat turun tidak diketahui." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1808,7 +1820,7 @@ "Adalah tidak diketahui bila maklumat pakej telah dikemaskini kali teralhir. " "Sila klik butang 'Semak' untuk kemaskinikan maklumat." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1817,14 +1829,14 @@ "Maklumat pakej telah dikemaskini %(days_ago)s hari yang lalu.\n" "Tekan butang 'Semak' untuk periksa kemaskini perisian baru." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "Maklumat pakej telah dikemaskini %(days_ago)s hari yang lalu." msgstr[1] "Maklumat pakej telah dikemaskini %(days_ago)s hari yang lalu." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1833,34 +1845,45 @@ msgstr[1] "Maklumat pakej telah dikemaskini %(hours_ago)s jam yang lalu." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Maklumat pakej telah dikemaskinikan kira-kira %s minit yang lalu." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Maklumat pakej telah dikemaskini." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Pengemaskinian perisian membetulkan ralat, menghapuskan kerentanan dan " +"menyediakan sifat-sifat baru." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Kemaskini perisian mungkin ada untuk komputer anda." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Selamat datang ke Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Kemaskini perisian ini telah diisukan semenjak versi Ubuntu ini dilepaskan." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Kemaskini perisian tersedia untuk komputer ini." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1872,7 +1895,7 @@ "sampah anda dan buang pakej sementara semasa pemasangan lepas dengan menaip " "'sudo apt-get clean'." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1880,24 +1903,24 @@ "Komputer perlu dmulakan semula untuk menyelesaikan pemasangan kemaskini. " "Sila simpan kerja anda sebelum anda meneruskan." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Membaca maklumat pakej" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Menyambung..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Anda mungkin tidak boleh menyemak kemaskini atau muat turun kemaskini baru." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Tidak dapat mengasal maklumat" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1911,7 +1934,7 @@ "Sila laporkan pepijat ini terhadap pakej 'update-manager' dan sertakan mesej " "ralat berikut:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1923,31 +1946,31 @@ "Sila laporkan pepijat ini mengenai pakej 'pengurus-kemaskini' dan sertakan " "mesej ralat berikut:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Pasang baru)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Saiz: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Dari versi %(old_version)s kepada %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Versi %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Pelepasan penataran adalah tidak mungkin buat masa ini" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1956,21 +1979,21 @@ "Pelepasan penataran tidak boleh dilakukan buat masa ini, sila cuba lagi " "dilain masa. Pelayan melaporkan: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Memuat turun alat pelepasan tatar" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Pelepasan Ubuntu Baru '%s' sudah ada" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Indeks perisian telah rosak" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1980,6 +2003,17 @@ "pengurus pakej \"Synaptic\" atau jalankan arahan \"sudo apt-get install -f\" " "dalam terminal untuk membaiki masalah ini." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Pelepasan terbaru '%s' ada." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Batal" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Semak Kemaskini" @@ -1989,22 +2023,18 @@ msgstr "Pasang Semua Kemaskini yang Ada" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Batal" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Log Perubahan" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Kemaskini" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Membina Senarai Kemaskini" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2028,20 +2058,20 @@ "* Pakej perisian tidak rasmi yang bukan disediakan oleh Ubuntu\n" "* Perubahan biasa versi Ubuntu pra-pelepasan" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Memuat turun changelog" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Kemaskini lain (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "Kemaskini ini tidak berasal dari sumber yang menyokong log perubahan." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2049,7 +2079,7 @@ "Gagal muat turun senarai perubahan.\n" "Sila periksa sambungan Internet anda." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2062,7 +2092,7 @@ "Versi yang ada: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2075,7 +2105,7 @@ "Sila gunakan http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "sehingga perubahan sudah ada atau cuba lagi kemudian." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2088,52 +2118,43 @@ "Sila gunakan http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "sehingga senarai perubahan ada atau cuba lagi kemudian." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Gagal mengesan distribusi" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Ralat '%s' berlaku semasa menyemak sistem apakah yang anda gunakan." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Kemaskini keselamatan penting" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Kemaskini yang disarankan" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Kemaskini yang dicadangkan" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Port Belakang" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Kemaskini distribusi" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Kemaskini lain" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Memulakan Pengurus Kemaskini" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Pengemaskinian perisian membetulkan ralat, menghapuskan kerentanan dan " -"menyediakan sifat-sifat baru." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Tatar Separa" @@ -2206,37 +2227,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Kemaskini Perisian" +msgid "Update Manager" +msgstr "Pengurus Kemaskini" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Kemaskini Perisian" +msgid "Starting Update Manager" +msgstr "Memulakan Pengurus Kemaskini" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "Tata_r" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "kemaskini" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Pasang" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Perubahan" +msgid "updates" +msgstr "kemaskini" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Keterangan" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Keterangan kemaskini" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2244,25 +2255,35 @@ "Anda telah bersambung melalui perayauan dan mungkin akan dicas berdasarkan " "data yang dimuat turun melalui kemaskini ini." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Anda telah bersambung melalui mode tanpa wayar." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Adalah selamat untuk menyambung komputer dengan kuasa AC sebelum " "mengenaskini." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Pasang Kemaskini" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Perubahan" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Tetapan..." +msgid "Description" +msgstr "Keterangan" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Pasang" +msgid "Description of update" +msgstr "Keterangan kemaskini" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Tetapan..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2286,9 +2307,8 @@ msgstr "Anda telah menolak untuk menatar ke Ubuntu baru" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Anda boleh menatar dilain masa dengan membuka Pengurus Kemaskini dan klik " @@ -2302,57 +2322,57 @@ msgid "Show and install available updates" msgstr "Papar dan pasang kemaskini yang ada" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Papar versi dan keluar" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Direktori yang mengandungi fail data" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Semak jika pelepasan Ubuntu baru sudah ada" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Semak jika menatar ke pelepasan devel terkini jika boleh" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "Tatar menggunakan versi cadangan terkini dari penatar pelepasan" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Jangan fokus pada peta bila dimulakan" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Cuba jalankan penataran-distro" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Jangan semak kemaskini semasa permulaan" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Uji penataran dengan tindihan atas aufs bagi kotak pasir" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Menjalankan penataran separa" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Papar keterangan pakej selain dari log perubahan" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Cuba menatar pelepasan terkini menggunakan penatar dari $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2362,11 +2382,11 @@ "Buat masa ini penataran biasa sistem desktop untuk 'desktop' dan sistem " "pelayan untuk 'pelayan' disokong." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Jalankan bahagian hadapan (frontend) yang ditentukan" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2374,11 +2394,11 @@ "Semak jika pelepasan distribusi baru sudah ada dan laporkan keputusan " "melalui kod keluar." -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Menyemak keluaran Ubuntu baru" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2386,59 +2406,59 @@ "Maklumat penataran, sila lawati:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Tiada pelepasan terbaru ditemui" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Pelepasan terbaru '%s' ada." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Jalankan 'do-release-upgrade' untuk menatarkannya." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Penataran Ubuntu %(version)s Sudah Ada" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Anda telah menolak penataran Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Tambah output nyahpepijat" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Papar pakej tidak disokong pada mesin ini" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Papar pakej disokong pada mesin ini" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Papar semua pakej dengan status mereka" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Papar semua pakej dalam senarai" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Sokong ringkasan status bagi '%s':" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" "Anda mempunyai %(num)s pakej (%(percent).1f%%) disokong sehingga %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" @@ -2446,12 +2466,12 @@ "Anda mempunyai %(num)s pakej (%(percent).1f%%) yang tidak/tiada lagi dimuat " "turun" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" "Anda mempunyai %(num)s pakej (%(percent).1f%%) yang mana tidak disokong" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2459,123 +2479,153 @@ "Jalan dengan --show-unsupported, --show-supported or --show-all untuk lihat " "lagi perincian" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Tiada lagi boleh dimuat turun:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Tidak disokong: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Disokong sehingga %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Tidak Disokong" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Kaedah tidak dilaksanakan: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Fail pada cakera" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "Pakej .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Pasang pakej yang hilang" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Pakej %s perlu dirpasang terlebih dahulu" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "Pakej .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s perlu ditanda sebagai dipasang secara manual." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"Semasa menatar, jika kdelibs4-dev dipasang, kdelibs5-dev perlu juga " -"dipasang. Rujuk bugs.launchpad.net pepijat #279621 untuk perincian." - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i masukan lapuk didalam fail statud" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Masukan lapuk didalam status dpkg" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Masukan status dpkg lapuk" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"Semasa menatar, jika kdelibs4-dev dipasang, kdelibs5-dev perlu juga " +"dipasang. Rujuk bugs.launchpad.net pepijat #279621 untuk perincian." + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s perlu ditanda sebagai dipasang secara manual." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Buang lilo kerana grub sudah dipasang. (Rujuk pepijat #314004 untuk " "perincian.)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Selepas maklumat pakej anda dikemaskini, pakej penting '%s' tidak dapat " -#~ "ditemui lagi jadi proses melaporkan pepijat dimulakan." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Menatar Ubuntu ke versi 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s kemaskini telah dipilih." -#~ msgstr[1] "%(count)s kemaskini telah dipilih." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Selamat datang ke Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Kemaskini perisian ini telah diisukan semenjak versi Ubuntu ini " -#~ "dilepaskan." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Kemaskini perisian tersedia untuk komputer ini." - -#~ msgid "Update Manager" -#~ msgstr "Pengurus Kemaskini" - -#~ msgid "Starting Update Manager" -#~ msgstr "Memulakan Pengurus Kemaskini" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Anda telah bersambung melalui mode tanpa wayar." - -#~ msgid "_Install Updates" -#~ msgstr "_Pasang Kemaskini" +#~ "Selepas maklumat pakej anda dikemaskini, pakej penting '%s' tidak dapat " +#~ "ditemui lagi jadi proses melaporkan pepijat dimulakan." #~ msgid "" #~ "This upgrade is running in sandbox (test) mode. All changes are written " @@ -2664,6 +2714,9 @@ #~ "laporkan pepijat ini menggunakan perintah 'ubuntu-bug update-manager' di " #~ "terminal." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Tatar Ubuntu ke versi 11.10" + #~ msgid "" #~ "Preparing the system for the upgrade failed. Please report this using the " #~ "command 'ubuntu-bug update-manager' in a terminal and include the files " diff -Nru update-manager-17.10.11/po/mus.po update-manager-0.156.14.15/po/mus.po --- update-manager-17.10.11/po/mus.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/mus.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2008. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2009-06-29 02:45+0000\n" "Last-Translator: Michael Vogt \n" "Language-Team: Creek \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "" @@ -42,30 +43,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -75,13 +76,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -96,22 +97,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -124,65 +125,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -191,25 +192,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -218,11 +219,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -233,11 +234,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -245,7 +246,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -254,29 +255,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -286,28 +287,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -315,11 +316,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -331,16 +332,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -353,11 +354,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -366,34 +367,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -406,23 +407,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -433,32 +434,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -466,33 +467,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -503,26 +504,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -530,37 +531,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -568,79 +569,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -648,16 +649,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -666,7 +667,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -675,11 +676,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -687,11 +688,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -699,11 +700,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -713,71 +714,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -787,27 +788,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -817,7 +818,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -826,26 +827,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -853,147 +854,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1001,32 +1002,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1042,7 +1043,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1056,14 +1057,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1071,34 +1072,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1111,28 +1110,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1140,145 +1139,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1286,73 +1285,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1410,7 +1409,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1429,133 +1428,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1563,31 +1570,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1596,34 +1610,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1631,29 +1653,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1662,7 +1684,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1670,58 +1692,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1731,22 +1763,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1760,26 +1788,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1788,7 +1816,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1797,7 +1825,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1806,47 +1834,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1907,54 +1929,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1979,7 +2004,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1991,216 +2016,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/my.po update-manager-0.156.14.15/po/my.po --- update-manager-17.10.11/po/my.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/my.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2012. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-04-08 11:58+0000\n" "Last-Translator: Pyae Sone \n" "Language-Team: Burmese \n" @@ -20,20 +21,20 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" msgstr[0] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Server for %s" @@ -41,30 +42,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "အဓိကဆာဗာ" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Custom servers" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -74,13 +75,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -95,15 +96,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "အပြည့်အစုံမပါသော Pakage များ" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -112,7 +113,7 @@ "software. Please fix them first using synaptic or apt-get before proceeding." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -125,26 +126,26 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Upgrade ကိုမတွက်ချက်နိုင်ပါ။" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -154,28 +155,28 @@ "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "'%s' ကိုမသွင်းနိုင်ပါ။" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -184,11 +185,11 @@ "using 'ubuntu-bug update-manager' in a terminal." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Can't guess meta-package" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -202,25 +203,25 @@ " Please install one of the packages above first using synaptic or apt-get " "before proceeding." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -229,11 +230,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -244,11 +245,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -256,7 +257,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -265,29 +266,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Upgrade မတင်နိုင်ပါ။" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -297,28 +298,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -326,11 +327,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -342,16 +343,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -364,11 +365,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -377,34 +378,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -417,23 +418,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -444,32 +445,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -477,33 +478,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -514,26 +515,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -541,37 +542,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -579,79 +580,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -659,16 +660,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -677,7 +678,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -686,11 +687,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -698,11 +699,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -710,11 +711,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -724,71 +725,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -798,27 +799,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -828,7 +829,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -837,26 +838,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -864,147 +865,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1012,32 +1013,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1053,7 +1054,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1067,14 +1068,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1082,34 +1083,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1122,28 +1121,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1151,145 +1150,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1297,73 +1296,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1421,7 +1420,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1440,164 +1439,180 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1606,34 +1621,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1641,29 +1664,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1672,7 +1695,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1680,58 +1703,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1741,22 +1774,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1770,26 +1799,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1798,7 +1827,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1807,7 +1836,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1816,47 +1845,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1917,54 +1940,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1989,7 +2015,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -2001,216 +2027,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/nb.po update-manager-0.156.14.15/po/nb.po --- update-manager-17.10.11/po/nb.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/nb.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. # Terance Edward Sola , 2005. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-02-26 19:53+0000\n" "Last-Translator: Mathias Bynke \n" "Language-Team: Norwegian Bokmal \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Tjener for %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Hovedtjener" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Egendefinerte tjenere" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Kunne ikke kalkulere sources.list-oppføringen" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Kunne ikke finne noen pakkefiler. Kanskje dette ikke er en Ubuntu-disk, " "eller feil arkitektur?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Kunne ikke legge til CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,13 +83,13 @@ "Feilmeldingen var:\n" "«%s»" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Fjern ødelagt pakke" msgstr[1] "Fjern ødelagte pakker" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -107,15 +108,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Tjeneren kan være opptatt" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Skadede pakker" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -125,7 +126,7 @@ "apt-get før du fortsetter." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -147,13 +148,13 @@ " * Uoffisielle programpakker som ikke kommer fra Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Dette er sannsynligvis bare ett midlertidig problem, vennligst prøv igjen " "senere." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -161,16 +162,16 @@ "Hvis dette ikke gjelder, vennligst rapporter feilen ved å bruke kommandoen " "'ubuntu-bug update-manager' i en terminal." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Kunne ikke forberede oppgraderingen" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Kunne ikke autentisere alle pakker" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -180,28 +181,28 @@ "nettverksproblem, du kan prøve igjen senere. Under vises en liste over " "pakker som ikke kunne bekreftes." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "Pakken '%s' er merket for fjerning men er i svartelisten for fjerning." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Den absolutt nødvendige pakken '%s' er merket for fjerning." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Forsøker å installere svartelistet versjon '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Kan ikke installere «%s»" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -211,11 +212,11 @@ "terminal." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Kan ikke gjette meta-pakke" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -229,15 +230,15 @@ "Installer én av de nevnte pakkene ved å bruke synaptic eller apt-get før du " "fortsetter." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Leser mellomlager" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Klarte ikke å få eksklusiv tilgang" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -245,11 +246,11 @@ "Dette betyr vanligvis at et annet pakkehåndteringsprogram, som apt-get eller " "aptitude, allerede kjører. Lukk det programmet først." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Oppgradering over fjerntilkobling er ikke støttet" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -263,11 +264,11 @@ "\n" "Oppgraderingen vil nå avbryte. Vennligst forsøk uten ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Fortsett å kjøre via SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -283,11 +284,11 @@ "Hvis du fortsetter vil en ekstra ssh-tjeneste startes på port '%s'.\n" "Ønsker du å fortsette?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Starter enda en sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -298,7 +299,7 @@ "på port '%s'. Dersom noe går galt med den kjørende sshd kan du fortsatt " "koble til denne.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -311,29 +312,29 @@ "åpne porten med f.eks:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Kan ikke oppgradere" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "En oppgradering fra «%s» til «%s» er ikke støttet av dette verktøyet." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Sandkasseoppsett feilet" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Kunne ikke opprette sandkasse." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Sandkassemodus" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -343,18 +344,18 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Din pythoninstallasjon er skadet. Du må rette opp den symbolske lenken «/usr/" "bin/python»." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Pakken «debsig-verify» er installert" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -364,12 +365,12 @@ "Vennligst fjern den med synaptic eller «apt-get remove debsig-verify» først " "og kjør oppgraderingen igjen." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Kan ikke skrive til '%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -377,11 +378,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Inkluder de siste oppdateringene fra Internett?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -401,16 +402,16 @@ "de siste oppdateringene så fort som mulig etter oppdatering.\n" "Svarer du \"nei\" her, blir ikke internett brukt i det hele tatt." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "deaktivert under oppgradering til %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Fant ikke ingen gyldige tjenere" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -430,11 +431,11 @@ "oppgraderingen avbrytes." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Vil du bruke standardkilder?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -448,21 +449,21 @@ "Skal standardverdier for '%s' legges til? Hvis du velger 'nei' vil " "oppgraderingen avbrytes." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Ugyldig informasjon om pakkekilder" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Tredjepartskilder er deaktivert" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -472,13 +473,13 @@ "aktivere dem etter oppgraderingen ved med «Egenskaper for programvare» eller " "med Synaptic." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Pakke er ufullstendig" msgstr[1] "Pakker er ufullstendig" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -496,11 +497,11 @@ "nødvendige arkivene ble funnet. Reinstaller pakkene manuelt eller fjern dem " "fra systemet." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Feil under oppdatering" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -509,13 +510,13 @@ "problem med nettverket. Vennligst sjekk nettverkstilkoblingen din, og prøv " "igjen." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Ikke nok ledig diskplass" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -530,21 +531,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Kalkulerer endringene" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Ønsker du å starte oppgraderingen?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Oppgradering avbrutt" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -552,12 +553,12 @@ "Oppgraderingen vil nå avbryte og den opprinnelige systemtilstanden vil bli " "gjenopprettet. Du kan gjenoppta oppgraderingen på et senere tidspunkt." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Kunne ikke laste ned oppgraderingene" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -568,27 +569,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Feil under innsending" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Gjenoppretter systemets opprinnelige tilstand" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Kunne ikke installere oppgraderingene" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -596,7 +597,7 @@ "Oppgraderingen har blitt avbrutt. Systemet ditt kan være i en ubukelig " "tilstand. En gjenoppretting vil nå starte (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -607,7 +608,7 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -615,20 +616,20 @@ "Oppgraderingen ble avbrutt. Kontroller Internettilkoblingen eller " "installasjonsmedia og prøv igjen. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Ønsker du å fjerne utdaterte pakker?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Behold" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Fjern" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -638,37 +639,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Nødvendige avhengigheter er ikke installert" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Den nødvendige avhengigheten «%s» er ikke installert. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Undersøker pakkehåndtering" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Kunne ikke forberede oppgraderingen" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Nedlasting av programavhengigheter feilet" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -676,68 +677,68 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Oppdaterer informasjon om pakkekilder" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Klarte ikke å legge til CD-en" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Beklager; misyktes å legge til CD-en." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Ugyldig pakkeinformasjon" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Henter" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Oppgraderer" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Oppgraderingen er fullført" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "Oppgraderingen er fullført, men noen feil oppstod underveis." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Søker etter utdatert programvare" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Systemet er oppgradert." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Delvis oppgradering er fullført." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms i bruk" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -747,11 +748,11 @@ "Programvaren til «evms» er ikke lenger støttet, vennligst slå den av og kjør " "oppdateringen på nytt." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -759,9 +760,9 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -769,8 +770,8 @@ "Å oppgradere kan gå på bekostning av skrivebordseffekter, samt ytelse i " "spill og andre grafikkintensive programmer." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -784,7 +785,7 @@ "\n" "Ønsker du å fortsette?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -798,11 +799,11 @@ "\n" "Ønsker du å fortsette?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Ikke en i686 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -814,11 +815,11 @@ "er ikke mulig å oppgradere dette systemet til en ny versjon av Ubuntu med " "den nåværende komponentoppsett." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Ingen ARMv6 prosessor" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -830,11 +831,11 @@ "er ikke mulig å oppgradere systemet ditt til en ny Ubuntu versjon på dette " "systemet." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Ingen oppstartsprogrammer (init) tilgjengelig" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -850,15 +851,15 @@ "\n" "Ønsker du å fortsette?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Sandkasseoppgradering ved bruk av aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Bruk den angitte stien til å søke etter cdrom med oppgraderbare pakker" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -866,57 +867,57 @@ "Bruk et grafisk grensesnitt. Tilgjengelige: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*FORELDET* dette valget vil bli ignorert" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "Gjør kun en delvis oppgradering (overskriver ikke sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Deaktiver GNU skjermstøtte" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Bestem datakatalog" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Sett inn «%s» i «%s»-leseren" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Ferdig med å hente" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Henter fil %li av %li ved %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Omtrent %s gjenstår" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Henter fil %li av %li" @@ -926,27 +927,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Utfører endringer" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "avhengighetsproblem - setter ikke opp pakken" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Kunne ikke installere '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -958,7 +959,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -969,7 +970,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -977,20 +978,20 @@ "Du vil miste forandringer du har gjort i denne konfigureringsfilen om du " "velger å bruke en nyere versjon." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Kommandoen «diff» ble ikke funnet" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Det oppstod en uopprettelig feil" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1002,13 +1003,13 @@ "log i rapporten. Oppgraderingen er avbrutt.\n" "Den opprinnelige sources.list ble lagret i /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c trykket" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1017,136 +1018,136 @@ "ubrukelig tilstand. Er du sikker på at du vil gjøre dette?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "For å forhindre tap av data bør du lukke alle åpne programmer og dokumenter." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Støttes ikke lenger av Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Nedgrader (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Fjern (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Ikke nødvendig lenger (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Installer (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Oppgrader (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Medieendring" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Vis forskjeller >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Skjul forskjeller" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Feil" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Avbryt" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Lukk" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Vis Terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Skjul Terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Informasjon" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Detaljer" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Støttes ikke lenger (%s)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Fjern %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Fjern (ble automatisk installert) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Installer %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Oppgrader %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Omstart er nødvendig" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" "Gjør en omstart av systemet for å fullføre oppgraderingen" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Start maskinen på nytt nå" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1158,32 +1159,32 @@ "Systemet ditt kan bli satt i en ustabil tilstad hvis du avbryter " "oppgraderingen. Det er på det sterkeste anbefalt å fortsette oppgraderingen." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Avbryt oppgradering?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li dag" msgstr[1] "%li dager" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li time" msgstr[1] "%li timer" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minutt" msgstr[1] "%li minutter" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1199,7 +1200,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1213,14 +1214,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1230,34 +1231,32 @@ "et 56k-modem." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Denne nedlastingen vil ta ca. %s med denne forbindelsen. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Forbereder oppgraderingen" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Henter nye programvarekanaler." -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Henter nye programvarepakker" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Installerer oppgraderingene" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Rydder opp" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1274,28 +1273,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d pakke vil fjernes." msgstr[1] "%d pakker vil fjernes." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d pakke vil bli installert." msgstr[1] "%d pakker vil bli installert." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d pakke vil bli oppgradert." msgstr[1] "%d pakker vil bli oppgradert." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1306,7 +1305,7 @@ "\n" "Du må laste ned totalt %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1314,7 +1313,7 @@ "Det kan ta flere timer å installere oppgraderingen. Så snart nedlastingen er " "ferdig, kan oppgraderingen ikke lenger avbrytes." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1322,16 +1321,16 @@ "Det kan ta flere timer å laste ned og installere oppgraderingen. Så snart " "nedlastingen er ferdig, kan oppgraderingen ikke lenger avbrytes." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Det kan ta flere timer å fjerne pakkene. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Programvaren på denne maskinen er oppdatert." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1339,38 +1338,38 @@ "Det finnes ingen tilgjengelige oppgraderinger for systemet. Oppgraderingen " "vil avbrytes." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Omstart av systemet er nødvendig" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Oppgraderingen er fullført og en omstart av systemet er nødvendig. Vil du " "gjøre dette nå?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "pakker ut «%s»" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Kunne ikke kjøre oppgraderingsverktøyet" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1379,33 +1378,33 @@ "rapporter denne feilen ved å bruke kommandoen 'ubuntu-bug update-manager' i " "en terminal." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Signatur for oppgraderingsverktøyet" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Oppgraderingsverktøy" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Kunne ikke hente" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Klarte ikke å hente oppgraderingen. Det kan være nettverksproblemer. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Autentiseringen mislyktes" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1413,13 +1412,13 @@ "Klarte ikke å bekrefte at oppgraderingen er ekte. Det kan være en feil med " "nettverket eller med tjeneren. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Utpakking mislyktes" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1427,13 +1426,13 @@ "Klarte ikke å pakke ut oppgraderingen. Det kan være et problem med " "nettverket eller tjeneren. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Verifiseringsfeil" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1441,15 +1440,15 @@ "Kunne ikke bekrefte oppgraderingen. Det kan være en feil med nettverket " "eller tjeneren. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Kan ikke kjøre oppgraderingen" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1457,13 +1456,13 @@ "Dette skyldes vanligvis at /tmp er montert med valget noexec. Vennligst " "monter /tmp på nytt uten noexec og start oppgraderingen på nytt." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Feilmeldingen er '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1475,73 +1474,73 @@ "avbrutt.\n" "Den opprinnelige sources.list ble lagret i /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Avbryter" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Nedgradert:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Trykk [ENTER] for å fortsette" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "_Fortsett [jN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Detaljer [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "j" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Støttes ikke lenger: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Fjern %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Installer: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Oppgrader: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Fortsett [Jn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1608,9 +1607,8 @@ msgstr "Distribusjonsoppgradering" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Oppgraderer Ubuntu til versjon 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Oppgraderer Ubuntu til versjon 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1628,136 +1626,143 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Vennligst vent, dette kan ta litt tid." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Oppdateringen er fullført" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Kunne ikke finne utgivelsesmeldingen" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Tjeneren kan være overbelastet. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Kunne ikke laste ned utgivelsesmeldingen." -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Vennligst kontoller forbindelsen til Internett." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Oppgradér" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Utgivelsesmelding" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Laster ned ekstra pakkefiler..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Fil %s av %s ved %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Fil %s av %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Åpne lenke i nettleser" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Kopier lenke til utklippstavlen" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Laster ned filen %(current)li av %(total)li med %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Laster ned fil %(current)li av %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Din Ubuntuutgivelse støttes ikke lenger." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Oppgraderingsinformasjon" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Installér" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Versjon %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Fant ingen nettverkstilkopling. Du kan derfor ikke laste ned informasjon om " "endringsloggen." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Laster ned listen over endringer..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Velg bort alle" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Velg _alle" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s oppdatering er valgt." +msgstr[1] "%(count)s oppdateringer er valgt." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s vil bli lastet ned." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "Oppdateringen har blitt lastet ned, men ikke installert." msgstr[1] "Oppdateringene har blitt lastet ned, men ikke installert." @@ -1765,11 +1770,18 @@ msgid "There are no updates to install." msgstr "Ingen oppdateringer er tilgjengelige." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Ukjent nedlastingsstørrelse." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1777,7 +1789,7 @@ "Det er ukjent når pakkeinformasjon sist ble oppdatert. Klikk 'Sjekk'-knappen " "for å oppdatere informasjonen." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1786,14 +1798,14 @@ "Pakkeinformasjonen ble sist oppdatert for %(days_ago)s dager siden.\n" "Trykk på 'Sjekk'-knappen under for å se etter nye programvareoppdateringer." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "Pakkeinformasjonen ble sist oppdatert for %(days_ago)s dag siden." msgstr[1] "Pakkeinformasjonen ble sist oppdatert for %(days_ago)s dager siden." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1803,34 +1815,44 @@ "Pakkeinformasjonen ble sist oppdatert for %(hours_ago)s timer siden." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Pakkeinformasjonen ble sist oppdatert for %s minutter siden." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Pakkeinformasjonen ble nettopp oppdatert." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Programvareoppdateringer retter opp feil, tetter sikkerhetshull og tilbyr " +"nye funksjoner." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Programvareoppdateringer kan være tilgjengelige for din datamaskin." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Velkommen til Ubuntu" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1841,7 +1863,7 @@ "minst %s diskplass ledig på «%s». Tøm papirkurven, og fjern midlertidige " "pakker fra gamle installasjoner ved å kjøre «sudo apt-get clean»." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1849,24 +1871,24 @@ "Datamaskinen må startes på nytt for å ferdiggjøre installeringen av " "oppdateringene. Vennligst lagre arbeidet før du fortsetter." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Leser pakkeinformasjon" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Kobler til…" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Det kan hende du ikke kan se etter nye oppdateringer eller laste dem ned." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Klarte ikke forberede pakkeinformasjonen" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1879,7 +1901,7 @@ "Vennligst rapporter denne feilen for 'update-manager'-pakken og legg ved " "følgende feilmelding:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1891,31 +1913,31 @@ "Vennligst rapporter denne feilen i 'update-manager'-pakken og legg ved " "følgende feilmelding:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Ny installasjon)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Størrelse: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Fra versjon %(old_version)s til %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Versjon %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Oppgradering til ny utgave er for øyeblikket ikke mulig" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1924,21 +1946,21 @@ "Oppgradering til ny utgave kan ikke utføres for øyeblikket. Prøv igjen " "senere. Tjeneren svarte med: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Laster ned oppgraderingsverktøyet for utgivelsen" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Ubuntu-utgivelse '%s' er nå tilgjengelig" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Programvareregisteret er skadet." -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1948,6 +1970,17 @@ "pakkebehandleren «Synaptic» eller «sudo aptitude -f install» i en terminal " "for å rette opp dette problemet." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Ny versjon «%s» er tilgjengelig." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Avbryt" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Se etter oppdateringer" @@ -1957,22 +1990,18 @@ msgstr "Installer alle tilgjengelige oppdateringer" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Avbryt" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Endringslogg" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Oppdateringer" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Bygger liste over oppdateringer" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1996,21 +2025,21 @@ " * Uoffisielle pakker som ikke tilbys av Ubuntu\n" " * Vanlige endringer i en Ubuntu-utgave som fortsatt er under utvikling" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Laster ned endringslogg" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Andre oppdateringer (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" "Denne oppdateringen kommer fra en kilde som ikke støtte endringslogger." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2018,7 +2047,7 @@ "Kunne ikke laste ned listen med endringer. \n" "Vennligst kontroller forbindelsen til Internett." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2031,7 +2060,7 @@ "Tilgjengelig versjon: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2044,7 +2073,7 @@ "Bruk http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "til endringene blir tilgjengelige, eller prøv igjen senere." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2057,52 +2086,43 @@ "Bruk http://launchpad.net/ubuntu/+source/%s/%s/+changelog, eller prøv igjen " "senere." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Klarte ikke å finne distribusjonstype" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Feilen '%s' skjedde mens det ble sjekket hvilket system du bruker." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Viktige sikkerhetsoppdateringer" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Anbefalte oppdateringer" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Foreslåtte oppdateringer" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backports" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Distribusjonsoppdateringer" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Andre oppdateringer" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Starter håndtering av oppdateringer" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Programvareoppdateringer retter opp feil, tetter sikkerhetshull og tilbyr " -"nye funksjoner." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Delvis oppgradering" @@ -2176,37 +2196,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Programvareoppdateringer" +msgid "Update Manager" +msgstr "Oppdateringsverktøy" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Programvareoppdateringer" +msgid "Starting Update Manager" +msgstr "Starter Oppdateringsverktøy" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "O_ppgrader" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "oppdateringer" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Installér" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Endringer" +msgid "updates" +msgstr "oppdateringer" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Beskrivelse" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Beskrivelse av oppdatering" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2214,25 +2224,35 @@ "Du er koblet til med fremmednett, og det kan påløpe ekstra kostnader for " "datatrafikken som denne oppdateringen medfører." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Du er tilkoblet via et trådløst modem." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Det er tryggere å koble datamaskinen til en fast strømkilde før " "oppdateringer." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Installer oppdateringer" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Endringer" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "Inn_stillinger..." +msgid "Description" +msgstr "Beskrivelse" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Installér" +msgid "Description of update" +msgstr "Beskrivelse av oppdatering" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "Inn_stillinger..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2256,9 +2276,8 @@ msgstr "Du har avslått å oppgradere til ny versjon av Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Du kan oppgradere på et senere tidspunkt ved å åpne Oppdatering og klikke " @@ -2272,58 +2291,58 @@ msgid "Show and install available updates" msgstr "Vis og installer tilgjengelige oppdateringer" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Vis versjon og avslutt" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Mappe som inneholder datafilene" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Undersøk om en ny utgivelse av Ubuntu er tilgjengelig" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Undersøk om oppgradering til den siste utviklingsversjonen er mulig" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "Oppgrader ved bruk av den siste foreslåtte versjonen" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Ikke sett fokus på område ved oppstart" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Prøv å kjøre dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Ikke se etter oppdateringer ved oppstart" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Test oppgradering i en aufs-sandkasse" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Kjører delvis oppgradering" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Vis en beskrivelse av pakken i stedet for endringsloggen" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Forsøk å oppgradere til den nyeste utgivelse ved å bruke " "oppgraderingsverktøyet fra $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2333,11 +2352,11 @@ "For øyeblikket støttes 'desktop' for oppgradering av vanlige " "arbeidsstasjoner, og 'server' for tjenersystemer." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Kjør valgt brukergrensesnitt" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2345,11 +2364,11 @@ "Sjekk bare om en ny versjonsoppgradering er tilgjengelig, og returner " "resultatet som en avslutningskode." -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Ser etter ny utgave av Ubuntu" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2357,68 +2376,68 @@ "For oppgraderingsinformasjon, besøk:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Fant ingen nye utgivelser" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Ny versjon «%s» er tilgjengelig." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Kjør 'do-release-upgrade' for å oppgradere til den." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Ubuntu %(version)s oppgradering er tilgjengelig" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Du har avslått å oppgradere til Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Vis ikke støttede pakker på denne maskinen" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Vis støttede pakker på denne maskinen" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Vis alle pakkene og statusen deres" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Vis alle pakkene i en liste" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2426,106 +2445,146 @@ "Kjør med --show-unsupported, --show-supported eller --show-all for flere " "detaljer" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Kan ikke lenger lastes ned:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Ikke støttet: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Støttet til %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Ikke støttet" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Ikke-implementert metode: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "En lagret fil" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb-pakke" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Installer manglende pakke." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Pakken %s bør installeres." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb-pakke" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s må markeres som installert for hånd." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"Hvis kdelibs4-dev er installert under oppgradering, må kdelibs5-dev " -"installeres. Se bugs.launchpad.net, bug #279621 for detaljer." - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i irrelevante oppføringer i statusfilen" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Irrelevante statusoppføringer i dpkg" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Irrelevante dpkg statusoppføringer" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"Hvis kdelibs4-dev er installert under oppgradering, må kdelibs5-dev " +"installeres. Se bugs.launchpad.net, bug #279621 for detaljer." + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s må markeres som installert for hånd." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Fjern lilo, da grub også er installert. (Se feilrapport #314004 for " "detaljer.)" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Oppgraderer Ubuntu til versjon 12.04" - -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s oppdatering er valgt." -#~ msgstr[1] "%(count)s oppdateringer er valgt." - -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" - -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Velkommen til Ubuntu" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Oppdateringsverktøy" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "Starting Update Manager" -#~ msgstr "Starter Oppdateringsverktøy" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Du er tilkoblet via et trådløst modem." +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "_Installer oppdateringer" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "Checking for a new ubuntu release" #~ msgstr "Ser etter en ny utgivelse av Ubuntu" @@ -2599,6 +2658,9 @@ #~ msgid "1 kB" #~ msgstr "1 kB" +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Oppgraderer Ubuntu til versjon 11.10" + #~ msgid "" #~ "\n" #~ "\n" diff -Nru update-manager-17.10.11/po/nds.po update-manager-0.156.14.15/po/nds.po --- update-manager-17.10.11/po/nds.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/nds.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2007. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-12-06 06:46+0000\n" "Last-Translator: ncfiedler \n" "Language-Team: German, Low \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Server für %s" @@ -42,30 +43,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Hauptserver" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Eegene Server" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Künn de Indrag sources.list nich bereknen" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Das Hinzufügen der CD ist fehlgeschlagen" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -81,13 +82,13 @@ "Die Fehlermeldung lautete:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Defekte Pakete löschen" msgstr[1] "Defekte Pakete löschen" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -102,22 +103,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Defekte Pakete" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -130,26 +131,26 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Die Aktualisierung konnte nicht berechnet werden." -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Fehler beim authentifizieren einiger Pakete" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -159,39 +160,39 @@ "das ein vorübergehendes Netzwerkproblem. Versuchen sie es später noch " "einmal. Untenstehend ist die Liste der nicht authentifizierten Pakete." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Installation von '%s' nicht möglich" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -205,15 +206,15 @@ " Bitte installieren sie eines der oben genannten Pakete, mit Synaptic oder " "apt-get bevor sie fortfahren." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Lese Twüschenspieker" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -222,11 +223,11 @@ "apt-get oder aptitude) bereits läuft. Bitte beenden Sie zuerst das laufende " "Programm." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -235,11 +236,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Weiter unter SSH schreiben?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -250,11 +251,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Zusätzlicher SSH-Server wird gestartet" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -262,7 +263,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -271,31 +272,31 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Upgrade kann nicht durchgeführt werden." -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" "Eine Aktualisierung von '%s' zu '%s' wird von diesem Programm nicht " "unterstützt." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -305,28 +306,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -334,11 +335,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Die letzten Updates aus dem Internet einbinden?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -350,16 +351,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Kein funktionierender Mirror gefunden." -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -372,11 +373,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -385,34 +386,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -425,23 +426,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Fehler während des Updates." -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Nicht genügend freier Speicherplatz vorhanden." -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -452,32 +453,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Möchtest du das Upgrade starten?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Aktualisierung abgebrochen" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Kann die Upgrades nicht downloaden." -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -485,33 +486,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Upgrade kann nicht installiert werden." #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -522,26 +523,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Veraltete Pakete löschen?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Löschen" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -549,37 +550,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Paketmanager wird überprüft" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -587,79 +588,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Falsche Paketinformation" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Suche nach veralteter Software" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Systemupgrade fertiggestellt." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -667,16 +668,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -685,7 +686,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -694,11 +695,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -706,11 +707,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -718,11 +719,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Keen init verföögbar" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -732,73 +733,73 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Nutze den angegebenen Pfad, um nach einer CD-ROM mit aktualisierbaren " "Paketen zu suchen." -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -808,27 +809,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Veränderungen werden aktualisiert" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "'%s' kann nicht installiert werden" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -838,7 +839,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -847,26 +848,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Der Befehl 'diff' wurde nicht gefunden" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Ein fataler Fehler ist aufgetreten" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -874,151 +875,151 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" "Copy text \t\r\n" "Zeige Unterschiede >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Verstecke Unterschiede" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Zeige Terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Verstecke Terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Informatschoon" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Details" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Lösche %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" "Copy text \t\r\n" "Installiere %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Upgrade %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "Nu nej starten" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1026,32 +1027,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Upgrade abbrechen?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1067,7 +1068,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1081,14 +1082,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1098,34 +1099,32 @@ "ungefähr %s mit einem 56K-Modem." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1138,28 +1137,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1167,148 +1166,148 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" "Es es ist kein Upgrade für dein System verfügbar. Upgrade wird beendet." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Neustart erforderlich" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Das Upgrade wurde fertiggestellt und ein Neustart ist erforderlich. Möchtest " "du jetzt neu starten?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Upgradeprogramm kann nicht ausgeführt werden" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Keen Togang" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Verifikatschoon fehlslagen" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1316,73 +1315,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Brek av" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1440,7 +1439,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1459,133 +1458,141 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Aktualisierung" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Aktualisierungsinformationen" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Installieren" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1593,31 +1600,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1626,34 +1640,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1666,29 +1688,29 @@ "löschen Sie Paketdateien von früheren Installationen mit dem " "Befehlszeilenkommando »sudo apt-get clean«." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1697,7 +1719,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1705,58 +1727,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Nejer Ubuntu Release '%s' is verföögbar" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Avbreken" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1766,22 +1798,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Avbreken" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1795,26 +1823,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1823,7 +1851,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1832,7 +1860,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1841,47 +1869,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1942,56 +1964,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" -msgstr "" +msgid "Update Manager" +msgstr "Opfrischenoppasser" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Installieren" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Installieren" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2015,7 +2040,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -2027,222 +2052,285 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Nahkieken, ob eene neje Verschoon vun ubuntu verföögbar is" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb-Paket" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb-Paket" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." +msgid "%i obsolete entries in the status file" +msgstr "" + +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Opfrischenoppasser" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "Your system is up-to-date" #~ msgstr "Dein System ist auf dem neusten Stand" diff -Nru update-manager-17.10.11/po/ne.po update-manager-0.156.14.15/po/ne.po --- update-manager-17.10.11/po/ne.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/ne.po 2017-12-23 05:00:38.000000000 +0000 @@ -4,11 +4,12 @@ # Pawan Chitrakar , 2005. # Jaydeep Bhusal , 2005. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2010-05-25 10:32+0000\n" "Last-Translator: Launchpad Translations Administrators \n" "Language-Team: Nepali \n" @@ -21,7 +22,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -29,13 +30,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f मेगाबाइट" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s को लागि सर्भर" @@ -43,30 +44,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "मुख्य सर्भर" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "पसन्द सर्भरहरू" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "श्रोत हरु calculate गर्न सकियेना अन्तिम खाका" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "package files हरु कहाँ छन् पत्ता लगाउना सकियेना साएद को उबुन्टु को CD होइन" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "सीडी जोड्न अक्षम" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -76,13 +77,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "खराब हालतको प्याकेज हटाउनुहोस्" msgstr[1] "खराब हालतको प्याकेजहरू हटाउनुहोस्" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -97,15 +98,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "server ले थेग्न नसके जस्तो छ" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "टुक्रिएका प्याकेजहरू" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -114,7 +115,7 @@ "अथवा apt-get प्रयोग गर्नु होला" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -132,65 +133,65 @@ "*pre-release उबुन्टु upgrade गर्न खोज्दा\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "साएद समस्या थाही हैन होला फेरी प्रयास गर्नु होला" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "upgrade calculate गर्न सकियेना" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "कालो सुची मा परेको version '%s' प्रतिस्थापन गर्न खोजि दै छ" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "'%s' प्रतिस्थापन गर्न सकिएन" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -199,25 +200,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -226,11 +227,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -241,11 +242,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -253,7 +254,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -262,29 +263,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "स्तरोन्नत गर्न सकिएन" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -294,28 +295,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -323,11 +324,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -339,16 +340,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "कुनै वैध प्रतिबिम्ब फेला परेन" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -361,11 +362,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -374,34 +375,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -414,23 +415,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -441,32 +442,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "स्तरोन्नति रद्द भयो" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -474,33 +475,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -511,26 +512,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -538,37 +539,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -576,79 +577,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -656,16 +657,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -674,7 +675,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -683,11 +684,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -695,11 +696,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -707,11 +708,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -721,71 +722,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -795,27 +796,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -825,7 +826,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -834,26 +835,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -861,147 +862,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1009,32 +1010,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1050,7 +1051,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1064,14 +1065,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1079,34 +1080,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1119,28 +1118,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1148,145 +1147,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1294,73 +1293,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1418,7 +1417,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1437,133 +1436,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "संस्करण %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1571,31 +1578,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1604,34 +1618,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1639,29 +1661,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1670,7 +1692,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1678,58 +1700,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1739,22 +1771,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1768,26 +1796,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1796,7 +1824,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1805,7 +1833,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1814,47 +1842,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1915,56 +1937,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "सफ्टवेयर अद्यावधिकहरु" +msgid "Update Manager" +msgstr "अद्यावधिक व्यवस्थापक" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "सफ्टवेयर अद्यावधिकहरु" +msgid "Starting Update Manager" +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "परिवर्तनहरु" +msgid "updates" +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "बर्णन" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." -msgstr "" +msgid "Changes" +msgstr "परिवर्तनहरु" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "" +msgid "Description" +msgstr "बर्णन" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1989,7 +2012,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -2001,219 +2024,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." msgstr "" -#~ msgid "Update Manager" -#~ msgstr "अद्यावधिक व्यवस्थापक" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" diff -Nru update-manager-17.10.11/po/nl.po update-manager-0.156.14.15/po/nl.po --- update-manager-17.10.11/po/nl.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/nl.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-27 21:55+0000\n" "Last-Translator: Rachid \n" "Language-Team: Nederlands \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Server voor %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Hoofdserver" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Aangepaste servers" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Kan sources.list-vermelding niet berekenen" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Kan geen pakketbestanden vinden, mogelijk is dit geen Ubuntu-medium of " "beschikt u niet over de juiste hardware-architectuur." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Toevoegen van de cd is mislukt" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -83,13 +84,13 @@ "De foutmelding was:\n" "‘%s’" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Verwijder pakket in slechte staat." msgstr[1] "Verwijder pakketten in slechte staat." -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -110,15 +111,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "De server is mogelijk overbelast" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Niet-werkende pakketten" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -128,7 +129,7 @@ "verdergaat." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -150,13 +151,13 @@ " * onofficiële softwarepaketten, niet aangeleverd door Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Dit is waarschijnlijk een tijdelijk probleem.\r\n" "Probeer het later nog eens." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -164,16 +165,16 @@ "Als niets hiervan van toepassing is, dan verzoeken wij u deze fout te " "rapporteren in een terminal via het commando 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Kan de vereisten voor de upgrade niet berekenen" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Fout bij het bepalen van de echtheid van sommige pakketten" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -184,7 +185,7 @@ "proberen. Hieronder vindt u een lijst met pakketten waarvan de echtheid niet " "vastgesteld is." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -192,23 +193,23 @@ "Het pakket ‘%s’ is gemarkeerd voor verwijdering, maar het staat op de zwarte " "lijst voor verwijderen." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Het essentiële pakket ‘%s’ is gemarkeerd voor verwijdering." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" "Pakket (versie ‘%s’) dat op de zwarte lijst staat proberen te installeren" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Kan ‘%s’ niet installeren" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -218,11 +219,11 @@ "manager'." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Kan het metapakket niet raden" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -236,15 +237,15 @@ " Installeer eerst één van de bovenstaande pakketten met synaptic of apt-get " "voordat u verder gaat." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Tijdelijke opslag inlezen" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Kon geen exclusieve blokkering verkrijgen" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -252,11 +253,11 @@ "Dit betekent meestal dat een andere pakketbeheerder (zoals apt-get of " "aptitude) actief is. Gelieve die toepassing eerst te sluiten." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Upgraden over een externe verbinding wordt niet ondersteund" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -270,11 +271,11 @@ "\n" "De upgrade wordt nu afgebroken. Probeer het opnieuw zonder ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Doorgaan met uitvoeren via ssh?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -291,11 +292,11 @@ "Als u verdergaat, zal er een extra ssh-daemon gestart worden op poort ‘%s’.\n" "Wilt u verdergaan?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Bezig met starten van extra sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -306,7 +307,7 @@ "gestart worden op poort ‘%s’. Indien er iets misgaat met de ssh die in " "gebruik was, kunt u nog steeds verbinden met de extra sshd.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -319,29 +320,29 @@ "kan zijn. U kunt de poort openen met bijv.:\n" "‘%s’" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Kan niet upgraden" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Een upgrade van '%s naar '%s' is niet mogelijk met dit programma." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Sandbox-installatie mislukt" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Kon geen sandbox-omgeving aanmaken." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Sandbox-modus" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -357,18 +358,18 @@ "*Geen enkele* verandering aan een systeemmap van nu totdat u de computer " "opnieuw opstart zal permanent zijn." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Uw python-installatie is beschadigd. Herstel de symbolische link ‘/usr/bin/" "python’." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Pakket 'debsig-verify' is geïnstalleerd." -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -378,12 +379,12 @@ "Verwijder het eerst met synaptic of 'apt-get remove debsig-verify' en voer " "de upgrade opnieuw uit." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Kan niet schrijven naar ‘%s’" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -394,11 +395,11 @@ "De upgrade kan niet verder gaan.\n" "Zorg ervoor dat er in de systeemmap geschreven kan worden." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Laatste updates downloaden van het internet?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -418,16 +419,16 @@ "updates moeten installeren.\n" "Als u voor 'nee' kiest, wordt het netwerk helemaal niet gebruikt." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "uitgeschakeld bij upgrade naar %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Geen geldige spiegelserver gevonden" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -447,11 +448,11 @@ "geannuleerd." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "De standaard bronnenlijst aanmaken?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -465,11 +466,11 @@ "Moeten de standaardservers voor ‘%s’ toegevoegd worden? Als u 'Nee' kiest, " "wordt de upgrade geannuleerd." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "De informatie over de pakketbronnen is ongeldig" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -477,11 +478,11 @@ "Het updaten van de softwarebron resulteerde in een ongeldig bestand. Er " "wordt automatisch een bug-rapport aangemaakt." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Pakketbronnen van derden uitgeschakeld" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -491,13 +492,13 @@ "kunt ze na de upgrade weer inschakelen met het programma ‘software-" "properties’ of met uw pakketbeheerder." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Pakket in inconsistente staat" msgstr[1] "Pakketten in inconsistente staat" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -518,11 +519,11 @@ "pakketten bevat. U moet de pakketten zelf installeren of u moet ze " "verwijderen uit het systeem." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Fout tijdens het bijwerken" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -531,13 +532,13 @@ "meestal een netwerkprobleem. Gelieve uw netwerkverbinding te controleren en " "probeer het dan opnieuw." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Niet genoeg vrije schijfruimte" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -552,21 +553,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Wijzigingen worden berekend" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Wilt u beginnen met de upgrade?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Upgrade geannuleerd" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -574,12 +575,12 @@ "De upgrade zal nu worden geannuleerd en de originele systeemstatus wordt " "hersteld. U kunt de upgrade op een later tijdstip hervatten." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Kon de upgrades niet downloaden" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -590,27 +591,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Fout bij het toepassen" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "De oorspronkelijke toestand wordt hersteld" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Kon de upgrades niet installeren" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -619,7 +620,7 @@ "bevinden. Een herstelprocedure zal nu uitgevoerd worden (dpkg --configure -" "a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -636,7 +637,7 @@ "upgrade/ aan het bug-rapport toe.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -644,20 +645,20 @@ "De upgrade is afgebroken. Controleer uw internetverbinding of " "installatiemedia en probeer het opnieuw. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Verouderde pakketten verwijderen?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Behouden" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Verwijderen" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -667,27 +668,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "De vereiste afhankelijkheden zijn niet geïnstalleerd" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Het vereiste pakket ‘%s’ is niet geïnstalleerd. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Pakketbeheerder controleren" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Voorbereiden van de upgrade is mislukt" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -695,11 +696,11 @@ "Het voorbereiden van het systeem voor de upgrade is mislukt, dus wordt er " "een probleemrapportageproces gestart." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Het voorbereiden van de upgrade is mislukt" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -711,70 +712,70 @@ "\n" "Daarnaast wordt er een bug-rapport aangemaakt." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Updaten van de informatie over de pakketbronnen" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Toevoegen van cdrom mislukt" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Helaas is het niet gelukt de cdrom toe te voegen" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Ongeldige pakketinformatie" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Ophalen" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Bezig met upgraden" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Upgrade is voltooid" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "De upgrade is voltooid, maar er hebben zich fouten voorgedaan tijdens het " "upgradeproces." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Zoeken naar verouderde software" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Systeemupgrade is voltooid." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "De gedeeltelijke upgrade is voltooid." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms wordt gebruikt" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -784,13 +785,13 @@ "'evms' wordt niet langer ondersteund, schakel hem uit en voer de upgrade " "nogmaals uit wanneer dit gebeurd is." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "Uw grafische hardware wordt misschien niet volledig ondersteund in Ubuntu " "12.04 LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -802,9 +803,9 @@ "zie https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx Wilt u verder " "gaan met de upgrade?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -813,8 +814,8 @@ "de prestaties bij games en andere grafisch intensieve programma's negatief " "beïnvloed." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -827,7 +828,7 @@ "hardware werkt.\n" "Wilt u doorgaan?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -840,11 +841,11 @@ "hardware werkt.\n" "Wilt u doorgaan?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Geen i686-CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -856,11 +857,11 @@ "hebben. Met deze hardware is het niet mogelijk om uw systeem up te graden " "naar een nieuwe versie van Ubuntu." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Geen ARMv6-CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -872,11 +873,11 @@ "architectuur. Het is met uw hardware niet mogelijk om uw systeem te upgraden " "naar een nieuwe versie van Ubuntu." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Geen init beschikbaar" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -892,17 +893,17 @@ "\n" "Weet u zeker dat u wilt doorgaan?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Sandbox-upgrade via aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Gebruik het opgegeven pad om te zoeken naar een cd-rom met pakketten die " "geüpgraded kunnen worden" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -910,58 +911,58 @@ "Te gebruiken frontend. Momenteel beschikbaar: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*DEPRECATED* deze optie zal genegeerd worden" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Een gedeeltelijke upgrade uitvoeren (sources.list wordt niet herschreven)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "GNU-schermondersteuning uitschakelen" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Datamap instellen" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Plaats ‘%s’ in station ‘%s’" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Het ophalen is voltooid" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Ophalen bestand %li van %li met %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Ongeveer %s resterend" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Bestand %li van %li wordt opgehaald" @@ -971,27 +972,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Wijzigingen worden doorgevoerd" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "vereistenproblemen - blijft niet ingesteld" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Kon ‘%s’ niet installeren" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -1003,7 +1004,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1014,7 +1015,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1022,20 +1023,20 @@ "Wanneer u besluit dit configuratiebestand te vervangen door een nieuwere " "versie zullen al uw gemaakte wijzigingen verloren gaan." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "De opdracht 'diff' is niet gevonden" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Er is een ernstige fout opgetreden" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1047,13 +1048,13 @@ "bij uw melding. De upgrade is afgebroken.\n" "Uw originele sources.list is opgeslagen in /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c ingedrukt" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1062,136 +1063,136 @@ "werkt. Weet u zeker dat u dit wilt doen?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Sluit alle openstaande toepassingen en documenten om dataverlies te " "voorkomen." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Niet langer ondersteund door Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Downgrade (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Verwijder (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Niet meer nodig (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Installeer (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Upgrade (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Medium wisselen" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Verschillen weergeven >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Verschillen verbergen" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Foutmelding" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Annuleren" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "Sl&uiten" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Terminalvenster weergeven >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Terminalvenster verbergen" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Informatie" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Details" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Niet meer ondersteund %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "%s verwijderen" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "%s verwijderen (werd automatisch geïnstalleerd)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "%s installeren" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "%s upgraden" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Herstart vereist" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Herstart het systeem om de upgrade te voltooien" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Nu herstarten" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1203,32 +1204,32 @@ "Het systeem kan instabiel raken als u de upgrade annuleert. U wordt met " "nadruk geadviseerd om met de upgrade door te gaan." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Upgrade annuleren?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li dag" msgstr[1] "%li dagen" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li uur" msgstr[1] "%li uur" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minuut" msgstr[1] "%li minuten" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1244,7 +1245,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1258,14 +1259,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1275,34 +1276,32 @@ "ongeveer %s met een 56k-modem." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Deze download duurt met uw verbinding ongeveer %s. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Upgrade voorbereiden" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Nieuwe softwarekanalen worden opgehaald" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Ophalen van nieuwe pakketten" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Installeren van de upgrades" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Opruimen" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1319,28 +1318,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d pakket zal verwijderd worden." msgstr[1] "%d pakketten zullen verwijderd worden." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d nieuw pakket zal geïnstalleerd worden." msgstr[1] "%d nieuwe pakketten zullen geïnstalleerd worden." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d pakket zal geüpgraded worden." msgstr[1] "%d pakketten zullen geüpgraded worden." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1351,7 +1350,7 @@ "\n" "U moet in totaal %s downloaden. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1359,7 +1358,7 @@ "Het installeren van een upgrade kan enkele uren in beslag nemen. Nadat de " "download voltooid is kan het proces niet meer afgebroken worden." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1368,16 +1367,16 @@ "het downloaden van de pakketten voltooid is kan het proces niet meer " "afgebroken worden." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Het verwijderen van de pakketten kan enkele uren in beslag nemen. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "De software op deze computer is actueel." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1385,37 +1384,37 @@ "Er zijn geen upgrades beschikbaar voor uw systeem. De upgrade wordt nu " "geannuleerd." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Herstart vereist" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Het upgraden is voltooid en herstarten is noodzakelijk. Wilt u dit nu doen?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "'%(file)s' tegen '%(signature)s' verifiëren " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "‘%s’ wordt uitgepakt" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Kon het upgradeprogramma niet uitvoeren" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1424,34 +1423,34 @@ "u dit als bug te melden in een terminal via het commando 'ubuntu-bug update-" "manager'." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Handtekening upgradeprogramma" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Upgradeprogramma" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Ophalen is mislukt" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "Het ophalen van de upgrade is mislukt. Er is mogelijk een netwerkprobleem. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Echtheidscontrole is mislukt" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1459,13 +1458,13 @@ "De echtheidscontrole van de upgrade is mislukt. Er is mogelijk een probleem " "met het netwerk of de server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Uitpakken is mislukt" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1473,13 +1472,13 @@ "Het uitpakken van de upgrade is mislukt. Er is mogelijk een probleem met het " "netwerk of de server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Verificatie is mislukt" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1487,15 +1486,15 @@ "Het verifiëren van de upgrade is mislukt. Er is mogelijk een probleem met " "het netwerk of de server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Kan de upgrade niet uitvoeren" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1503,13 +1502,13 @@ "Dit wordt meestal veroorzaakt door een systeem waar /tmp met noexec is " "aangekoppeld. Koppel opnieuw aan zonder noexec en voer de upgrade weer uit." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "De foutmelding is ‘%s’." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1520,73 +1519,73 @@ "log en /var/log/dist-upgrade/apt.log bij uw melding. De upgrade is " "afgebroken." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Afbreken" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Gedegradeerd:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Druk op [ENTER] om door te gaan" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "_Doorgaan [jN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Details [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "j" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Niet meer ondersteund: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Verwijderen: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Installeren: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Upgraden: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Doorgaan [Jn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1653,9 +1652,8 @@ msgstr "Distributie-upgrade" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Bezig met upgraden van Ubuntu naar versie 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Bezig met upgraden van Ubuntu naar versie 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1673,84 +1671,85 @@ msgid "Terminal" msgstr "Terminalvenster" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Een ogenblik geduld, dit kan even duren." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "De update is voltooid" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Kon de versie-informatie niet vinden" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "De server is waarschijnlijk overbelast. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Kon de versie-informatie niet downloaden" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Controleer uw internetverbinding." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Upgraden" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Versie-informatie" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Aanvullende pakketbestanden downloaden…" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Bestand %s van %s met %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Bestand %s van %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Koppeling in browser openen" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Koppeling naar klembord kopiëren" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Bestand %(current)li van %(total)li wordt gedownload met %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Bestand %(current)li van %(total)li wordt gedownload" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Uw Ubuntu-versie wordt niet langer ondersteund." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1758,53 +1757,59 @@ "U krijgt verder geen beveiligingscorrecties of essentiële updates meer. " "Gelieve op te waarderen naar een nieuwere versie van Ubuntu." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Upgrade-informatie" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Installeren" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Naam" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Versie %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Er is geen netwerkverbinding gedetecteerd, u kunt geen changelog-informatie " "downloaden." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "De lijst met wijzigingen wordt gedownload..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Niets selecteren" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "_Alles selecteren" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "Er is %(count)s update geselecteerd." +msgstr[1] "Er zijn %(count)s updates geselecteerd." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "Er zal %s gedownload worden." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "De update werd reeds gedownload, maar nog niet geïnstalleerd." msgstr[1] "De updates werden reeds gedownload, maar nog niet geïnstalleerd." @@ -1812,11 +1817,18 @@ msgid "There are no updates to install." msgstr "Er zijn geen updates om te installeren." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Onbekende downloadgrootte." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1824,7 +1836,7 @@ "Het is niet bekend wanneer de pakketinformatie voor het laatst is " "bijgewerkt. Klik op ‘Controleren’ om de pakketinformatie nu bij te werken." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1834,7 +1846,7 @@ "bijgewerkt.\n" "Klik op de knop 'Controleren' hieronder om naar nieuwe updates te zoeken." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1844,7 +1856,7 @@ "De pakketinformatie werd voor het laatst %(days_ago)s dagen geleden " "bijgewerkt." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1857,34 +1869,45 @@ "bijgewerkt." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "De pakketinformatie is %s minuten geleden voor het laatst bijgewerkt." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "De pakketinformatie is zojuist bijgewerkt." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Software-updates herstellen fouten, verhelpen veiligheidsproblemen en " +"leveren nieuwe mogelijkheden." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Er kunnen software-updates beschikbaar zijn voor uw computer." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Welkom bij Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Deze software-updates zijn uitgebracht vanaf de uitgave van deze versie." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Er zijn software-updates beschikbaar voor deze computer." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1895,7 +1918,7 @@ "ruimte vrij op '%s'. Leeg uw prullenbak en verwijder tijdelijke " "pakketbestanden van vorige installaties met 'sudo apt-get clean'." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1903,24 +1926,24 @@ "De computer moet herstart worden om het installeren van de updates te " "voltooien. Sla uw werk op alvorens u verdergaat." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Pakketinformatie lezen" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Bezig met verbinden…" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Mogelijk kunt u geen updates downloaden of op nieuwe updates controleren." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Kon de pakketinformatie niet initialiseren" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1934,7 +1957,7 @@ "Gelieve deze fout in het pakket ‘update-manager’ te rapporteren en voeg de " "volgende foutmelding toe:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1947,31 +1970,31 @@ "Gelieve deze fout in het pakket ‘update-manager’ te rapporteren en voeg de " "volgende foutmelding toe:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Nieuwe installatie)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Grootte: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Van versie %(old_version)s naar %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Versie %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Uitgave-upgrade momenteel niet mogelijk" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1980,21 +2003,21 @@ "De uitgave-upgrade kan momenteel niet plaatsvinden, probeer het later nog " "eens. De server gaf als antwoord: ‘%s’" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Programma voor versie-upgrade downloaden" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Nieuwe Ubuntu-versie '%s' is beschikbaar" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Software-index is beschadigd" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -2004,6 +2027,17 @@ "Gebruik het pakkettenbeheerprogramma \"Synaptic\" of gebruik \"sudo apt-get " "install -f\" in een terminalvenster om eerst dit probleem te verhelpen." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Nieuwe versie '%s' beschikbaar." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Annuleren" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Controleren op updates" @@ -2013,22 +2047,18 @@ msgstr "Alle beschikbare updates installeren" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Annuleren" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Wijzigingslogboek" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Updates" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Lijst met updates wordt gebouwd" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2052,20 +2082,20 @@ " * Onofficiële softwarepakketten die niet door Ubuntu geleverd worden\n" " * Normale veranderingen van een pre-release versie van Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Wijzigingenlogboek wordt gedownload" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Overige updates (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "Deze update is niet afkomstig van een bron die changelogs ondersteunt." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2073,7 +2103,7 @@ "Kon de lijst met wijzigingen niet downloaden. \n" "Controleer uw internetverbinding." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2086,7 +2116,7 @@ "Beschikbare versie: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2099,7 +2129,7 @@ "Gebruik http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "totdat de wijzigingen beschikbaar worden, of probeer het later opnieuw." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2113,54 +2143,45 @@ "+changelog\n" "of u kunt het later nog eens proberen." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Bepalen van de distributie is mislukt" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" "Er heeft zich een fout ‘%s’ voorgedaan tijdens de controle van uw " "systeemversie." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Belangrijke veiligheidsupdates" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Aanbevolen updates" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Voorgestelde updates" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backports" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Distributie-updates" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Andere updates" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Updatebeheer opstarten" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Software-updates herstellen fouten, verhelpen veiligheidsproblemen en " -"leveren nieuwe mogelijkheden." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Gedeeltelijke upgrade" @@ -2232,37 +2253,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Software-updates" +msgid "Update Manager" +msgstr "Updatebeheer" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Software-updates" +msgid "Starting Update Manager" +msgstr "Updatebeheer starten" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "U_pgraden" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Installeren" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Wijzigingen" +msgid "updates" +msgstr "updates" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Omschrijving" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Omschrijving van de update" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2270,24 +2281,34 @@ "U heeft een roaming-verbinding. Het kan zijn dat de data die u met deze " "update binnenhaalt in rekening worden gebracht." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "U bent verbonden via een draadloos modem." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Het is veiliger om de computer op de lader aan te sluiten alvorens u begint." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "Up_dates installeren" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Wijzigingen" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "Ins_tellingen..." +msgid "Description" +msgstr "Omschrijving" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Installeren" +msgid "Description of update" +msgstr "Omschrijving van de update" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "Ins_tellingen..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2311,9 +2332,8 @@ msgstr "U heeft besloten om niet te upgraden naar de nieuwe Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "U kunt op een later moment upgraden door Updatebeheer te openen en op " @@ -2327,60 +2347,60 @@ msgid "Show and install available updates" msgstr "Beschikbare updates weergeven en installeren" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Versie tonen en afsluiten" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Map die de gegevensbestanden bevat" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Controleren of er een nieuwe versie van Ubuntu beschikbaar is" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "Controleer of upgraden naar de nieuwste ontwikkelaarsversie mogelijk is" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "Upgrade uitvoeren met de meest recente versie van de upgrader" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Geen focus op de map leggen tijdens opstarten" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Probeer om een dist-upgrade uit te voeren" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Niet controleren op updates tijdens starten" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Upgrade testen met een sandbox-aufs-overlay" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Gedeeltelijke upgrade uitvoeren" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" "In plaats van het wijzigingslogboek de omschrijving van het pakket tonen" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Probeer te upgraden naar de laatste versie door gebruik te maken van de " "upgradesoftware van $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2390,11 +2410,11 @@ "Momenteel worden 'desktop' en 'server' ondersteund voor upgrades van " "respectievelijk een desktopsysteem en een serversysteem." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "De opgegeven 'frontend' uitvoeren" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2402,11 +2422,11 @@ "Alleen controleren wanneer er een nieuwe distributie-uitgave beschikbaar is, " "en het resultaat rapporteren via de afsluitstatus" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Er wordt gecontroleerd of er een nieuwe Ubuntu-uitgave is" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2414,60 +2434,60 @@ "Voor upgrade-informatie, bezoek:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Geen nieuwe versie gevonden" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Nieuwe versie '%s' beschikbaar." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Voer 'do-release-upgrade' uit om naar de nieuwe versie te upgraden." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Upgrade naar Ubuntu %(version)s beschikbaar" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "U heeft besloten om niet te upgraden naar Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Debug-uitvoer toevoegen" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Niet-ondersteunde pakketten op deze machine tonen" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Ondersteunde pakketten op deze machine tonen" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Alle pakketten met hun status tonen" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Alle pakketten in een lijst tonen" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Overzicht ondersteuningsstatus van ‘%s’:" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" "U heeft %(num)s pakketten (%(percent).1f%%) die ondersteund worden tot " "%(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" @@ -2475,12 +2495,12 @@ "U heeft %(num)s pakketten (%(percent).1f%%) die niet/niet meer gedownload " "kunnen worden" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" "U heeft %(num)s pakketten (%(percent).1f%%) die niet ondersteund worden" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2488,54 +2508,71 @@ "Voer uit met --show-unsupported, --show-supported or --show-all om meer " "details te zien" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Niet meer te downloaden:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Niet ondersteund: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Ondersteund tot %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Niet ondersteund" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Niet-geïmplementeerde methode: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Bestand op schijf" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb-pakket" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Ontbrekend pakket installeren" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Pakket %s zou geïnstalleerd moeten worden." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb-pakket" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s moet aangevinkt worden als handmatig geïnstalleerd." +msgid "%i obsolete entries in the status file" +msgstr "%i verouderde bestandsvermeldingen in statusbestand" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "Verouderde vermeldingen in dpkg-status" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "Verouderde vermeldingen in dpkg-status" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2544,67 +2581,81 @@ "worden om te kunnen upgraden. Zie bug #279621 op bugs.launchpad.net voor " "details." -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "%i verouderde bestandsvermeldingen in statusbestand" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "Verouderde vermeldingen in dpkg-status" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "Verouderde vermeldingen in dpkg-status" +msgid "%s needs to be marked as manually installed." +msgstr "%s moet aangevinkt worden als handmatig geïnstalleerd." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Lilo verwijderen omdat grub ook geïnstalleerd is. (Zie bug #3314004 voor " "meer informatie.)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Na het vernieuwen van de pakket-informatie kon het essentiële pakket ‘%s’ " -#~ "niet meer gevonden worden. Er wordt een bug-rapport aangemaakt." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Bezig met upgraden van Ubuntu naar versie 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "Er is %(count)s update geselecteerd." -#~ msgstr[1] "Er zijn %(count)s updates geselecteerd." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Welkom bij Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Deze software-updates zijn uitgebracht vanaf de uitgave van deze versie." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Er zijn software-updates beschikbaar voor deze computer." - -#~ msgid "Update Manager" -#~ msgstr "Updatebeheer" - -#~ msgid "Starting Update Manager" -#~ msgstr "Updatebeheer starten" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "U bent verbonden via een draadloos modem." - -#~ msgid "_Install Updates" -#~ msgstr "Up_dates installeren" +#~ "Na het vernieuwen van de pakket-informatie kon het essentiële pakket ‘%s’ " +#~ "niet meer gevonden worden. Er wordt een bug-rapport aangemaakt." #~ msgid "" #~ "If you don't want to install them now, choose \"Update Manager\" from the " @@ -2722,6 +2773,9 @@ #~ "melden in een terminal via het commando 'ubuntu-bug update-manager' en de " #~ "bestanden in /var/log/dist-upgrade/ mee te sturen met het rapport." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Bezig met upgraden van Ubuntu naar versie 11.10" + #~ msgid "Your graphics hardware may not be fully supported in Ubuntu 11.04." #~ msgstr "" #~ "Het kan zijn dat uw grafische hardware niet volledig ondersteund wordt in " diff -Nru update-manager-17.10.11/po/nn.po update-manager-0.156.14.15/po/nn.po --- update-manager-17.10.11/po/nn.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/nn.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-02-23 19:53+0000\n" "Last-Translator: Åsmund Skjæveland \n" "Language-Team: Norwegian Nynorsk \n" @@ -22,7 +23,7 @@ "X-Source-Language: C\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -30,13 +31,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MiB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Tenar for %s" @@ -44,20 +45,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Hovudtenar" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Eigendefinerte tenarar" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Klarte ikkje å rekna ut oppføringa i sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -65,11 +66,11 @@ "Klarte ikkje å finna nokon pakkefiler. Kanskje dette ikkje er ein Ubuntu-" "disk eller rett arkitektur?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Klarte ikkje å leggja til CD-en" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -84,13 +85,13 @@ "Feilmeldinga var:\n" "\"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Fjern dårleg pakke" msgstr[1] "Fjern dårlege pakkar" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -109,15 +110,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Tenaren kan vera oppteken" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Skadde pakkar" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -126,7 +127,7 @@ "programvara. Reparer dei med synaptic eller apt-get før du held fram." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -148,11 +149,11 @@ " * Uoffisielle programpakkar som ikkje kjem frå Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Dette er truleg berre eit kortvarig problem. Prøv om att seinare." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -160,16 +161,16 @@ "Om dette ikkje gjeld, rapporter feilen ved å bruka kommandoen «ubuntu-bug " "update-manager» i ein terminal." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Klarte ikkje å førebu oppgraderinga" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Klarte ikkje å stadfesta identiteten åt somme pakkar" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -179,28 +180,28 @@ "nettverksproblem, så du bør prøve om att seinare. Sjå under for lista over " "pakkar som ikkje kunne godkjennast." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "Pakken '%s' er merkt for fjerning, men er i svartelista for fjerning." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Den nødvendige pakken «%s» er merkt for fjerning." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Freistar å installera den svartelista versjon '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Kan ikkje installera '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -209,11 +210,11 @@ "bruka kommandoen «ubuntu-bug update-manager» i ein terminal." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Klarte ikkje å gjetta på meta-pakke" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -227,15 +228,15 @@ "Installer ein av desse pakkane ved å bruka synaptic eller apt-get før du " "fortset." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Les mellomlager" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Klarte ikkje å få einerett" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -243,11 +244,11 @@ "Dette tyder vanlegvis på at eit anna pakkehandsamingsprogram (slik som apt-" "get eller aptitude) køyrer. Avslutt det programmet først." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Å oppgradera over fjerntilkobling er ikkje støtta" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -261,11 +262,11 @@ "\n" "Oppgraderinga vil no avbrytast. Prøv utan ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Forsett køyringa under SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -281,11 +282,11 @@ "Viss du held fram, vil ei ekstra ssh-teneste bli starta på port '%s'.\n" "Ønskjer du å halda fram?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Startar endå ein sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -296,7 +297,7 @@ "verta starta på port '%s'. Dersom noko går gale med ssh-en som køyrer, kan " "du framleis kopla til den nye.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -309,29 +310,29 @@ "porten med t.d. \n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Klarte ikkje å oppgradera" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Å oppgradera frå «%s» til «%s» er ikkje støtta av dette verktøyet." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Sandkasseoppsett var mislukka" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Klarte ikkje å oppretta sandkassemiljøet." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Sandkassemodus" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -341,18 +342,18 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Python-installasjonen din er øydelagd. Den symbolske lenkja «/usr/bin/" "python» må reparerast." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Pakken «debsig-verify» er installert" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -362,12 +363,12 @@ "Fjern han med «synaptic» eller «apt-get remove debsig-verify» fyrst og køyr " "oppdateringa om att." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -375,11 +376,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Inkluder dei siste oppdateringane frå Internett?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -399,16 +400,16 @@ "installera dei siste oppdateringane så fort som mogleg etter oppgraderinga.\n" "Svarar du «nei» her, vert ikkje nettet brukt i det heile." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "deaktivert under oppgradering til %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Fann ikkje noko gyldig spegl" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -428,11 +429,11 @@ "avbroten." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Vil du oppretta standardkjelder?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -445,21 +446,21 @@ "Skal standardoppføringar for «%s» leggjast til? Vel du «Nei», vert " "oppgraderinga avbroten." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Ugyldig arkivinformasjon" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Tredjepartskjelder er deaktiverte" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -469,13 +470,13 @@ "bruka dei etter oppdateringa gjennom «Eigenskapar for programvare» eller med " "Synaptic." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Pakke i dårleg stand" msgstr[1] "Pakkar i dårleg stand" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -494,11 +495,11 @@ "nødvendige arkiva vart funne. Installer pakkane på nytt manuelt, eller fjern " "dei frå systemet." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Feil under oppdatering" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -506,13 +507,13 @@ "Eit problem oppstod under oppdateringa. Dette er vanlegvis ei form for " "nettverksproblem. Sjekk nettverkstilkoplinga di og prøv om att." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Ikkje nok ledig diskplass" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -527,21 +528,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Reknar ut endringane" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Vil du starta oppdateringa?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Oppgradering avbroten" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -549,12 +550,12 @@ "Oppgraderinga vil no bli avbroten, og det opphavlege systemet vil verta " "atterreist. Du kan venda tilbake til oppgraderinga når som helst." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Klarte ikkje å lasta ned oppgraderingane" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -565,27 +566,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Feil under innsending" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Gjenopprettar systemet til sin opphavlege tilstand" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Klarte ikkje å installera oppgraderingane" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -593,7 +594,7 @@ "Oppgraderinga vart avbroten. Systemet ditt kan vera ubrukeleg. Ei " "gjenoppretting vert no køyrd (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -604,7 +605,7 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -612,20 +613,20 @@ "Oppgraderinga vart avbroten. Kontroller internett-tilkoplinga eller " "installasjonsmediet og prøv på nytt. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Ønskjer du å fjerna utdaterte pakkar?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Ta vare på" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Fjern" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -635,37 +636,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Nødvendige avhengnader er ikkje installerte" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Den nødvendige avhengnaden \"%s\" er ikkje installert. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Sjekkar pakkehandsamaren" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Klarte ikkje å førebu oppgraderinga" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Klarte ikkje å lasta ned oppgraderingskrava" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -673,68 +674,68 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Oppdaterer informasjon om arkivet" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Klarte ikkje å leggja til CD-en" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Beklagar, å leggja til CD-en var mislukka." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Ugyldig pakkeinformasjon" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Hentar" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Oppgraderer" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Oppgradering fullført" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "Oppgraderinga er ferdig, men nokre feil dukka opp under prosessen." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Søkjer etter utdatert programvare" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Systemoppgraderinga er fullført." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Delvis oppgradering er ferdig." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "«evms» i bruk" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -744,11 +745,11 @@ "«evms»-programvaren er ikkje lenger støtta, slå henne av og køyr " "oppgraderinga på nytt." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -756,9 +757,9 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -766,8 +767,8 @@ "Å oppgradera kan redusera skrivebordseffekter, samt ytinga i spel og andre " "grafikkintensive program." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -781,7 +782,7 @@ "\n" "Vil du halda fram?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -792,11 +793,11 @@ "Datamaskina brukar AMD «fglrx»-grafikkdrivaren. Ingen tilgjengelege " "versjonar av denne drivaren verkar med maskinvaren din i Ubuntu 10.04 LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Ikkje ein i686-prosessor" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -808,11 +809,11 @@ "oppgradera systemet ditt til den nyaste Ubuntu-utgjevinga med den noverande " "maskinvaren." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Ingen ARMv6-prosessor" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -823,11 +824,11 @@ "pakkane i karmic krev minimum ARMv6. Det er ikkje mogleg å oppgradera " "systemet ditt til den nyaste Ubuntu-utgjevinga med den noverande maskinvaren." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Ingen oppstartsprogram (init) er tilgjengelege" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -843,17 +844,17 @@ "\n" "Er du sikker på at du vil halda fram?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Sandkasseoppgradering ved bruk av aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Bruk den oppgjevne stien til å søkja etter ei CD-plate med pakkar som kan " "oppgraderast" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -861,58 +862,58 @@ "Bruk eit grafisk grensesnitt. Tilgjengelege er: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*FORELDA* dette valet vil verta ignorert" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Gjennomfør berre ei delevis oppgradering (inga omskriving av sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Skru av GNU-skjermstøtte" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Vel datamappe" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Sett '%s' i stasjonen '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Ferdig med å henta" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Hentar fil %li av %li ved %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Omtrent %s igjen" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Hentar fil %li av %li" @@ -922,27 +923,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Utfører endringar" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "problem med avhengnader – set ikkje opp pakken" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Kunne ikkje installere '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -954,7 +955,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -965,7 +966,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -973,20 +974,20 @@ "Du vil mista forandringar du har gjort i denne konfigurasjonsfila om du vel " "å byte den ut med ein nyare versjon." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Kommandoen \"diff\" vart ikkje funnen" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Ein kritisk feil oppstod" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -998,13 +999,13 @@ "log i rapporten. Oppgraderinga er avbroten.\n" "Den opphavlege sources.list er lagra i /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl + C trykt" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1013,134 +1014,134 @@ "tilstand. Er du sikker på at du vil gjera dette?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "For å hindra tap av data, bør du lukke alle program og dokument." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Ikkje lenger støtta av Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Nedgrader (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Fjern (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Ikkje lenger nødvendig (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Installer (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Oppgrader (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Medieendring" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Vis forskjellar >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Skjul forskjellar" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Feil" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Avbryt" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Lukk" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Syn terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Gøym terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Informasjon" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Detaljar" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Ikkje lenger støtta %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Fjern %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Fjern (vart installert automatisk) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Installer %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Oppgrader %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Omstart er nødvendig" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Start systemet på ny for å fullføra oppgraderinga" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Start på nytt no" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1152,32 +1153,32 @@ "Systemet kan verta ubrukeleg viss du avbryt oppgraderinga. Det er sterkt " "tilrådd å fullføra oppgraderinga." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Avbryt oppgradering?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li dag" msgstr[1] "%li dagar" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li time" msgstr[1] "%li timar" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minutt" msgstr[1] "%li minutt" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1193,7 +1194,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1207,14 +1208,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1224,34 +1225,32 @@ "eit 56k-modem." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Denne nedlastinga vil ta ca. %s med tilkoplinga di. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Førebur oppgraderinga" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Hentar nye programvarekanalar" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Hentar nye programvarepakkar" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Installerer oppgraderingane" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Ryddar opp" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1268,28 +1267,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d-pakka vil fjernast." msgstr[1] "%d pakkar vil fjernast." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d-pakka vil verta installert." msgstr[1] "%d pakker vil verta installerte." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d-pakka vil verta oppgradert." msgstr[1] "%d pakkar vil verta oppgraderte." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1300,28 +1299,28 @@ "\n" "Du må laste ned totalt %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1329,38 +1328,38 @@ "Det er ingen oppgraderingar tilgjengelege for ditt system. Oppgraderinga vil " "no verta avbroten." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Omstart er nødvendig" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Oppgraderinga er ikkje fullført og ein omstart er nødvendig. Vil du gjera " "dette no?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Klarte ikkje å køyra oppgraderingsverktøyet" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1368,34 +1367,34 @@ "Dette er mest sannsynleg ein feil i oppgraderingsverktøyet. Rapporter denne " "feilen ved å bruka kommandoen «ubuntu-bug update-manager» i ein terminal." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Signaturen til oppgraderingsvertøyet" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Oppgraderingsvertøy" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Klarte ikkje å henta" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "Klarte ikkje å henta oppgraderinga. Det kan vera eit nettverksproblem. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Å stadfesta identiteten mislukkast" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1403,13 +1402,13 @@ "Klarte ikkje å stadfesta identiteten til oppgraderinga. Det kan vere feil " "med nettverket eller tenaren. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Mislukkast i å pakka ut" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1417,13 +1416,13 @@ "Klarte ikkje å pakka ut oppgraderinga. Det kan vera eit problem med " "netverket eller tenaren. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Verifiseringsfeil" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1431,15 +1430,15 @@ "Å verifisera oppgraderinga mislukkast. Det kan vera ein feil med nettverket " "eller tenaren. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Klarte ikkje å køyra oppgradering" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1447,13 +1446,13 @@ "Dette skjer vanlegvis i system der mappa /tmp er montert med køyreløyve. " "Monter på nytt utan køyreløyve og køyr oppgraderinga på nytt." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Feilmeldinga er «%s»." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1465,73 +1464,73 @@ "avbroten. \n" "Den opphavlege sources.list er lagra i /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Avbryt" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Degradert:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Trykk Enter for å halda fram" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Hald fram [jN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Detaljar [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "j" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Ikkje lenger støtta: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Fjern %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Installer: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Oppgrader %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Hald fram [Jn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1594,9 +1593,8 @@ msgstr "Distribusjonsoppgradering" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Oppgraderer Ubuntu til versjon 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1614,148 +1612,162 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Vent litt, dette kan ta ei stund." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Oppdateringa er ferdig" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Klarte ikkje å finna versjonsnotata" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Tenaren kan vera overbelasta. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Klarte ikkje å lasta ned versjonsnotata" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Sjekk internettilkoplinga di." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Oppgrader" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Versjonsnotat" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Lastar ned ekstra pakkefiler..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Fil %s av %s, %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Fil %s av %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Opna lenkje i nettlesar" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Kopier lenkje til utklippstavle" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Lastar ned fil %(current)li av %(total)li med %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Lastar ned fila %(current)li av %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Di utgåve av Ubuntu er ikkje lenger støtta." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Oppgraderingsinformasjon" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Installer" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Versjon %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Inga nettverkstilkopling er oppdaga. Du kan ikkje laste ned informasjon om " "endringsloggen." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Lastar ned lista over endringar..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "Vel _ingen" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Vel _alle" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s oppdatering er vald" +msgstr[1] "%(count)s oppdateringar er valde" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s vil verta lasta ned." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "Oppdateringa er lasta ned, men ikkje installert" -msgstr[1] "Oppdateringane er lasta ned, men ikkje installerte" +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Ukjend storleik på nedlastinga." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1763,7 +1775,7 @@ "Siste oppdatering av pakkeinformasjonen er ukjend. Trykk «Sjå etter " "oppdateringar» for å oppdatera informasjonen." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1772,7 +1784,7 @@ "Pakkeinformasjonen vart sist oppdatert for %(days_ago)s dagar sia\n" "Trykk «Sjekk»-knappen nedanfor for å leita etter nye oppdateringar." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1780,7 +1792,7 @@ msgstr[1] "" "Pakkeinformasjonen vart sist oppdatert for %(days_ago)s dagar sidan." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1791,34 +1803,44 @@ "Pakkeinformasjonen vart sist oppdatert for %(hours_ago)s timar sidan." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Pakkeinformasjonen vart sist oppdatert for %s minutt sidan." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Pakkeinformasjonen vart akkurat oppdatert." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Programvareoppdateringar fiksar feil, fjernar tryggleikshol og gir deg nye " +"funksjonar." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Programvareoppdateringar er kanskje tilgjengelege for maskina di." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Velkommen til Ubuntu" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1829,7 +1851,7 @@ "diskplass på «%s». Tøm papirkorga og fjern mellombelse pakkar frå gamle " "installasjonar, ved å køyra «sudo apt-get clean»." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1837,24 +1859,24 @@ "Start datamaskina om att for å fullføra oppdateringane. Hugs å lagra " "arbeidet ditt før du held fram." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Les pakkeinformasjon" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Koplar til …" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Det kan henda du ikkje kan sjå etter eller lasta ned nye oppdateringar." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Kunne ikkje førebu pakkeinformasjonen" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1867,7 +1889,7 @@ "Rapporter denne feilen i «update-manager»-pakken og inkluder følgjande " "feilmelding:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1879,31 +1901,31 @@ "Rapporter denne feilen i «update-manager»-pakken og inkluder følgjande " "feilmelding:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Ny installasjon)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Storleik: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Frå versjon %(old_version)s til %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Versjon %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Å oppgradere til ny utgåve er ikkje mogleg akkurat no" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1912,21 +1934,21 @@ "Klarte ikkje å oppgradera til den nye versjonen akkurat no. Prøv på nytt " "seinare. Tenaren svarte: «%s»" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Lastar ned oppgraderingverktøyet" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Ubuntu-utgjevinga «%s» er no tilgjengeleg" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Programvareoversikta er øydelagd" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1936,6 +1958,17 @@ "\"Synaptic\" eller køyr \"sudo apt-get install -f\" i ein terminal for å " "løysa dette problemet." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Ei ny utgjeving, «%s», er tilgjengeleg." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Avbryt" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Sjå etter oppdateringar" @@ -1945,22 +1978,18 @@ msgstr "Installer alle tilgjengelege oppdateringar" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Avbryt" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Byggjer ei liste over oppdateringar" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1984,21 +2013,21 @@ " * Uoffisielle programvarepakkar som ikkje er frå Ubuntu\n" " * Vanlege endringar i ei Ubuntu-utgåve som endå ikkje er utgjeven" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Lastar ned endringslogg" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Andre oppdateringar (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" "Denne oppdateringa kjem frå ei kjelde som ikkje støttar endringsloggar." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2006,7 +2035,7 @@ "Kunne ikkje lasta ned lista med endringar. \n" "Kontroller sambandet til Internett." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2019,7 +2048,7 @@ "Tilgjengeleg versjon: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2032,7 +2061,7 @@ "Bruk http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "fram til endringane vert tilgjengelege, eller prøv på nytt seinare." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2045,52 +2074,43 @@ "Bruk http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "fram til endringane vert tilgjengelege, eller prøv att seinare." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Klarte ikkje å oppdaga distribusjonen" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Støytte på ein feil i undersøkinga av kva system du sit på: «%s»." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Viktige tryggleiksoppdateringar" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Tilrådde oppdateringar" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Føreslegne oppdateringar" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backports" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Distribusjonsoppdateringar" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Andre oppdateringar" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Startar Oppdateringshandsamar" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Programvareoppdateringar fiksar feil, fjernar tryggleikshol og gir deg nye " -"funksjonar." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Delvis oppgradering" @@ -2162,37 +2182,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Programvareoppdateringar" +msgid "Update Manager" +msgstr "Oppdateringshandsamar" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Programvareoppdateringar" +msgid "Starting Update Manager" +msgstr "Startar oppdateringshandsamaren" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "O_ppgrader" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "oppdateringar" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Installer" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Endringar" +msgid "updates" +msgstr "oppdateringar" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Skildring" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Skildring av oppdateringa" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2200,23 +2210,33 @@ "Du er kopla til via roaming, og kan verta kravd penger for datatrafikken åt " "denne oppdateringa." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Du er kopla til via eit trådlaust modem." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "Du lyt kopla datamaskina åt ei straumkjelde før du oppdaterer." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Installer oppdateringar" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Endringar" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Innstillingar …" +msgid "Description" +msgstr "Skildring" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Installer" +msgid "Description of update" +msgstr "Skildring av oppdateringa" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Innstillingar …" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2239,9 +2259,8 @@ msgstr "Du har takka nei til å oppgradera til eit nytt Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Du kan oppdatera på eit seinare tidspunkt ved å opna oppdateringshandsamaren " @@ -2255,58 +2274,58 @@ msgid "Show and install available updates" msgstr "Syn og installer tilgjengelege oppdateringar" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Syn versjonen og avslutt" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Mappe som inneheld datafilene" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Sjekk om ei ny Ubuntu-utgjeving er tilgjengeleg" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Sjekk om ei oppgradering til den siste utviklarversjonen er mogeleg" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "Oppgrader ved å nytta den sist føreslåtte oppgraderingsprosessen" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Ikkje sett fokus på område i oppstarten" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Prøv å køyra ein dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Ikkje sjå etter oppdateringar ved oppstart" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Test oppgraderinga i ei aufs-sandkasse" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Køyrer delvis oppgradering" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Forsøk å oppgradera til den nyaste utgjevinga ved å bruka " "oppgraderingsverktøyet frå $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2316,11 +2335,11 @@ "No vert 'desktop' støtta for oppgradering av vanlege arbeidsstasjonar, og " "'server' for tenarsystem." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Køyr vald grenseflate" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2328,11 +2347,11 @@ "Berre sjekk om ei ny distribusjonsutgjeving er tilgjengeleg, og returner " "resultatet via avsluttingskoden." -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2340,172 +2359,215 @@ "For informasjon om oppgradering, vitj:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Fann ingen nye utgjevingar" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Ei ny utgjeving, «%s», er tilgjengeleg." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Køyr «do-release-upgrade» for å oppgradera til henne." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Oppgradering tilgjengeleg: Ubuntu %(version)s" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Du har takka nei til å oppgradera åt Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Ikkje-innarbeidd metode: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Ei fil på disken" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb-pakke" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Installer manglande pakke." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Pakka %s lyt verta installert." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb-pakke" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s må vera merkt som manuelt installert." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"kdelibs5-dev må installerast om du oppgraderer med kdelibs4-dev installert. " -"Sjå bugs.launchpad.net, feilrapport #279621 for detaljar." - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i gamle oppføringar i statusfila" # Dette er ei fil i /var/lib/dpkg -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Gamle oppføringar i dpkg-status-fila" # Dette er ei fil i /var/lib/dpkg #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Gamle dpkg-status-oppføringar" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"kdelibs5-dev må installerast om du oppgraderer med kdelibs4-dev installert. " +"Sjå bugs.launchpad.net, feilrapport #279621 for detaljar." + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s må vera merkt som manuelt installert." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Fjern lilo sia grub `og er installert. (Sjå feilrapport #314004 for " "detaljar.)" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s oppdatering er vald" -#~ msgstr[1] "%(count)s oppdateringar er valde" - -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" - -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Velkommen til Ubuntu" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Oppdateringshandsamar" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "Starting Update Manager" -#~ msgstr "Startar oppdateringshandsamaren" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Du er kopla til via eit trådlaust modem." +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "_Installer oppdateringar" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "Your system is up-to-date" #~ msgstr "Systemet ditt er oppdatert!" @@ -2540,6 +2602,11 @@ #~ "Datamaskina di vil ikkje lenger få kritiske oppdateringar eller " #~ "tryggleikshol tetta. Oppgrader til ein nyare versjon av Ubuntu Linux no." +#~ msgid "The update has already been downloaded, but not installed" +#~ msgid_plural "The updates have already been downloaded, but not installed" +#~ msgstr[0] "Oppdateringa er lasta ned, men ikkje installert" +#~ msgstr[1] "Oppdateringane er lasta ned, men ikkje installerte" + #~ msgid "" #~ "If you don't want to install them now, choose \"Update Manager\" from the " #~ "Administration menu later." @@ -2646,6 +2713,9 @@ #~ "vart utgjeven. Om du ikkje vil installera dei no, vel " #~ "«Oppdateringshandsamar» frå Program seinare." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Oppgraderer Ubuntu til versjon 11.10" + #~ msgid "" #~ "These software updates have been issued since this version of Ubuntu was " #~ "released. If you don't want to install them now, choose \"Update Manager" diff -Nru update-manager-17.10.11/po/oc.po update-manager-0.156.14.15/po/oc.po --- update-manager-17.10.11/po/oc.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/oc.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-30 06:19+0000\n" "Last-Translator: Cédric VALMARY (Tot en òc) \n" "Language-Team: Occitan (post 1500) \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "%(size).0f ko" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f Mo" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Servidor per %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Servidor principal" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Servidors personalizats" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Impossible d'avalorar la linha de source.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Impossible de localizar los fichièrs dels paquets. Benlèu es pas un disc " "Ubuntu, o alara es previst per una autra arquitectura." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Impossible d'apondre lo CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,13 +83,13 @@ "Lo messatge d'error èra :\n" "« %s »" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Suprimir lo paquet damatjat" msgstr[1] "Suprimir los paquets damatjats" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -109,15 +110,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Benlèu que lo servidor es subrecarga" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Paquets copats" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -126,7 +127,7 @@ "corregir. Corrigissètz-los amb synaptic o apt-get abans de contunhar." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -148,12 +149,12 @@ " * un paquet logicial pas oficial, pas provesit per Ubuntu.\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Aquò se sembla fòrça a un problèma temporari. Tornatz ensajar pus tard." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -161,16 +162,16 @@ "Se res de tot aquò s'aplica pas, mercé de senhalar aquel bug en utilizant la " "comanda «ubuntu-bug update-manager» dins un terminal." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Impossible de calcular la mesa a jorn" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Error al moment de l'autentificacion d'unes paquets" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -180,7 +181,7 @@ "problèma temporari de la ret. Pòt èsser util de tornar ensajar mai tard. " "Trobaretz çaijós una lista dels paquets pas autentificats." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -188,22 +189,22 @@ "Lo paquet « %s » es marcat per supression mas es dins la lista negra de las " "supressions." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Lo paquet essencial « %s » es marcat per supression." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Temptativa d'installacion de la version en lista d'exclusion « %s »" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Impossible d'installar « %s »" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -212,11 +213,11 @@ "problèma en picant « ubuntu-bug update-manager » dins un terminal." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Impossible de determinar lo metapaquet" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -230,15 +231,15 @@ " Installatz un dels paquets çaisús, en utilizant Synaptic o apt-get, abans " "de contunhar." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Lectura de l'amagatal" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Impossible d'obténer un varrolh exclusiu" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -247,11 +248,11 @@ "apt-get o aptitude) ja es en cors d'execucion. D'en primièr, tampatz aquesta " "aplicacion." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "La mesa a nivèl via una connexion distanta es pas presa en carga" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -265,11 +266,11 @@ "\n" "Ara, la mesa a jorn va èsser anullada. Ensajatz sens ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Contunhar dins una sesilha SSH ?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -285,11 +286,11 @@ "Se contunhatz, un servici ssh novèl serà aviat sul pòrt « %s ».\n" "Volètz contunhar?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Aviada d'un processús sshd suplementari" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -300,7 +301,7 @@ "suplementari serà aviat sul pòrt « %s ». En cas de problèma amb l'ssh " "existent, vos poiretz encara connectar amb l'autre.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -313,32 +314,32 @@ "Podètz dobrir lo pòrt amb, per exemple :\n" "« %s »" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Impossible de metre a jorn" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" "La mesa a nivèl de « %s » cap a « %s » es pas presa en carga per aqueste " "esplech." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "La configuracion de l'espaci protegit (sandbox) a fracassat" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" "Es estat impossible de crear l'environament per l'espaci protegit (sandbox)" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Mòde espaci protegit (sandbox)" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -352,18 +353,18 @@ "Entre ara e l'amodament que ven, *cap* de cambiament escrich dins un dorsièr " "sistèma serà pas permanent." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Vòstra installacion de Python es damatjada. Reparatz lo ligam simbolic « /" "usr/bin/python »." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Lo paquet « debsig-verify » es installat" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -373,12 +374,12 @@ "Suprimissètz-lo amb synaptic o amb « apt-get remove debsig-verify », puèi " "reaviatz la mesa a jorn." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Impossible d'escriure dins '%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -389,11 +390,11 @@ "pòt pas contunhar.\n" "Asseguratz-vos que lo dorsièr sistèma es accessible en escritura." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Inclure las darrièras mesas a jorn d'Internet ?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -414,16 +415,16 @@ "jorn.\n" "Se respondètz « non », la ret serà pas brica utilizada." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "desactivat per la mesa a nivèl cap a %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Cap de miralh valable pas trobat" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -443,11 +444,11 @@ "Se causissètz « non » la mesa a nivèl serà anullada." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Generar las fonts per defaut ?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -461,11 +462,11 @@ "Las entradas per defaut per « %s » devon èsser apondudas ? Se causissètz " "« non » la mesa a nivèl serà anullada." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Informacions suls depauses pas valablas" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -473,11 +474,11 @@ "La mesa a nivèl de las informacions dels depauses a renviat un fichièr " "invalid, un rapòrt de bug va èsser mandat." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Fonts que provenon de partidas tèrças desactivadas" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -487,13 +488,13 @@ "tèrças, son estadas desactivadas. Las podètz reactivar aprèp la mesa a nivèl " "amb l'esplech « Gestionari de canals logicials » o amb Synaptic." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Paquet en estat incoerent" msgstr[1] "Paquets en estat incoerent" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -512,11 +513,11 @@ "mas cap d'archiu que los contenga es pas estat trobat. Tornatz installar " "aquestes paquets manualament o suprimissètz-los de vòstre sistèma." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Error al moment de la mesa a jorn" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -525,13 +526,13 @@ "degut a un problèma de ret. Verificatz vòstra connexion a la ret e tornatz " "ensajar." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Pas pro d'espaci liure sul disc" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -547,21 +548,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Calcul de las modificacions" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Volètz començar la mesa a jorn ?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Mesa a nivèl anullada" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -569,12 +570,12 @@ "Ara, la mesa a nivèl va èsser anullada e l’estat original del sistèma " "restablit. La podètz reprene pus tard." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Impossible de telecargar las mesas a jorn" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -585,27 +586,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Error pendent la somission" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Restabliment del sistèma dins son estat d'origina" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Impossible d'installar las mesas a jorn" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -613,7 +614,7 @@ "La mesa a nivèl a fracassat. Vòstre sistèma poiriá èsser inutilizable. Ara, " "una temptativa de recuperacion se va debanar (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -630,7 +631,7 @@ "fichièrs contenguts dins lo dorsièr /var/log/dist-upgrade/.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -638,20 +639,20 @@ "La mesa a nivèl a fracassat. Verificatz vòstra connexion Internet e lo " "supòrt d'installacion abans de tornar ensajar. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Suprimir los paquets obsolets ?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Conservar" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Suprimir" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -661,27 +662,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Dependéncia requesida pas installada" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "La dependéncia requesida « %s » es pas installada. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Verificacion del gestionari de paquets" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Preparacion de la mesa a jorn impossibla" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -689,11 +690,11 @@ "La preparacion del sistèma per la mesa a nivèl a fracassat. Un processus de " "rapòrt d'incident es doncas inicializat." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Impossible d'obténer los prerequesits necessaris a la mesa a jorn" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -704,70 +705,70 @@ "mesa a nivèl se va arrestar e restablir lo sistèma dins son estat inicial.\n" "En complement, un processus de rapòrt d'incident es inicializat." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Mesa a jorn de las informacions suls depauses" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Impossible d'apondre lo CD" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "O planhèm, l'apondon del CD a fracassat." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Informacions suls paquets invalidas" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Recuperacion" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Mesa a nivèl" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Mesa a nivèl acabada" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "La mesa a nivèl es acabada, mas d'errors se son produchas al moment " "d'aqueste processus de mesa a nivèl." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Recèrca de logicials obsolets" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "La mesa a nivèl del sistèma es acabada." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "La mesa a nivèl parciala del sistèma es acabada." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms es en cors d'utilizacion" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -777,13 +778,13 @@ "logicial « evms » es pas pus pres en carga. Desactivatz-lo abans d'executar " "tornarmai la mesa a nivèl." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "Es possible que vòstra carta grafica siá pas entièrament presa en carga per " "Ubuntu 12.04 LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -795,9 +796,9 @@ "Per mai d'informacion, rendètz-vos sus https://wiki.ubuntu.com/X/Bugs/" "UpdateManagerWarningForI8xx Volètz contunhar la mesa a nivèl ?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -805,8 +806,8 @@ "Es possible que la mesa a nivèl reduisca los efièches visuals e las " "performàncias pels jòcs e autres programas exigents en tèrmes de grafismes." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -820,7 +821,7 @@ "\n" "Volètz contunhar ?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -834,11 +835,11 @@ "\n" "Volètz contunhar ?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Pas de processor i686" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -851,11 +852,11 @@ "a jorn vòstre sistèma cap a una novèla version d'Ubuntu amb vòstre material " "actual." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Pas de processor ARMv6" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -867,11 +868,11 @@ "necessitan al minimum una arquitectura ARMv6. Es impossible de metre a nivèl " "vòstre sistèma cap a la version novèla d'Ubuntu." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Inicializacion indisponibla" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -887,17 +888,17 @@ "\n" "Sètz segur que volètz contunhar ?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Mesa a nivèl en espaci protegit (sandbox) en utilizant aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Utilizar lo camin balhar per recercar un CD-ROM que conten de paquets de " "metre a jorn" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -905,59 +906,59 @@ "Utilizar una de las interfàcias disponiblas actualament : \n" " DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*OBSOLÈT* aquesta opcion serà ignorada" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Efectuar pas qu'una mesa a jorn parciala (pas de remplaçament de sources." "list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Desactivar la presa en carga de GNU screen" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Definir l'emplaçament de las donadas" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Inserissètz « %s » dins lo lector « %s »" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "La recuperacion dels fichièrs es acabada" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Recuperacion del fichièr %li sus %li a %s octets/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Demòra(n) environ %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Telecargament del fichièr %li sus %li" @@ -967,27 +968,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Aplicacion dels cambiaments" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "problèmas de dependéncias - daissat pas configurat" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Impossible d'installar « %s »" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -999,7 +1000,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1010,7 +1011,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1018,20 +1019,20 @@ "Totas las modificacions aportadas a aqueste fichièr de configuracion seràn " "perdudas se decidètz de lo remplaçar per una version mai recenta." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Impossible de trobar la comanda « diff »" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Una error fatala s'es producha" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1044,13 +1045,13 @@ "Vòstre fichièr souce.list original es estat enregistrat dins /etc/apt/" "sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Quichada de Ctrl+C" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1059,136 +1060,136 @@ "inutilizable. Sètz segur que volètz far aquò ?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Per evitar tota pèrda de donadas, Tampatz totas las aplicacions e documents " "dobèrts." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Es pas pus mantengut per Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Installar en version anteriora (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Suprimir (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Es pas pus necessari (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Installar (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Mettre à jour (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Cambiament de mèdia" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Afichar las diferéncias >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Amagar las diferéncias" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Error" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Anullar" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Tampar" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Afichar lo terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Amagar lo terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Informacions" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Detalhs" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Es pas pus mantengut (%s)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Suprimir %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Suprimir (èra estat installat automaticament) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Installar %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Metre a nivèl %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Vos cal tornar amodar l'ordenador" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Tornatz aviar lo sistèma per acabar la mesa a jorn" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Tornar amodar ara" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1200,32 +1201,32 @@ "Lo sistèma poiriá venir inutilizable s'anullatz la mesa a nivèl. Vos es " "fòrtament recomandat de tornar prene la mesa a jorn." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "_Anullar la mesa a nivèl ?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li jorn" msgstr[1] "%li jorns" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li ora" msgstr[1] "%li oras" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minuta" msgstr[1] "%li minutas" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1241,7 +1242,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1255,14 +1256,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1272,34 +1273,32 @@ "environ %s amb un modèm 56K." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Aqueste telecargament prendrà environ %s amb vòstra connexion. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Preparacion de la mesa a nivèl" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Obtencion de depauses logicials novèls" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Obtencion de paquets novèls" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Installacion de las mesas a jorn" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Netejatge" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1316,28 +1315,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d paquet va èsser suprimit." msgstr[1] "%d paquets van èsser suprimits" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d paquet novèl va èsser installat." msgstr[1] "%d paquets novèls van èsser installats." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d paquet va èsser mes a jorn." msgstr[1] "%d paquets van èsser meses a jorn." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1348,7 +1347,7 @@ "\n" "Vos cal telecargar un total de %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1356,7 +1355,7 @@ "L'installacion de la mesa a nivèl pòt prene mantuna ora. Un còp lo " "telecargament acabat, aqueste processus pòt pas èsser anullat." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1364,16 +1363,16 @@ "Obténer e installar la mesa a nivèl pòt prene mantuna ora. Un còp lo " "telecargament acabat, aqueste processus pòt pas èsser anullat." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Suprimir los paquets pòt prene mantuna ora. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Los logicials sus aqueste ordenador son a jorn." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1381,38 +1380,38 @@ "Cap de mesa a nivèl es pas disponibla per vòstre sistèma. Ara, la mesa a " "nivèl va èsser anullada." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Vos cal tornar amodar l'ordenador" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "La mesa a nivèl es acabada e l'ordenador deu èsser reamodat. O volètz far " "tre ara ?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "autentificacion de '%(file)s' amb '%(signature)s' " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "extraccion de '%s'" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Impossible d'aviar l'esplech de mesa a nivèl" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1420,35 +1419,35 @@ "Aquò es fòrt probablament un bug del gestionari de mesa a jorn. Senhalatz " "aqueste bug en picant « ubuntu-bug update-manager » dins un terminal." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Signatura de l'esplech de mesa a jorn" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Esplech de mesa a jorn" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Recuperacion impossibla" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "La recuperacion de la mesa a nivèl a fracassat. Benlèu qu'i a un problèma de " "ret. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "L'autentificacion a fracassat" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1456,13 +1455,13 @@ "L'autentificacion de la mesa a nivèl a fracassat. Benlèu qu'i a un problèma " "de ret o de servidor. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Extraccion impossibla" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1470,13 +1469,13 @@ "L'extraccion de la mesa a nivèl a fracassat. Benlèu qu'i a un problèma de " "ret o de servidor. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "La verificacion a fracassat" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1484,15 +1483,15 @@ "La verificacion de la mesa a nivèl a fracassat. Benlèu qu'i a un problèma de " "ret o de servidor. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Impossible d'aviar la mesa a nivèl" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1500,13 +1499,13 @@ "De costuma, aquò es degut a un sistèma o /tmp montat en mòde noexec. " "Remontatz-lo sens l'opcion noexec e metètz a jorn tornarmai." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Lo messatge d'error es « %s »." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1519,73 +1518,73 @@ "Vòstre fichièr souce.list original es estat enregistrat dins /etc/apt/" "sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Anullacion" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Relegat :\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Quichatz sus [Entrada] per contunhar" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "_Contunhar [oN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Detalhs [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "o" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "j" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Es pas pus mantengut : %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Suprimir : %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Installar : %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Metre a jorn : %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Contunhar [On] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1652,9 +1651,8 @@ msgstr "Mesa a jorn de la distribucion" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Mesa a nivèl d'Ubuntu cap a la version 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Mesa a nivèl d'Ubuntu cap a la version 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1672,84 +1670,85 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Pacientatz, aquò pòt prene de temps." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "La mesa a jorn es acabada" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Impossible de trobar las nòtas de publicacion" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Benlèu que lo servidor es subrecargat. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Impossible de telecargar las nòtas de publicacion" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Verificatz vòstra connexion internet." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Metre a nivèl" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Nòtas de version" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Telecargament dels paquets suplementaris..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Fichièr %s sus %s a %s octets/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Fichièr %s sus %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Dobrir lo ligam dins un navigador" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Copiar lo ligam dins lo quichapapièrs" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Telecargament del fichièr %(current)li sus %(total)li a %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Telecargament del fichièr %(current)li sus %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Vòstra version d'Ubuntu es pas pus presa en carga." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1757,53 +1756,59 @@ "Recbretz pas mai cap de correccion de falhas de seguretat ni de mesas a jorn " "criticas. Metètz a nivèl cap a una version mai recenta d'Ubuntu ." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Informacion de mesa a nivèl" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Installar" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Nom" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Version %s  : \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Cap de connexion de ret es pas estada detectada. Podètz pas telecargar la " "lista de cambiaments." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Telecargament de la lista de las modificacions..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Deseleccionar tot" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Seleccionar _tot" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s mesa a jorn es estada seleccionada." +msgstr[1] "%(count)s mesas a jorn son estadas seleccionadas." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s serà(n) telecargat(s)." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "La mesa a jorn es ja estada telecargada, mas pas encara installada." msgstr[1] "" "Las mesas a jorn son ja estadas telecargadas, mas pas encara installadas." @@ -1812,11 +1817,18 @@ msgid "There are no updates to install." msgstr "I a pas de mesas a jorn d'installar." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Talha del telecargament desconeguda." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1825,7 +1837,7 @@ "desconeguda. Clicatz sul boton “Verificar” per metre a jorn aquelas " "informacions." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1835,7 +1847,7 @@ "Clicatz sul boton « Verificar » çaijós per verificar las novèlas mesas a " "jorn dels logicials." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1845,7 +1857,7 @@ "Las informacions suls paquets son estadas mesas a jorn i a %(days_ago)s " "jorns." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1857,34 +1869,46 @@ "oras." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Las informacions dels paquets son estadas mesas a jorn i a %s minutas." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Las informacions dels paquets venon d'èsser mesas a jorn." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Las mesas a jorn logicialas corregisson d'errors, eliminan de falhas de " +"seguretat e apòrtan de foncionalitats novèlas." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "De mesas a jorn pòdon èsser disponiblas per vòstre ordenador." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Benvenguda sus Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Aquestas mesas a jorn son estadas difusadas dempuèi qu'aquesta version " +"d'Ubuntu es estada publicada." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "De mesas a jorn son disponiblas per aqueste ordenador." + +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1896,7 +1920,7 @@ "e suprimissètz los paquets temporaris de las installacions precedentas en " "utilizant « sudo apt-get clean »." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1904,23 +1928,23 @@ "Vos cal tornar amodar l'ordenador per que l'installacion de las mesas a jorn " "s'acabe. Enregistratz vòstre trabalh abans de contunhar." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Lectura de las informacions suls paquets" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Connexion en cors..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "Benlèu que podètz pas verificar o telecargar de mesas a jorn." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Impossible d'inicializar las donadas suls paquets" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1934,7 +1958,7 @@ "Senhalatz aqueste bug del paquet « update-manager » en i jonhent lo messatge " "d'error seguent :\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1947,31 +1971,31 @@ "Senhalatz aqueste bug del paquet « update-manager » en i jonhent lo messatge " "d'error seguent :" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Installacion novèla)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Talha : %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "De la version %(old_version)s cap a la version %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Version %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Mesa a nivèl impossibla pel moment." -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1980,21 +2004,21 @@ "La mesa a nivèl de la distribucion se pòt pas executar pel moment. Tornatz " "ensajar pus tard. Lo servidor a renviat : « %s »" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Telecargament de l'esplech de mesa a jorn de distribucion" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "La version novèla « %s » d'Ubuntu es disponibla" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "La lista dels logicials es corrompuda" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -2004,6 +2028,17 @@ "lo « Gestionari de paquets Synaptic » o aviatz « sudo apt-get install -f » " "dins un terminal per corregir aqueste problèma." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Version novèla « %s » disponibla." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Anullar" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Verificar s'i a de mesas a jorn" @@ -2013,22 +2048,18 @@ msgstr "Installar totas las mesas a jorn disponiblas" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Anullar" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Istoric dels cambiaments (Changelog)" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Mesas a jorn" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Construccion de la lista de las mesas a jorn" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2052,21 +2083,21 @@ " * de paquets non oficials pas provesits per Ubuntu ;\n" " * de modificacions normalas ligadas a una preversion d'Ubuntu." -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Telecargament de l'istoric de desvolopament" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Autras mesas a Jorn (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" "Aquesta mesa a jorn proven d'una font que provesís pas de nòtas de version." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2074,7 +2105,7 @@ "Lo telecargament de la lista de las modificacions a fracassat.\n" "Verificatz vòstra connexion Internet." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2087,7 +2118,7 @@ "Version disponibla : %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2102,7 +2133,7 @@ "fins al moment que las modificacions seràn disponiblas o tornatz ensajar pus " "tard." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2115,54 +2146,45 @@ "Consultatz http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "en esperant que siá disponibla, o tornatz ensajar mai tard." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Impossible de detectar la distribucion" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" "Una error « %s » s'es producha en ensajant de determinar lo sistèma " "qu'utilizatz." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Mesas a jorn de seguretat importantas" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Mesas a jorn recomandadas" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Mesas a jorn suggeridas" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Retroportatges" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Mesas a jorn de la distribucion" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Autras mesas a jorn" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Aviada del gestionari de mesas a jorn" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Las mesas a jorn logicialas corregisson d'errors, eliminan de falhas de " -"seguretat e apòrtan de foncionalitats novèlas." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Mesa a jorn parciala" @@ -2235,37 +2257,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Mesa a jorn dels logicials" +msgid "Update Manager" +msgstr "Gestionari de mesas a jorn" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Mesa a jorn dels logicials" +msgid "Starting Update Manager" +msgstr "Aviada del gestionari de mesas a jorn" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Metre a jorn" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "mesas a jorn" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Installar" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Cambiaments" +msgid "updates" +msgstr "mesas a jorn" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Descripcion" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Descripcion de la mesa a jorn" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2273,25 +2285,35 @@ "Sètz connectat(-ada) via un operador mobil e podètz èsser facturat(-ada) per " "las donadas mandadas per aquesta mesa a jorn." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Sètz connectat(ada) amb un modèm sens fial." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Es mai segur de brancar l'ordenador sus una alimentacion sector abans la " "mesa a jorn." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Installar las mesas a jorn" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Cambiaments" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Paramètres..." +msgid "Description" +msgstr "Descripcion" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Installar" +msgid "Description of update" +msgstr "Descripcion de la mesa a jorn" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Paramètres..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2316,9 +2338,8 @@ msgstr "Avètz declinada la mesa a jorn cap a la version novèla d'Ubuntu." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Podètz metre a nivèl ulteriorament en aviant lo « Gestionari de mesas a " @@ -2332,63 +2353,63 @@ msgid "Show and install available updates" msgstr "Afichar e installar las mesas a jorn disponiblas" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Afichar lo numèro de version e tampar" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Dorsièr que conten los fichièrs de donadas" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Verificar se una version novèla d'Ubuntu es disponibla" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "Verificar se la mesa a nivèl cap a la darrièra version de desvolopament es " "possibla" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Metre a nivèl en utilizant la darrièra version prepausada de l'assistent de " "mesa a jorn de la distribucion" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Capturar pas lo focus a l'aviada" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Ensajar d'executar un « dist-upgrade »" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Verificar pas las mesas a jorn a l'aviada" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Testar la mesa a nivèl dins un environament protegit (sandbox aufs)" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Aviada d'una mesa a nivèl parciala" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" "Veire la descripcion del paquet al luòc de la lista de las modificacions" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Ensajar de metre a nivèl cap a la darrièra version disponibla en utilizant " "l'esplech de mesa a jorn de $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2399,11 +2420,11 @@ "estandardas d'un ordenador de burèu e « server » per las installacions de " "tipe servidor." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Aviar l'interfàcia especificada" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2411,11 +2432,11 @@ "Verificar solament se una distribucion novèla es disponibla e afichar lo " "resultat en sortida." -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Recèrca d'una novèla version d'Ubuntu" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2423,59 +2444,59 @@ "Per mai d'entresenhas sus la mesa a jorn, visitatz :\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Cap de version novèla pas trobada" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Version novèla « %s » disponibla." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Aviar « do-release-upgrade » per metre a nivèl cap a aquesta." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Mesa a nivèl cap a Ubuntu %(version)s disponibla" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Avètz declinada la mesa a jorn cap a Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Apondre la sortida de desbugatge" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Afichar los paquets pas preses en carga presents sus aquesta maquina" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Afichar los paquets preses en carga presents sus aquesta maquina" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Veire totes los paquets amb lor estatut" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Afichar totes los paquets en lista" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Resumit de l'estat del supòrt de '%s' :" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" "Avètz %(num)s paquets (%(percent).1f%%) preses en carga fins a %(temps)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" @@ -2483,11 +2504,11 @@ "Avètz %(num)s paquets (%(percent).1f%%) que pòdon pas o pas mai èsser " "telecargats" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "Avètz %(num)s paquets (%(percent).1f%%) que son pas preses en carga." -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2495,54 +2516,71 @@ "Executar amb --show-unsupported, --show-supported o --show-all per veire mai " "de detalhs" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Es pas mai telecargable :" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Pas preses en carga : " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Preses en carga fins en %s :" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Pas pres en carga" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Metòde pas implementat : %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Un fichièr sus disc" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "paquet .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Installacion del paquet mancant." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Lo paquet %s deuriá èsser installat." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "paquet .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s deu èsser marcat per una installacion manuala." +msgid "%i obsolete entries in the status file" +msgstr "%i entradas obsoletas dins lo fichièr « status »" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "Entradas obsoletas dins lo fichièr « status » del paquet" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "Entradas obsoletas dins lo fichièr « status »" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2551,69 +2589,82 @@ "la mesa a nivèl. Consultatz lo rapòrt de bug #279621 sus launchpad.net per " "mai d'entresenhas." -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "%i entradas obsoletas dins lo fichièr « status »" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "Entradas obsoletas dins lo fichièr « status » del paquet" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "Entradas obsoletas dins lo fichièr « status »" +msgid "%s needs to be marked as manually installed." +msgstr "%s deu èsser marcat per una installacion manuala." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Suprimir Lilo perque Grub es installat ja. (Vejatz bug #314004 per mai de " "detalhs.)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Aprèp la mesa a jorn de l'informacion de vòstre paquet, lo paquet " -#~ "essencial '%s' a pas pogut èsser retrobat. Un processus de rapòrt " -#~ "d'incident es doncas inicializat." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Mesa a nivèl d'Ubuntu cap a la version 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s mesa a jorn es estada seleccionada." -#~ msgstr[1] "%(count)s mesas a jorn son estadas seleccionadas." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Benvenguda sus Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Aquestas mesas a jorn son estadas difusadas dempuèi qu'aquesta version " -#~ "d'Ubuntu es estada publicada." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "De mesas a jorn son disponiblas per aqueste ordenador." - -#~ msgid "Update Manager" -#~ msgstr "Gestionari de mesas a jorn" - -#~ msgid "Starting Update Manager" -#~ msgstr "Aviada del gestionari de mesas a jorn" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Sètz connectat(ada) amb un modèm sens fial." - -#~ msgid "_Install Updates" -#~ msgstr "_Installar las mesas a jorn" +#~ "Aprèp la mesa a jorn de l'informacion de vòstre paquet, lo paquet " +#~ "essencial '%s' a pas pogut èsser retrobat. Un processus de rapòrt " +#~ "d'incident es doncas inicializat." #~ msgid "Your system is up-to-date" #~ msgstr "Vòstre sistèma es a jorn" @@ -2672,6 +2723,9 @@ #~ msgid "1 kB" #~ msgstr "1 ko" +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Mesa a nivèl d'Ubuntu cap a la version 11.10" + #~ msgid "Your graphics hardware may not be fully supported in Ubuntu 11.04." #~ msgstr "" #~ "Es possible que vòstra configuracion grafica materiala siá pas presa en " diff -Nru update-manager-17.10.11/po/pa.po update-manager-0.156.14.15/po/pa.po --- update-manager-17.10.11/po/pa.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/pa.po 2017-12-23 05:00:38.000000000 +0000 @@ -4,11 +4,12 @@ # # Amanpreet Singh Alam , 2005. # A S Alam , 2010. +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: pa\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-04-15 02:37+0000\n" "Last-Translator: A S Alam \n" "Language-Team: testLokalize \n" @@ -21,7 +22,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -29,13 +30,13 @@ msgstr[1] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s ਲਈ ਸਰਵਰ" @@ -43,30 +44,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "ਮੇਨ ਸਰਵਰ" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "ਪਸੰਦੀਦਾ ਸਰਵਰ" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "sources.list ਐਂਟਰੀ ਗਿਣੀ ਨਹੀਂ ਜਾ ਸਕੀ" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "ਕੋਈ ਵੀ ਪੈਕੇਜ ਫਾਇਲ ਲੱਭੀ ਨਹੀਂ ਜਾ ਸਕੀ, ਸ਼ਾਇਧ ਇਹ ਉਬਤੂੰ ਡਿਸਕ ਨਹੀਂ ਹੈ ਜਾਂ ਗਲਤ ਢਾਂਚਾ ਹੈ?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "ਸੀਡੀ ਜੋੜਨ ਲਈ ਫੇਲ੍ਹ ਹੈ" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -76,13 +77,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "ਖਰਾਬ ਹਾਲਤ ਦੇ ਪੈਕੇਜ ਹਟਾਓ" msgstr[1] "ਖਰਾਬ ਹਾਲਤ ਦੇ ਪੈਕੇਜ ਹਟਾਓ" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -97,22 +98,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "ਖ਼ਰਾਬ ਪੈਕੇਜ" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -125,65 +126,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "ਲਾਜ਼ਮੀ ਪੈਕੇਜ '%s' ਹਟਾਉਣ ਲਈ ਨਿਸ਼ਾਨਬੱਧ ਕੀਤਾ ਗਿਆ ਹੈ।" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "ਬਲੈਕ-ਲਿਸਟ ਕੀਤਾ ਵਰਜਨ '%s' ਇੰਸਟਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "'%s' ਇੰਸਟਾਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -192,15 +193,15 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "ਕੈਸ਼ ਪੜ੍ਹੀ ਜਾ ਰਹੀ ਹੈ" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "ਖਾਸ ਲਾਕ ਲੈਣ ਲਈ ਅਸਮਰੱਥ" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -208,11 +209,11 @@ "ਇਸ ਦਾ ਅਰਥ ਹੈ ਕਿ ਹੋਰ ਪੈਕੇਜ ਪਰਬੰਧ ਐਪਲੀਕੇਸ਼ਨ (ਜਿਵੇਂ apt-get ਜਾਂ aptitude ਆਦਿ) ਪਹਿਲਾਂ ਹੀ " "ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ। ਪਹਿਲਾਂ ਉਹ ਐਪਲੀਕੇਸ਼ਨ ਬੰਦ ਕਰੋ।" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "ਰਿਮੋਟ ਕੁਨੈਕਸ਼ਨ ਰਾਹੀਂ ਅੱਪਗਰੇਡ ਕਰਨ ਸਹਾਇਕ ਨਹੀਂ ਹੈ" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -221,11 +222,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -236,11 +237,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -248,7 +249,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -257,29 +258,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "ਅੱਪਗਰੇਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "ਸੈਂਡਬਾਕਸ ਮੋਡ" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -289,28 +290,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "'%s' ਉੱਤੇ ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -318,11 +319,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "ਇੰਟਰਨੈੱਟ ਤੋਂ ਤਾਜ਼ਾ ਅੱਪਡੇਟ ਸ਼ਾਮਲ ਕਰਨੇ ਹਨ?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -334,16 +335,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -356,11 +357,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -369,34 +370,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "ਰਿਪੋਜ਼ਟਰੀ ਜਾਣਕਾਰੀ ਗਲਤ ਹੈ" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "ਸੁਤੰਤਰ ਧਿਰ ਸਰੋਤ ਬੰਦ ਹਨ" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "ਪੈਕੇਜ ਖਰਾਬ ਹਾਲਤ ਵਿੱਚ ਹੈ" msgstr[1] "ਪੈਕੇਜ ਖਰਾਬ ਹਾਲਤ ਵਿੱਚ ਹਨ" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -409,11 +410,11 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "ਅੱਪਡੇਟ ਦੌਰਾਨ ਗਲਤੀ" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -421,13 +422,13 @@ "ਅੱਪਡੇਟ ਕਰਨ ਦੌਰਾਨ ਸਮੱਸਿਆ ਆਈ ਹੈ। ਇਹ ਅਕਸਰ ਨੈੱਟਵਰਕ ਸਮੱਸਿਆ ਕਰਕੇ ਹੋ ਸਕਦਾ ਹੈ, ਆਪਣੇ ਨੈੱਟਵਰਕ ਨੂੰ ਚੈੱਕ " "ਕਰਕੇ ਮੁੜ-ਕੋਸ਼ਿਸ਼ ਕਰੋ।" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "ਲੋੜੀਦੀ ਖਾਲੀ ਡਿਸਕ ਥਾਂ ਨਹੀਂ ਹੈ" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -438,32 +439,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "ਬਦਲਾਅ ਲਈ ਗਿਣਤੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "ਕੀ ਤੁਸੀਂ ਅੱਪਗਰੇਡ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "ਅੱਪਗਰੇਡ ਰੱਦ ਕੀਤਾ ਗਿਆ" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "ਅੱਪਗਰੇਡ ਡਾਊਨਲੋਡ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕੇ" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -471,33 +472,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "ਕਮਿਟ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "ਸਿਸਟਮ ਅਸਲੀ ਹਾਲਤ ਵਿੱਚ ਮੁੜ-ਸਟੋਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "ਅੱਪਗਰੇਡ ਇੰਸਟਾਲ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕੇ" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -508,26 +509,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "ਰੱਖੋ(_K)" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "ਹਟਾਓ(_R)" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -535,37 +536,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "ਲੋੜੀਦੀ ਨਿਰਭਰਤਾ ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "ਪੈਕੇਜ ਮੈਨੇਜਰ ਚੈੱਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "ਅੱਪਗਰੇਡ ਲਈ ਤਿਆਰ ਕਰਨ ਲਈ ਫੇਲ੍ਹ" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -573,79 +574,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "ਰਿਪੋਜ਼ਟਰੀ ਜਾਣਕਾਰੀ ਅੱਪਡੇਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "ਗਲਤ ਪੈਕੇਜ ਜਾਣਕਾਰੀ" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "ਲਈ ਜਾ ਰਹੀ ਹੈ" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "ਅੱਪਗਰੇਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "ਅੱਪਗਰੇਡ ਪੂਰਾ ਹੋਇਆ" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "ਅੱਪਗਰੇਡ ਪੂਰਾ ਚੁੱਕਾ ਹੈ, ਪਰ ਅੱਪਗਰੇਡ ਕਾਰਵਾਈ ਦੌਰਾਨ ਗਲਤੀਆਂ ਆਈਆਂ ਹਨ।" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "ਸਿਸਟਮ ਅੱਪਗਰੇਡ ਪੂਰਾ ਹੋਇਆ।" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -653,16 +654,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -671,7 +672,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -680,11 +681,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -692,11 +693,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "ARMv6 CPU ਨਹੀਂ" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -704,11 +705,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -718,71 +719,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "ਲਗਭਗ %s ਬਾਕੀ" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -792,27 +793,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "ਬਦਲਾਅ ਲਾਗੂ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "'%s' ਇੰਸਟਾਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -822,7 +823,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -831,26 +832,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "ਘਾਤਕ ਗਲਤੀ ਆਈ ਹੈ" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -858,147 +859,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c ਦੱਬਿਆ" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "ਡਾਊਨਗਰੇਡ (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "ਹਟਾਓ (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "ਇੰਸਟਾਲ (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "ਅੱਪਗਰੇਡ (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "ਮੀਡਿਆ ਬਦਲੋ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "ਅੰਤਰ ਵੇਖਾਓ >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< ਅੰਤਰ ਓਹਲੇ ਕਰੋ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "ਗਲਤੀ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "ਰੱਦ ਕਰੋ(&C)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "ਬੰਦ ਕਰੋ(&C)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "ਟਰਮੀਨਲ ਵੇਖਾਓ >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< ਟਰਮੀਨਲ ਓਹਲੇ ਕਰੋ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "ਜਾਣਕਾਰੀ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "ਵੇਰਵਾ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "%s ਹੁਣ ਸਹਾਇਕ ਨਹੀਂ ਹੈ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "%s ਹਟਾਓ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "%s ਇੰਸਟਾਲ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "%s ਅੱਪਗਰੇਡ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "ਮੁੜ-ਚਾਲੂ ਕਰਨਾ ਪਵੇਗਾ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "ਅੱਪਗਰੇਡ ਪੂਰਾ ਕਰਨ ਲਈ ਸਿਸਟਮ ਮੁੜ-ਚਾਲੂ ਕਰੋ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "ਹੁਣੇ ਮੁੜ-ਚਾਲੂ ਕਰੋ(_R)" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1006,32 +1007,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "ਅੱਪਗਰੇਡ ਰੱਦ ਕਰਨਾ ਹੈ?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li ਦਿਨ" msgstr[1] "%li ਦਿਨ" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li ਘੰਟਾ" msgstr[1] "%li ਘੰਟੇ" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li ਮਿੰਟ" msgstr[1] "%li ਮਿੰਟ" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1047,7 +1048,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1061,14 +1062,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1076,34 +1077,32 @@ msgstr "ਇਹ ਡਾਊਨਲੋਡ 1Mbit DSL ਕੁਨੈਕਸ਼ਨ ਉੱਤੇ %s ਲਵੇਗਾ ਅਤੇ 56k ਮਾਡਮ ਨਾਲ %s।" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "ਇਹ ਡਾਊਨਲੋਡ ਤੁਹਾਡੇ ਕੁਨੈਕਸ਼ਨ ਉੱਤੇ ਲਗਭਗ %s ਲਵੇਗਾ। " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "ਅੱਪਗਰੇਡ ਲਈ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "ਨਵੇਂ ਸਾਫਟਵੇਅਰ ਚੈਨਲ ਲਏ ਜਾ ਰਹੇ ਹਨ" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "ਨਵੇਂ ਪੈਕੇਜ ਲਏ ਜਾ ਰਹੇ ਹਨ" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "ਅੱਪਗਰੇਡ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "ਸਾਫ਼ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1116,28 +1115,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d ਪੈਕੇਜ ਹਟਾਇਆ ਜਾਵੇਗਾ।" msgstr[1] "%d ਪੈਕੇਜ ਹਟਾਏ ਜਾਣਗੇ।" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d ਪੈਕੇਜ ਅੱਪਗਰੇਡ ਕੀਤਾ ਜਾਵੇਗਾ।" msgstr[1] "%d ਪੈਕੇਜ ਅੱਪਗਰੇਡ ਕੀਤੇ ਜਾਣਗੇ।" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1148,145 +1147,145 @@ "\n" "ਤੁਸੀਂ ਕੁੱਲ ਵਿੱਚੋਂ %s ਡਾਊਨਲੋਡ ਕਰ ਲਿਆ ਹੈ। " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "ਤੁਹਾਡੇ ਸਿਸਟਮ ਲਈ ਅੱਪਗਰੇਡ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ। ਅੱਪਗਰੇਡ ਨੂੰ ਹੁਣ ਰੱਦ ਕੀਤਾ ਜਾਵੇਗਾ।" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "ਮੁੜ-ਚਾਲੂ ਕਰਨਾ ਪਵੇਗਾ" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "ਅੱਪਗਰੇਡ ਪੂਰਾ ਹੋ ਗਿਆ ਹੈ ਅਤੇ ਮੁੜ-ਚਾਲੂ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਕੀ ਤੁਸੀਂ ਹੁਣੇ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "ਅੱਪਗਰੇਡ ਟੂਲ ਦਸਤਖਤ" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "ਅੱਪਗਰੇਡ ਟੂਲ" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "ਗਲਤੀ ਸੁਨੇਹਾ '%s' ਹੈ।" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1294,73 +1293,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "ਅਧੂਰਾ ਛੱਡਿਆ" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "ਜਾਰੀ ਰੱਖਣਾ [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "ਵੇਰਵਾ [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "ਹੁਣ ਸਹਾਇਕ ਨਹੀਂ: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "ਹਟਾਓ: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "ਇੰਸਟਾਲ: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "ਅੱਪਗਰੇਡ: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "ਜਾਰੀ ਰੱਖਣਾ [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1423,7 +1422,7 @@ msgstr "ਡਿਸਟਰੀਬਿਊਸ਼ਨ ਅੱਪਗਰੇਡ" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1442,133 +1441,141 @@ msgid "Terminal" msgstr "ਟਰਮੀਨਲ" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "ਇਸ ਨੂੰ ਕੁਝ ਸਮਾਂ ਲੱਗੇਗਾ, ਉਡੀਕੋ ਜੀ।" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "ਅੱਪਡੇਟ ਪੂਰਾ ਹੋਇਆ" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "ਆਪਣਾ ਇੰਟਰਨੈੱਟ ਕੁਨੈਕਸ਼ਨ ਚੈੱਕ ਕਰੋ ਜੀ।" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "ਅੱਪਗਰੇਡ" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "ਰੀਲਿਜ਼ ਨੋਟਿਸ" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "ਹੋਰ ਪੈਕੇਜ ਫਾਇਲਾਂ ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "ਬਰਾਊਜ਼ਰ 'ਚ ਲਿੰਕ ਖੋਲ੍ਹ" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "ਲਿੰਕ ਕਲਿੱਪਬੋਰਡ 'ਚ ਕਾਪੀ ਕਰੋ" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "ਫਾਇਲ %(current)li, %(total)li ਵਿੱਚੋਂ ਡਾਊਨਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "ਅੱਪਗਰੇਡ ਜਾਣਕਾਰੀ" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "ਇੰਸਟਾਲ ਕਰੋ" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "ਵਰਜਨ %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "ਬਦਲਾਅ ਦੀ ਲਿਸਟ ਡਾਊਨਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s ਅੱਪਡੇਟ ਚੁਣਿਆ ਗਿਆ ਹੈ।" +msgstr[1] "%(count)s ਅੱਪਡੇਟ ਚੁਣੇ ਗਏ ਹਨ।" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾਵੇਗਾ।" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1576,31 +1583,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "ਅਣਜਾਣ ਡਾਊਨਲੋ ਆਕਾਰ ਹੈ।" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1609,34 +1623,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਲਈ ਸਾਫਟਵੇਅਰ ਅੱਪਡੇਟ ਉਪਲੱਬਧ ਹੋ ਸਕਦੇ ਹਨ।" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "ਉਬਤੂੰ ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1644,7 +1666,7 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1652,23 +1674,23 @@ "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕਰਨ ਨੂੰ ਪੂਰਾ ਕਰਨ ਵਾਸਤੇ ਕੰਪਿਊਟਰ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਾਰੀ ਰੱਖਣ ਤੋਂ ਪਹਿਲਾਂ " "ਆਪਣਾ ਕੰਮ ਸੰਭਾਲ ਲਵੋ ਜੀ।" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "ਪੈਕੇਜ ਜਾਣਕਾਰੀ ਪੜ੍ਹੀ ਜਾ ਰਹੀ ਹੈ" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "ਤੁਸੀਂ ਸ਼ਾਇਦ ਬਾਅਦ ਵਿੱਚ ਅੱਪਡੇਟ ਚੈੱਕ ਨਾ ਕਰ ਸਕੋ ਜਾਂ ਨਵੇਂ ਅੱਪਡੇਟ ਡਾਊਨਲੋਡ ਨਾ ਕਰ ਸਕੋ।" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1677,7 +1699,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1685,58 +1707,69 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (ਨਵਾਂ ਇੰਸਟਾਲ)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(ਆਕਾਰ: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "%(old_version)s ਵਰਜਨ ਤੋਂ %(new_version)s ਲਈ" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "ਵਰਜਨ %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "ਹੁਣ ਰੀਲਿਜ਼ ਅੱਪਗਰੇਡ ਸੰਭਵ ਨਹੀਂ ਹੈ" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "ਰੀਲਿਜ਼ ਅੱਪਗਰੇਡ ਟੂਲ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "ਨਵਾਂ ਉਬਤੂੰ ਰੀਲਿਜ਼ '%s' ਉਪਲੱਬਧ ਹੈ" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "ਸਾਫਟਵੇਅਰ ਇੰਡੈਕਸ ਖਰਾਬ ਹੈ" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "ਨਵਾਂ ਵਰਜਨ '%s' ਉਪਲੱਬਧ ਹੈ।" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "ਰੱਦ ਕਰੋ" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1746,22 +1779,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "ਰੱਦ ਕਰੋ" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "ਅੱਪਡੇਟ ਲਿਸਟ ਤਿਆਰ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1775,26 +1804,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "ਚੇਜ਼ਲਾਗ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "ਹੋਰ ਅੱਪਡੇਟ (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1803,7 +1832,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1812,7 +1841,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1821,50 +1850,43 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "ਖਾਸ ਸੁਰੱਖਿਆ ਅੱਪਡੇਟ" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "ਸਿਫਾਰਸ਼ੀ ਅੱਪਡੇਟ" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "ਸੁਝਾਏ ਅੱਪਡੇਟ" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "ਬੈਕਪੋਰਟ" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "ਡਿਸਟਰੀਬਿਊਸ਼ਨ ਅੱਪਡੇਟ" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "ਹੋਰ ਅੱਪਡੇਟ" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "ਸਾਫਟਵੇਅਰ ਮੈਨੇਜਰ ਸ਼ੁਰੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "ਅਧੂਰਾ ਅੱਪਗਰੇਡ(_P)" @@ -1923,59 +1945,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "ਸਾਫਟਵੇਅਰ ਅੱਪਡੇਟ" +msgid "Update Manager" +msgstr "ਅੱਪਡੇਟ ਮੈਨੇਜਰ" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "ਸਾਫਟਵੇਅਰ ਅੱਪਡੇਟ" +msgid "Starting Update Manager" +msgstr "ਅੱਪਡੇਟ ਮੈਨੇਜਰ ਸ਼ੁਰੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "ਅੱਪਗਰੇਡ(_p)" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "ਅੱਪਡੇਟ" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "ਇੰਸਟਾਲ ਕਰੋ" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "ਬਦਲਾਅ" +msgid "updates" +msgstr "ਅੱਪਡੇਟ" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "ਵੇਰਵਾ" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "ਅੱਪਡੇਟ ਦਾ ਵੇਰਵੇ" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕਰੋ(_I)" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "ਬਦਲਾਅ" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "ਸੈਟਿੰਗ(_S)..." +msgid "Description" +msgstr "ਵੇਰਵਾ" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "ਇੰਸਟਾਲ ਕਰੋ" +msgid "Description of update" +msgstr "ਅੱਪਡੇਟ ਦਾ ਵੇਰਵੇ" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "ਸੈਟਿੰਗ(_S)..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -1999,7 +2021,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -2011,239 +2033,285 @@ msgid "Show and install available updates" msgstr "ਉਪਲੱਬਧ ਅੱਪਡੇਟ ਵੇਖੋ ਤੇ ਇੰਸਟਾਲ ਕਰੋ" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "ਵਰਜਨ ਵੇਖਾ ਕੇ ਬੰਦ ਕਰੋ" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "ਡਾਇਰੈਕਟਰੀ, ਜੋ ਕਿ ਡਾਟਾ ਫਾਇਲਾਂ ਰੱਖਦੀ ਹੈ" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "ਚੈੱਕ ਕਰੋ ਜੇ ਉਬਤੂੰ ਦਾ ਨਵਾਂ ਵਰਜਨ ਉਪਲੱਬਧ ਹੋਵੇ" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "ਕੋਈ ਨਵਾਂ ਰੀਲਿਜ਼ ਨਹੀਂ ਲੱਭਾ" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "ਨਵਾਂ ਵਰਜਨ '%s' ਉਪਲੱਬਧ ਹੈ।" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "ਉਬਤੂੰ %(version)s ਅੱਪਗਰੇਡ ਲਈ ਉਪਲੱਬਧ ਹੈ" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "ਗ਼ੈਰ-ਸਹਾਇਕ ਹੈ" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "ਡਿਸਕ ਉੱਤੇ ਫਾਇਲ" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb ਪੈਕੇਜ" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "ਨਾ-ਮੌਜੂਦ ਪੈਕੇਜ ਇੰਸਟਾਲ ਕਰੋ" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "%s ਪੈਕੇਜ ਇੰਸਟਾਲ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb ਪੈਕੇਜ" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." +msgid "%i obsolete entries in the status file" +msgstr "" + +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s ਅੱਪਡੇਟ ਚੁਣਿਆ ਗਿਆ ਹੈ।" -#~ msgstr[1] "%(count)s ਅੱਪਡੇਟ ਚੁਣੇ ਗਏ ਹਨ।" - -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" - -#~ msgid "Welcome to Ubuntu" -#~ msgstr "ਉਬਤੂੰ ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ" - -#~ msgid "Update Manager" -#~ msgstr "ਅੱਪਡੇਟ ਮੈਨੇਜਰ" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "Starting Update Manager" -#~ msgstr "ਅੱਪਡੇਟ ਮੈਨੇਜਰ ਸ਼ੁਰੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕਰੋ(_I)" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" #~ "Fetching and installing the upgrade can take several hours. Once the " diff -Nru update-manager-17.10.11/po/pl.po update-manager-0.156.14.15/po/pl.po --- update-manager-17.10.11/po/pl.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/pl.po 2017-12-23 05:00:38.000000000 +0000 @@ -9,11 +9,12 @@ # # Nazewnictwo i spójność tłumaczeń programów apt, aptitude, synaptic i innych: # http://wiki.debian.org/PolishL10N/PackageInstallers +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager 0.87\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-01-07 08:05+0000\n" "Last-Translator: GTriderXC \n" "Language-Team: Polish \n" @@ -27,7 +28,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -35,13 +36,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Serwer dla kraju %s" @@ -49,20 +50,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Główny serwer" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Inne serwery" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Nie można obliczyć wpisu w sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -70,11 +71,11 @@ "Nie można znaleźć żadnych plików z pakietami, może to nie jest płyta z " "Ubuntu lub to niepoprawna architektura?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Nie udało się dodać płyty CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -90,14 +91,14 @@ "Treść błędu jest następująca:\n" "\"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Usuwanie uszkodzonego pakietu" msgstr[1] "Usuwanie uszkodzonych pakietów" msgstr[2] "Usuwanie uszkodzonych pakietów" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -122,15 +123,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Serwer może być przeciążony" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Uszkodzone pakiety" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -139,7 +140,7 @@ "kontynuowaniem należy je naprawić używając programu Synaptic lub apt-get." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -160,11 +161,11 @@ " * użytkowanie nieoficjalnych pakietów spoza repozytoriów Ubuntu.\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Wystąpiły przejściowe trudności. Proszę spróbować później." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -173,16 +174,16 @@ "należy zgłosić błąd, wpisując w terminalu polecenie: \"ubuntu-bug update-" "manager\"" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Nie można przetworzyć aktualizacji" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Błąd podczas weryfikacji autentyczności niektórych pakietów" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -192,7 +193,7 @@ "błąd sieci. Można spróbować ponownie później. Poniżej znajduje się lista " "nieuwierzytelnionych pakietów." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -200,22 +201,22 @@ "Pakiet \"%s\" jest oznaczony do usunięcia, lecz znajduje się na liście " "pakietów, których nie należy usuwać." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Niezbędny pakiet \"%s\" jest oznaczony do usunięcia." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Próba instalacji wersji \"%s\", znajdującej się na czarnej liście" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Nie można zainstalować \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -224,11 +225,11 @@ "wpisując w terminalu polecenie: ubuntu-bug update-manager" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Nie można określić meta-pakietu" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -241,15 +242,15 @@ " Proszę zainstalować jeden z tych pakietów używając programu Synaptic lub " "apt-get przed kontynuowaniem." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Odczytywanie pamięci podręcznej" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Nie można uzyskać blokady na wyłączność" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -257,11 +258,11 @@ "To zazwyczaj oznacza, że inna aplikacja do zarządzania pakietami (jak apt-" "get lub aptitude) jest już uruchomiona. Należy najpierw zamknąć tę aplikację." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Aktualizacja poprzez połączenie zdalnie nie jest obsługiwana" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -275,11 +276,11 @@ "\n" "Aktualizacja będzie teraz przerwana. Spróbuj ponownie bez powłoki ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Kontynuować połączenie SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -297,11 +298,11 @@ "'%s'.\n" "Czy chcesz kontynuować?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Uruchamianie dodatkowej usługi ssh" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -313,7 +314,7 @@ "niepowodzenia z aktualną sesją ssh, wciąż można podłączyć się do sesji " "dodatkowej.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -327,31 +328,31 @@ "za pomocą:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Nie można zaktualizować" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" "Aktualizacja z wersji \\\"%s\\\" do \\\"%s\\\" nie jest możliwa przy użyciu " "tego narzędzia." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Ustawienie trybu testowego nie powiodło się" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Utworzenie testowego środowiska nie było możliwe" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Tryb testowy" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -367,18 +368,18 @@ "Od tej chwili *żadne* zmiany tworzone w katalogu systemu nie są trwałe, " "dopóki komputer nie zostanie uruchomiony ponownie." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Instalacja python jest uszkodzona. Proszę naprawić dowiązanie do \"/usr/bin/" "python\"." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Pakiet \"debsig-verify\" jest zainstalowany" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -389,12 +390,12 @@ "Proszę najpierw usunąć go używając programu Synaptic lub \"apt-get remove " "debsig-verify\", a następnie uruchomić ponownie aktualizację\"." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Nie można zapisać do '%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -406,11 +407,11 @@ "Aby spróbować ponownie, należy upewnić się, że dokonywanie zmian w katalogu " "systemu jest możliwe." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Dołączyć najnowsze aktualizacje z Internetu?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -430,16 +431,16 @@ "instalacja najnowszych aktualizacji.\n" "Jeśli teraz odpowiesz \"NIE\", sieć nie zostanie użyta." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "wyłączony podczas aktualizacji do %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Nie odnaleziono poprawnego serwera lustrzanego" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -460,11 +461,11 @@ "Wybranie \"Nie\" anuluje aktualizację." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Wygenerować domyślne źródła?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -477,21 +478,21 @@ "\n" "Dodać domyślne wpisy dla \"%s\"? Wybranie \"Nie\" przerwie aktualizację." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Błędne informacje o repozytoriach" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Źródła niezależnych dostawców zostały wyłączone" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -501,14 +502,14 @@ "wyłączone. Można ponownie je włączyć po aktualizacji używając narzędzia " "\"software-properties\" lub programu Synaptic." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Pakiet w niezgodnym stanie" msgstr[1] "Pakiety w niezgodnym stanie" msgstr[2] "Pakiety w niezgodnym stanie" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -531,11 +532,11 @@ "ponownie, ale nie odnaleziono żadnego archiwum tych pakietów. Proszę " "zainstalować pakiety ręcznie lub usunąć je z systemu." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Błąd podczas aktualizacji" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -543,13 +544,13 @@ "Wystąpił problem podczas aktualizacji. Zazwyczaj wynika to z problemów z " "siecią, proszę sprawdzić połączenie sieciowe i spróbować ponownie." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Zbyt mało miejsca na dysku" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -564,21 +565,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Przetwarzanie zmian" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Rozpocząć aktualizację?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Aktualizacja anulowana" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -586,12 +587,12 @@ "Aktualizacja zostanie teraz anulowana, a system przywrócony do pierwotnego " "stanu. Można ponowić próbę aktualizacji wersji później." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Pobranie aktualizacji było niemożliwe" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -602,27 +603,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Błąd podczas zatwierdzania" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Przywracanie pierwotnego stanu systemu" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Instalacja aktualizacji zakończyła się niepowodzeniem." #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -631,7 +632,7 @@ "nienadającym się do użytku. Zostanie teraz uruchomione odzyskiwanie (dpkg --" "configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -642,7 +643,7 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -650,20 +651,20 @@ "Aktualizacja została przerwana. Proszę sprawdzić połączenie internetowe lub " "nośnik instalacyjny i spróbować ponownie. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Usunąć przestarzałe pakiety?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Zachowaj" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Usuń" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -671,37 +672,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Wymagana zależność nie jest zainstalowana." -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Wymagana zależność \"%s\" nie jest zainstalowana. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Sprawdzanie menedżera pakietów" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Przygotowanie aktualizacji nie powiodło się" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Pobranie elementów wymaganych do aktualizacji nie powiodło się" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -709,69 +710,69 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Aktualizowanie informacji o repozytoriach" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Dodanie CD-ROM nieudane" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Dodanie napędu CD-ROM zakończone niepowodzeniem" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Błędne informacje o pakietach" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Pobieranie" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Aktualizacja w toku" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Aktualizacja ukończona" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "Aktualizacja została zakończona, lecz wystąpiły błędy podczas tego procesu." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Wyszukiwanie przestarzałego oprogramowania" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Aktualizacja systemu zakończona powodzeniem." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Częściowa aktualizacja została ukończona" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "EVMS w użyciu" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -781,11 +782,11 @@ "EVMS nie jest więcej wspierane. W związku z tym należy je wyłączyć i " "zaktualizować, a po jej zakończeniu włączyć go ponownie." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -793,9 +794,9 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -803,8 +804,8 @@ "Aktualizacja może ograniczyć wydajność systemu dla efektów pulpitu, gier " "oraz innych programów obciążających zasoby graficzne." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -817,7 +818,7 @@ "\n" "Kontynuować?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -830,11 +831,11 @@ "\n" "Kontynuować?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Brak procesora o architekturze i686" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -846,11 +847,11 @@ "optymalizacje wymagające minimum architektury i686. Na tym sprzęcie " "niemożliwa jest aktualizacja twojego systemu do nowego wydania Ubuntu." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Brak procesora ARMv6" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -862,11 +863,11 @@ "architektury ARMv6. Nie ma możliwości aktualizacji systemu do nowego wydania " "na tym sprzęcie." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Brak dostępnego procesu init" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -880,16 +881,16 @@ "tym typem środowiska, wymagając najpierw aktualizacji konfiguracji maszyny " "wirtualnej." -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Aktualizacja testowa używając aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Użycie podanej ścieżki do wyszukiwania CD-ROMu z pakietami aktualizacyjnymi" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -897,57 +898,57 @@ "Użycie nakładki graficznej. Obecnie dostępne: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*PRZESTARZAŁE* ta opcja zostanie zignorowana" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "Wykonaj tylko częściową aktualizację (bez nadpisywania sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Wyłącz wsparcie ekranu GNU" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Ustaw ścieżkę do danych" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Proszę włożyć \"%s\" do napędu \"%s\"" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Pobieranie zakończone" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Pobieranie %li pliku z %li z prędkością %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Pozostało około %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Pobieranie pliku %li z %li" @@ -957,27 +958,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Zatwierdzanie zmian" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "problemy z zależnościami - pozostawiony nieskonfigurowany" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Nie można było zainstalować \"%s\"" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -990,7 +991,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1001,7 +1002,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1009,20 +1010,20 @@ "Zostaną utracone wszystkie zmiany wprowadzone w tym pliku konfiguracyjnym, " "jeśli zostanie wybrana jego zamiana na nowszą wersję." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Polecenie \"diff\" nie zostało odnalezione" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Wystąpił błąd krytyczny" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1035,13 +1036,13 @@ "Pierwotny plik sources.list został zapisany w /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Wciśnięto Ctrl-C" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1050,137 +1051,137 @@ "Na pewno chcesz to zrobić?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Aby zapobiec utracie danych proszę zamknąć wszystkie otwarte programy i " "dokumenty." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Już nie jest wspierane przez firmę Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Zainstaluj poprzednią wersję (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Usuń (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Już nie jest potrzebne (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Zainstaluj (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Zaktualizuj (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Zmiana nośnika" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Wyświetl różnicę >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Ukryj różnicę" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Wystąpił błąd" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Anuluj" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Zakończ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Wyświetl terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Ukryj terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Informacje" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Szczegóły" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Już nie jest obsługiwane (%s)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Usuń %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Usuń (było automatycznie zainstalowane) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Instaluj %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Aktualizuj %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Wymagane ponowne uruchomienie komputera" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" "Uruchom ponownie komputer w celu zakończenia aktualizacji" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Uruchom ponownie" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1192,11 +1193,11 @@ "System może utracić stabilność jeśli przerwiesz aktualizację. Wskazane jest " "wznowienie aktualizacji." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Anulować aktualizację?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" @@ -1204,7 +1205,7 @@ msgstr[1] "%li dni" msgstr[2] "%li dni" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" @@ -1212,7 +1213,7 @@ msgstr[1] "%li godziny" msgstr[2] "%li godzin" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" @@ -1220,7 +1221,7 @@ msgstr[1] "%li minuty" msgstr[2] "%li minut" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1237,7 +1238,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1251,14 +1252,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1268,34 +1269,32 @@ "używając połączenia modemowego 56k." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Pobieranie może potrwać około %s w przypadku tego łącza. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Przygotowywanie do aktualizacji" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Pobieranie nowych kanałów oprogramowania" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Pobieranie nowych pakietów" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Instalowanie aktualizacji" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Czyszczenie" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1315,7 +1314,7 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." @@ -1323,7 +1322,7 @@ msgstr[1] "%d pakiety zostaną usunięte." msgstr[2] "%d pakietów zostanie usuniętych." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." @@ -1331,7 +1330,7 @@ msgstr[1] "%d nowe pakiety zostaną zainstalowane." msgstr[2] "%d nowych pakietów zostanie zainstalowanych." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." @@ -1339,7 +1338,7 @@ msgstr[1] "%d pakiety zostaną zaktualizowane." msgstr[2] "%d pakietów zostanie zaktualizowanych." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1350,65 +1349,65 @@ "\n" "Konieczne pobranie w sumie %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Oprogramowanie tego komputera jest w pełni zaktualizowane" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "Brak dostępnych aktualizacji. Aktualizacja zostanie anulowana." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Wymagane ponowne uruchomienie komputera" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Aktualizacja została ukończona i należy ponownie uruchomić komputer. " "Uruchomić ponownie teraz?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "Wypakowywanie '%s'" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Nie można było uruchomić narzędzia aktualizacji" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1416,34 +1415,34 @@ "Prawdopodobnie wystąpił błąd narzędzia aktualizacji. Proszę zgłosić ten " "błąd, wpisując w terminalu polecenie: \"ubuntu-bug update-manager\"" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Podpis narzędzia aktualizacji" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Narzędzie aktualizacji" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Pobieranie nie powiodło się" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "Pobieranie aktualizacji nie powiodło się. Może to oznaczać problem z siecią. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Uwierzytelnienie nie powiodło się" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1451,13 +1450,13 @@ "Uwierzytelnienie aktualizacji nie powiodło się. Mógł wystąpić problem z " "siecią lub z serwerem. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Rozpakowywanie nie powiodło się" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1465,13 +1464,13 @@ "Rozpakowywanie aktualizacji nie powiodło się. Mógł wystąpić problem z siecią " "lub z serwerem. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Weryfikacja nie powiodła się" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1479,15 +1478,15 @@ "Weryfikacja aktualizacji nie powiodła się. Mógł wystąpić problem z siecią " "lub z serwerem. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Nie można rozpocząć aktualizacji" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1496,13 +1495,13 @@ "zamontowany z opcją noexec. Proszę zamontować go ponownie bez opcji noexec i " "uruchomić aktualizację ponownie." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Treść komunikatu błędu: \\\"%s\\\"" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1514,73 +1513,73 @@ "Pierwotny plik sources.list został zapisany w /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Anulowanie" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Zdegradowane:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Aby kontynuować, naciśnij ENTER" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Kontynuuj [tN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Szczegóły [s]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "t" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "s" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Już nie jest obsługiwane: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Usuń: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Instaluj: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Aktualizuj: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Kontynuować [Tn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1647,9 +1646,8 @@ msgstr "Aktualizacja dystrybucji" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Aktualizacja Ubuntu do wersji 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Aktualizacja Ubuntu do wersji 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1667,148 +1665,162 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Proszę czekać, to może chwilę potrwać." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Aktualizacja została ukończona." -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Nie można było odnaleźć informacji o wydaniu" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Serwer może być przeciążony. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Pobranie informacji o wydaniu było niemożliwe" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Proszę sprawdzić połączenie sieciowe." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Aktualizuj" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Informacje o wydaniu" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Pobieranie dodatkowych plików pakietów..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Plik %s z %s z prędkością %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Plik %s z %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Otwórz odnośnik w przeglądarce" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Skopiuj odnośnik do schowka" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Pobieranie pliku %(current)li z %(total)li z prędkością %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Pobieranie pliku %(current)li z %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Twoja wersja Ubuntu nie jest już wspierana." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Informacje o aktualizacji" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Zainstaluj" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Wersja %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Nie wykryto połączenia sieciowego. Informacja changelog gotowa do pobrania." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Pobieranie listy zmian..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Odznacz wszystko" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Z_aznacz wszystko" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "Wybrano %(count)s aktualizację." +msgstr[1] "Wybrano %(count)s aktualizacje." +msgstr[2] "Wybrano %(count)s aktualizacji." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s zostanie pobranych." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "Aktualizacja została już pobrana, ale nie została zainstalowana" -msgstr[1] "Aktualizacje zostały już pobrane, ale nie zostały zainstalowane" -msgstr[2] "Aktualizacje zostały już pobrane, ale nie zostały zainstalowane" +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Nieznany rozmiar pobrania." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1816,7 +1828,7 @@ "Nie wiadomo kiedy ostatni raz uaktualniano informacje o pakietach. Proszę " "kliknąć przycisk \"Sprawdź\", aby tego dokonać." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1826,7 +1838,7 @@ "Naciśnij poniższy przycisk 'Sprawdź' aby sprawdzić najnowsze aktualizacje " "oprogramowania." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1838,7 +1850,7 @@ msgstr[2] "" "Informacje o pakietach zostały ostatnio zaktualizowane %(days_ago)s dni temu." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1854,34 +1866,44 @@ "temu." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Informacje o pakietach zostały uaktualnione %s minut temu." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Informacja o pakietach została przed chwilą uaktualniona." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Aktualizacje oprogramowania poprawiają błędy, eliminują luki bezpieczeństwa " +"i dostarczają nowe funkcje." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Dla tego komputera mogą być dostępne aktualizacje oprogramowania." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Witamy w Ubuntu" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1893,7 +1915,7 @@ "tymczasowe pakiety z poprzednich instalacji za pomocą polecenia \"sudo apt-" "get clean\"." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1901,25 +1923,25 @@ "Komputer musi zostać ponownie uruchomiony, aby ukończyć instalowanie " "aktualizacji. Proszę zapisać bieżącą pracę przed kontynuowaniem." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Odczytywanie informacji o pakietach" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Nawiązywanie połączenia..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Sprawdzenie dostępności aktualizacji lub pobranie nowych aktualizacji może " "się nie powieść." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Nie można zainicjować informacji o pakietach" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1933,7 +1955,7 @@ "Proszę zgłosić ten błąd dla pakietu \\\"update-manager\\\" załączając " "poniższą treść komunikatu błędu:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1945,31 +1967,31 @@ "Proszę zgłosić ten błąd dla pakietu \\\"update-manager\\\" załączając " "poniższą treść komunikatu błędu:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Nowa instalacja)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Rozmiar: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Z wersji %(old_version)s do %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Wersja %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Aktualizacja wydania jest teraz niemożliwa" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1978,21 +2000,21 @@ "Aktualizacja dystrybucji nie może zostać wykonana, proszę spróbować później. " "Komunikat serwera: \"%s\"" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Pobieranie narzędzia aktualizacji wydania" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Dostępne nowe wydanie Ubuntu: \"%s\"" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Spis oprogramowania jest uszkodzony" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -2002,6 +2024,17 @@ "Proszę użyć programu Synaptic lub wydać polecenie \"sudo apt-get install -f" "\" w terminalu, aby naprawić ten problem." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Nowe wydanie '%s' jest dostępne" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Anuluj" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Sprawdź aktualizacje" @@ -2011,22 +2044,18 @@ msgstr "Instalacja wszystkich dostępnych aktualizacji" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Anuluj" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Plik zmian" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Aktualizacje" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Tworzenie listy pakietów do uaktualnienia" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2050,20 +2079,20 @@ " * Nieoficjalnymi pakietami spoza repozytorium Ubuntu\n" " * Normalnymi zmianiami w testowej wersji Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Pobieranie dziennika zmian" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Inne aktualizacje (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "Ta aktualizacja nie pochodzi ze źródła wspierającego changelogs." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2071,7 +2100,7 @@ "Nie udało się pobrać listy zmian. \n" "Proszę sprawdzić połączenie sieciowe." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2084,7 +2113,7 @@ "Dostępna wersja: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2097,7 +2126,7 @@ "Proszę użyć http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "zanim zmiany zostaną udostępnione lub spróbować później." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2110,52 +2139,43 @@ "Należy użyć http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "do momentu, kiedy zmiany będą dostępne, lub spróbować później." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Nie udało się wykryć dystrybucji" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Wystąpił błąd \\\"%s\\\" podczas sprawdzania używanego systemu." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Ważne aktualizacje bezpieczeństwa" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Aktualizacje polecane" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Aktualizacje proponowane" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backporty" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Aktualizacje dystrybucji" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Inne aktualizacje" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Uruchamianie menedżera aktualizacji" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Aktualizacje oprogramowania poprawiają błędy, eliminują luki bezpieczeństwa " -"i dostarczają nowe funkcje." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Częściowa aktualizacja" @@ -2226,37 +2246,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Aktualizacje oprogramowania" +msgid "Update Manager" +msgstr "Menedżer aktualizacji" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Aktualizacje oprogramowania" +msgid "Starting Update Manager" +msgstr "Uruchamianie menedżera aktualizacji" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Aktualizuj" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "aktualizacje" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Zainstaluj" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Zmiany" +msgid "updates" +msgstr "aktualizacje" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Opis" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Opis aktualizacji" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2264,25 +2274,35 @@ "Połączenie z Internetem jest nawiązane przez usługę roamingu. Aktualizacja " "może okazać się kosztowna." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Połączenie z Internetem nawiązane jest przez modem bezprzewodowy." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Bezpieczniej jest podłączyć komputer do zasilania przed dokonaniem " "aktualizacji." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Zainstaluj aktualizacje" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Zmiany" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "U_stawienia..." +msgid "Description" +msgstr "Opis" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Zainstaluj" +msgid "Description of update" +msgstr "Opis aktualizacji" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "U_stawienia..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2305,9 +2325,8 @@ msgstr "Zrezygnowano z aktualizacji do nowej wersji Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Można zaktualizować później otwierając Menedżer aktualizacji i klikając " @@ -2321,58 +2340,58 @@ msgid "Show and install available updates" msgstr "Pokaż i zainstaluj dostępne aktualizacje" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Wyświetl wersję i wyjdź" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Katalog zawierający pliki danych" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Sprawdza, czy dostępne jest nowe wydanie Ubuntu" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Sprawdź możliwość aktualizacji do najnowszej wersji testowej" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Zaktualizuj, używając najnowszej, sugerowanej wersji aktualizatora wydań" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Nie skupiaj się na mapie podczas uruchamiania" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Spróbuj uruchomić aktualizację dystrybucji" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Nie wyszukuj aktualizacji podczas uruchamiania" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Aktualizacja testowa z nakładką sandbox aufs" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Częściowa aktualizacja w toku" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Pokaż opis pakietu zamiast opisu zmian" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Zaktualizuj do najnowszej wersji, używając aktualizatora z $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2382,11 +2401,11 @@ "Obecnie obsługiwane są tryby \"desktop\" dla komputerów biurkowych i \"server" "\" dla aktualizacji serwerów." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Uruchom określoną nakładkę" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2394,11 +2413,11 @@ "Sprawdź tylko, czy nowa wersja dystrybucji jest dostępna i przekaż rezultat " "poprzez kod wyjścia" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2406,121 +2425,138 @@ "Aby uzyskać informacje o aktualizacji, zajrzyj pod adres:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Nie odnaleziono nowego wydania" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Nowe wydanie '%s' jest dostępne" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Uruchom 'do-release-upgrade', aby zaktualizować." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Aktualizacja do Ubuntu %(version)s jest dostępna" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Zrezygnowano z aktualizacji do Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Dodaj informacje wyjściowe debugowania" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Pokaż niewspierane pakiety tego komputera" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Pokaż wspierane pakiety tego komputera" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Pokaż wszystkie pakiety z ich statusem" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Pokaż wszystkie pakiety z listy" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Niedostępne (wycofane):" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Bez wsparcia: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Wsparcie do %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Bez wsparcia:" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Niewprowadzona metoda: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Plik na dysku" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "Pakiet .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Zainstaluj brakujący pakiet." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Pakiet %s powinien zostać zainstalowany." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "Pakiet .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s musi zostać oznaczony jako zainstalowany ręcznie." +msgid "%i obsolete entries in the status file" +msgstr "%i zbędnych wpisów w pliku stanu" + +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "Zbędne wpisy stanu w dpkg" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "Zbędne wpisy stanu dpkg" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2529,52 +2565,74 @@ "kdelibs5-dev zostanie w jej trakcie zainstalowany. Szczegóły znajdują się w " "raporcie błędu #279621 na stronie bugs.launchpad.net." -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "%i zbędnych wpisów w pliku stanu" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "Zbędne wpisy stanu w dpkg" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "Zbędne wpisy stanu dpkg" +msgid "%s needs to be marked as manually installed." +msgstr "%s musi zostać oznaczony jako zainstalowany ręcznie." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Proszę usunąć lilo, ponieważ grub także jest zainstalowany. (Więcej " "szczegółów w raporcie błędu #314004.)" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Aktualizacja Ubuntu do wersji 12.04" - -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "Wybrano %(count)s aktualizację." -#~ msgstr[1] "Wybrano %(count)s aktualizacje." -#~ msgstr[2] "Wybrano %(count)s aktualizacji." - -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" - -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Witamy w Ubuntu" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Menedżer aktualizacji" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "Starting Update Manager" -#~ msgstr "Uruchamianie menedżera aktualizacji" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Połączenie z Internetem nawiązane jest przez modem bezprzewodowy." +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "_Zainstaluj aktualizacje" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "Checking for a new ubuntu release" #~ msgstr "Sprawdzanie dostępności nowego wydania Ubuntu" @@ -2615,6 +2673,12 @@ #~ msgid "There are no updates to install" #~ msgstr "Brak aktualizacji do zainstalowania" +#~ msgid "The update has already been downloaded, but not installed" +#~ msgid_plural "The updates have already been downloaded, but not installed" +#~ msgstr[0] "Aktualizacja została już pobrana, ale nie została zainstalowana" +#~ msgstr[1] "Aktualizacje zostały już pobrane, ale nie zostały zainstalowane" +#~ msgstr[2] "Aktualizacje zostały już pobrane, ale nie zostały zainstalowane" + #~ msgid "" #~ "You will not get any further security fixes or critical updates. Please " #~ "upgrade to a later version of Ubuntu Linux." @@ -2654,6 +2718,9 @@ #~ "update-manager\" oraz załączyć do raportu pliki z katalogu /var/log/dist-" #~ "upgrade/" +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Aktualizacja Ubuntu do wersji 11.10" + #~ msgid "Your graphics hardware may not be fully supported in Ubuntu 11.04." #~ msgstr "" #~ "Obsługa sprzętowa grafiki może nie być w pełni wspierana w tej wersji " diff -Nru update-manager-17.10.11/po/POTFILES.in update-manager-0.156.14.15/po/POTFILES.in --- update-manager-17.10.11/po/POTFILES.in 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/POTFILES.in 2017-12-23 05:00:38.000000000 +0000 @@ -1,54 +1,62 @@ [encoding: UTF-8] -UpdateManager/backend/InstallBackendAptdaemon.py +DistUpgrade/utils.py +DistUpgrade/distro.py +DistUpgrade/dist-upgrade.py +DistUpgrade/DistUpgradeAptCdrom.py +DistUpgrade/DistUpgradeCache.py +DistUpgrade/DistUpgradeController.py +DistUpgrade/DistUpgradeQuirks.py +DistUpgrade/DistUpgradeMain.py +DistUpgrade/DistUpgradeViewGtk.py +DistUpgrade/DistUpgradeViewGtk3.py +DistUpgrade/DistUpgradeViewKDE.py +DistUpgrade/DistUpgradeView.py +DistUpgrade/DistUpgradeFetcherCore.py +DistUpgrade/DistUpgradeViewText.py +[type: gettext/glade]DistUpgrade/DistUpgrade.ui UpdateManager/backend/InstallBackendSynaptic.py +UpdateManager/DistUpgradeFetcher.py +UpdateManager/DistUpgradeFetcherKDE.py UpdateManager/ChangelogViewer.py UpdateManager/MetaReleaseGObject.py -UpdateManager/Dialogs.py +UpdateManager/ReleaseNotesViewer.py +UpdateManager/GtkProgress.py UpdateManager/UpdateManager.py -UpdateManager/UpdatesAvailable.py UpdateManager/UnitySupport.py UpdateManagerText/UpdateManagerText.py UpdateManager/Core/MyCache.py UpdateManager/Core/UpdateList.py +UpdateManager/Core/DistUpgradeFetcherCore.py UpdateManager/Core/MetaRelease.py UpdateManager/Core/utils.py -[type: gettext/glade]data/gtkbuilder/Dialog.ui [type: gettext/glade]data/gtkbuilder/UpdateManager.ui -[type: gettext/glade]data/gtkbuilder/UpdateProgress.ui +[type: gettext/glade]data/gtkbuilder/UpgradePromptDialog.ui data/update-manager.desktop.in data/com.ubuntu.update-manager.gschema.xml.in update-manager update-manager-text +do-release-upgrade +check-new-release-gtk ubuntu-support-status -janitor/plugincore/cruft.py -janitor/plugincore/docs/__init__.py -janitor/plugincore/testing/helpers.py -janitor/plugincore/testing/__init__.py -janitor/plugincore/exceptions.py -janitor/plugincore/core/file_cruft.py -janitor/plugincore/core/missing_package_cruft.py -janitor/plugincore/core/package_cruft.py -janitor/plugincore/core/__init__.py -janitor/plugincore/plugin.py -janitor/plugincore/__init__.py -janitor/plugincore/manager.py -janitor/plugincore/i18n.py -janitor/plugincore/plugins/langpack_manual_plugin.py -janitor/plugincore/plugins/kdelibs4to5_plugin.py -janitor/plugincore/plugins/dpkg_status_plugin.py -janitor/plugincore/plugins/deb_plugin.py -janitor/plugincore/plugins/__init__.py -janitor/plugincore/plugins/remove_lilo_plugin.py -janitor/plugincore/tests/test_dpkg_status_plugin.py -janitor/plugincore/tests/test_file_cruft.py -janitor/plugincore/tests/test_missing_package_cruft.py -janitor/plugincore/tests/__init__.py -janitor/plugincore/tests/test_documentation.py -janitor/plugincore/tests/test_package_cruft.py -janitor/plugincore/tests/test_manager.py -janitor/plugincore/tests/test_deb_plugin.py -janitor/plugincore/tests/data/bravo_plugin.py -janitor/plugincore/tests/data/__init__.py -janitor/plugincore/tests/data/alpha_plugin.py -janitor/plugincore/tests/data/charlie_plugin.py -janitor/__init__.py +hwe-support-status +Janitor/computerjanitor/cruft.py +Janitor/computerjanitor/cruft_tests.py +Janitor/computerjanitor/exc.py +Janitor/computerjanitor/exc_tests.py +Janitor/computerjanitor/file_cruft.py +Janitor/computerjanitor/file_cruft_tests.py +Janitor/computerjanitor/__init__.py +Janitor/computerjanitor/package_cruft.py +Janitor/computerjanitor/package_cruft_tests.py +Janitor/computerjanitor/plugin.py +Janitor/computerjanitor/plugin_tests.py +Janitor/computerjanitor/missing_package_cruft.py +Janitor/computerjanitor/missing_package_cruft_tests.py +Janitor/plugins/deb_plugin.py +Janitor/plugins/deb_plugin_tests.py +Janitor/plugins/dpkg_status_plugin.py +Janitor/plugins/dpkg_status_plugin_tests.py +Janitor/plugins/kdelibs4to5_plugin.py +Janitor/plugins/langpack_manual_plugin.py +Janitor/plugins/remove_lilo_plugin.py +HweSupportStatus/consts.py \ No newline at end of file diff -Nru update-manager-17.10.11/po/POTFILES.skip update-manager-0.156.14.15/po/POTFILES.skip --- update-manager-17.10.11/po/POTFILES.skip 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/POTFILES.skip 2017-12-23 05:00:38.000000000 +0000 @@ -1,4 +1,6 @@ tests/interactive_fetch_release_upgrader.py tests/interactive_fetch_release_upgrader.py +tests/test_xorg_fix_intrepid.py +DistUpgrade/DistUpgradeViewKDE3.py data/glade/UpdateManager.glade diff -Nru update-manager-17.10.11/po/ps.po update-manager-0.156.14.15/po/ps.po --- update-manager-17.10.11/po/ps.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/ps.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2009-06-29 02:53+0000\n" "Last-Translator: Launchpad Translations Administrators \n" "Language-Team: Pushto \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "" @@ -42,30 +43,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -75,13 +76,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -96,22 +97,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -124,65 +125,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -191,25 +192,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -218,11 +219,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -233,11 +234,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -245,7 +246,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -254,29 +255,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -286,28 +287,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -315,11 +316,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -331,16 +332,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -353,11 +354,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -366,34 +367,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -406,23 +407,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -433,32 +434,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -466,33 +467,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -503,26 +504,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -530,37 +531,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -568,79 +569,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -648,16 +649,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -666,7 +667,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -675,11 +676,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -687,11 +688,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -699,11 +700,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -713,71 +714,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -787,27 +788,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -817,7 +818,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -826,26 +827,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -853,147 +854,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1001,32 +1002,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1042,7 +1043,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1056,14 +1057,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1071,34 +1072,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1111,28 +1110,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1140,145 +1139,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1286,73 +1285,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1410,7 +1409,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1429,133 +1428,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1563,31 +1570,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1596,34 +1610,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1631,29 +1653,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1662,7 +1684,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1670,58 +1692,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1731,22 +1763,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1760,26 +1788,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1788,7 +1816,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1797,7 +1825,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1806,47 +1834,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1907,54 +1929,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1979,7 +2004,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1991,216 +2016,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/pt_BR.po update-manager-0.156.14.15/po/pt_BR.po --- update-manager-17.10.11/po/pt_BR.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/pt_BR.po 2017-12-23 05:00:38.000000000 +0000 @@ -1,11 +1,12 @@ # Portuguese Brazilian translation for update-manager # This file is distributed under the same licence as the update-manager package. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-21 10:52+0000\n" "Last-Translator: Rafael Neri \n" "Language-Team: Ubuntu-BR \n" @@ -20,7 +21,7 @@ "X-Poedit-Language: Portuguese\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Servidor no(a) %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Servidor principal" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Servidores personalizados" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Não foi possível calcular a entrada de source.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Não foi possível localizar qualquer arquivo do pacote. Talvez este não seja " "um disco do Ubuntu ou tenha uma arquitetura diferente?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Falha ao adicionar o CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,13 +83,13 @@ "Mensagem de erro:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Remover pacote corrompido" msgstr[1] "Remover pacotes corrompidos" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -109,15 +110,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "O servidor pode estar sobrecarregado" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Pacotes quebrados" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -127,7 +128,7 @@ "antes de continuar." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -148,11 +149,11 @@ " * Pacotes não-oficiais não fornecidos pelo Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Provavelmente este problema é temporário. Por favor, tente mais tarde." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -160,16 +161,16 @@ "Se nenhuma dessas se aplica, por favor reporte esse erro usando o comando " "'ubuntu-bug update-manager' em um terminal." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Não foi possível calcular a atualização" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Erro na autenticação de alguns pacotes" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -179,7 +180,7 @@ "problema na rede. Você pode tentar novamente mais tarde. Veja abaixo uma " "lista dos pacotes não-autenticados." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -187,22 +188,22 @@ "O pacote '%s' está marcado para remoção, mas ele está na lista-negra de " "remoção." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "O pacote essencial '%s' está marcado para remoção." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Tentando instalar uma versão marcada como banida: '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Não é possível instalar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -211,11 +212,11 @@ "usando 'ubuntu-bug update-manager' em um terminal." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Não foi possível adivinhar o meta-pacote" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -229,15 +230,15 @@ " Por favor, instale um dos pacotes acima usando o synaptic, ou o apt-get, " "antes de continuar." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Lendo cache" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Não foi possível obter trava exclusiva" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -246,11 +247,11 @@ "pacotes (como o apt-get ou aptitude) já está em execução. Por favor, feche " "esse aplicativo primeiro." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Atualização através de conexão remota não é suportada" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -263,11 +264,11 @@ "release-upgrade'\n" "A atualização será abortada agora. Por favor, tente sem ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Continuar executando sob SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -283,11 +284,11 @@ "Se você prosseguir, um daemon ssh será iniciado na porta '%s'.\n" "Você quer prosseguir?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Iniciando sshd adicional" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -298,7 +299,7 @@ "iniciado na porta '%s'. Se algo ocorrer errado com o ssh em execução, você " "poderá ainda conectar pelo adicional.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -311,30 +312,30 @@ "automaticamente. Por exemplo, você pode fazê-lo com:\n" "\"%s\"" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Não é possível atualizar" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" "Uma atualização de '%s' para '%s' não é suportada através desta ferramenta." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "A configuração da área segura falhou" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Não foi possível criar o ambiente de área segura." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Modo área segura" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -350,18 +351,18 @@ "*Nenhuma* mudança escrita no diretório do sistema de agora até a próxima " "reinicialização é permanente." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Sua instalação do python está corrompida. Por favor conserte o link " "simbólico '/usr/bin/python'." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "O Pacote 'debsig-verify' está instalado" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -371,12 +372,12 @@ "Por favor, remova o pacote utilizando o synaptic ou 'apt-get remove debsig-" "verify' e tente executar a atualização novamente" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Não foi possível gravar em '%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -387,11 +388,11 @@ "atualização não pode continuar.\n" "Por favor, tenha certeza que o diretório do sistema é gravável." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Incluir as últimas atualizações através da Internet?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -411,16 +412,16 @@ "você pode instalar as últimas atualizações depois do upgrade.\n" "Se você responder 'não' aqui, a rede não será utilizada." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "desabilitado na atualização para %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Nenhum repositório válido encontrado" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -441,11 +442,11 @@ "Se você selecionar 'Não' a atualização será cancelada." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Gerar sources padrão?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -459,11 +460,11 @@ "Deveriam as entradas padrões para '%s' serem adicionadas? Se você selecionar " "'Não', a atualização será cancelada." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Informação de repositório inválida" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -471,11 +472,11 @@ "A atualização das informações do repositório resultou em um arquivo inválido " "então um processo de relatório de erros e está sendo iniciado." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Fontes de terceiros desabilitadas" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -485,13 +486,13 @@ "pode reabilitá-las após a atualização com a ferramenta 'software-properties' " "ou com o seu gerenciador de pacotes." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Pacote em estado inconsistente" msgstr[1] "Pacotes em estado inconsistente" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -510,11 +511,11 @@ "reinstalados, porém nenhum arquivo foi encontrado para eles. Por favor " "reinstale os pacotes manualmente ou remova-os do sistema." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Erro durante a atualização" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -523,13 +524,13 @@ "problemas de rede, por favor verifique a sua conexão de rede e tente " "novamente." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Não há espaço suficiente no disco" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -544,21 +545,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Calculando as mudanças" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Você quer iniciar a atualização?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Atualização cancelada" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -566,12 +567,12 @@ "A atualização será cancelada agora e o estado original do sistema será " "restaurado. Você pode continuá-la em um outro momento." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Não foi possível baixar as atualizações" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -582,27 +583,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Erro ao aplicar as mudanças" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Restaurando o estado original do sistema" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Não foi possível instalar as atualizações" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -610,7 +611,7 @@ "A atualização foi cancelada. Seu sistema pode estar inutilizável. Um " "processo de recuperação será executado agora (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -627,7 +628,7 @@ "dist-upgrade/ ao relatório do erro.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -635,20 +636,20 @@ "A atualização foi cancelada. Por favor verifique sua conexão com a internet " "ou a mídia de instalação e tente novamente " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Remover pacotes obsoletos?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Manter" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Remover" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -658,27 +659,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Dependências requeridas não estão instaladas" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "A dependência requerida '%s' não está instalada. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Verificando o Gerenciador de pacotes" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "A preparação para a atualização falhou" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -686,11 +687,11 @@ "Falha na preparação do sistema para atualização, portanto um processo de " "relatório de erros está sendo iniciado." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Falha ao obter os pré-requisitos para atualização" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -702,70 +703,70 @@ "\n" "Além disso, um processo de relatório de erro está sendo iniciado." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Atualizando informação do repositório" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Falha ao adicionar cd-rom" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Desculpe, a inclusão do cd-rom não foi bem sucedida." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Informação do pacote inválida" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Obtendo" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Atualizando" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Atualização completa" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "A atualização foi concluída mas houve erros durante o processo de " "atualização." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Buscando programas obsoletos" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "A atualização do sistema está completa." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "A atualização parcial está completa." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms em uso" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -775,13 +776,13 @@ "mounts. O software 'evms' não é mais suportado, por favor desative-o e " "execute a atualização novamente quando isto for feito." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "Seu hardware de gráficos pode não ser totalmente suportado no Ubuntu 12.04 " "LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -793,9 +794,9 @@ "https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx Você deseja " "continuar com a atualização?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -803,8 +804,8 @@ "Atualizar pode reduzir efeitos da área de trabalho e performance em jogos e " "outros programas que usam gráficos intensamente." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -818,7 +819,7 @@ "\n" "Você deseja continuar?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -832,11 +833,11 @@ "\n" "Você deseja continuar?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Sem processador i686" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -848,11 +849,11 @@ "requerem i686 como arquitetura mínima. Não é possível atualizar seu sistema " "para uma nova versão do Ubuntu nesse computador." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Nenhuma CPU ARMv6" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -864,11 +865,11 @@ "mínimo a arquitetura ARMv6. Não é possível atualizar seu sistema para uma " "versão mais nova do Ubuntu com este hardware." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Sem inicialização disponível" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -884,15 +885,15 @@ "\n" "Você tem certeza que deseja continuar?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Atualização da área de segurança utilizando aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Use o caminho dado para buscar por um cdrom com pacotes atualizáveis" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -900,58 +901,58 @@ "Usar a interface gráfica. Disponível atualmente: \n" "DistUpgradeviewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*OBSOLETO* esta opção será ignorada" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Executando somente uma atualização parcial (sem reescrever o sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Desabilitar suporte de tela GNU" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Configurar diretório de dados" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Por favor insira '%s' na unidade '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "A busca está completa" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Obtendo arquivo %li de %li a %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Restam aproximadamente %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Obtendo arquivo %li de %li" @@ -961,27 +962,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Aplicando mudanças" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "problemas de dependência - deixando desconfigurado" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Não foi possível instalar '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -993,7 +994,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1004,7 +1005,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1012,20 +1013,20 @@ "Você irá perder qualquer mudança que tenha feito nesse arquivo de " "configuração se você escolher substituí-lo por uma versão mais nova." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "O comando 'diff' não foi encontrado" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Ocorreu um erro fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1038,13 +1039,13 @@ "Seu arquivo sources.list original foi salvo em /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c pressionado" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1053,134 +1054,134 @@ "de que deseja fazer isto?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "Para evitar perda de dados, feche todos os aplicativos e documentos." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Não é mais suportado pela Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Desatualizar (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Remover (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Não é mais necessário (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Instalar (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Atualizar (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Mudança de mídia" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Mostrar a diferença >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Ocultar diferença" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Erro" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Cancelar" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "Fe&char" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Mostrar Terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Ocultar terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Informação" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Detalhes" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Não é mais suportado %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Remover %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Remover (foi auto-instalado) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Instalar %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Atualizar %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Reinicialização necessária" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Reinicie o sistema para finalizar a atualização" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Reiniciar agora" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1192,32 +1193,32 @@ "O sistema pode ficar inutilizável se você cancelar a atualização. É " "altamente recomendável que você prossiga com a atualização." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Cancelar atualização?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li dia" msgstr[1] "%li dias" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li hora" msgstr[1] "%li horas" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minuto" msgstr[1] "%li minutos" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1233,7 +1234,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1247,14 +1248,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1264,34 +1265,32 @@ "de %s em um modem de 56K." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Este download irá levar cerca de %s com sua conexão. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Preparando para atualizar" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Obtendo novos canais de software" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Obtendo novos pacotes" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Instalando as atualizações" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Limpando" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1308,28 +1307,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d pacote será removido." msgstr[1] "%d pacotes serão removidos." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d novo pacote será instalado." msgstr[1] "%d novos pacotes serão instalados." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d pacote será atualizado." msgstr[1] "%d pacotes serão atualizados." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1340,7 +1339,7 @@ "\n" "Você tem que baixar um total de %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1348,7 +1347,7 @@ "Instalar a atualização pode demorar várias horas. Uma vez terminado o " "download, o processo não pode ser cancelado." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1356,16 +1355,16 @@ "Buscar e instalar a atualização pode levar algumas horas. Uma vez terminado " "de baixá-la, o processo não pode ser cancelado." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Remover os pacotes podem demorar várias horas. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "O software em seu computador está atualizado." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1373,38 +1372,38 @@ "Não há atualizações disponíveis para o seu sistema. A atualização será " "cancelada agora." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Reinicialização necessária" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "A atualização terminou e é necessário reiniciar o computador. Você deseja " "fazer isso agora?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "autenticar os '%(file)s' contra as '%(signature)s' " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "extraindo '%s'" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Não foi possível executar a ferramenta de atualização" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1412,33 +1411,33 @@ "Isso é um erro mais comum na ferramenta de atualização. Por favor, relate " "como um erro usando o comando 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Assinatura da ferramenta de atualização" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Ferramenta de atualização" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Falha ao obter" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Falha ao obter a atualização. Pode ser algum problema com a rede. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Falha na autenticação" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1446,13 +1445,13 @@ "Falha ao autenticar a atualização. Pode ser um problema com a rede ou com o " "servidor. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Falha ao extrair" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1460,13 +1459,13 @@ "Falha ao extrair a atualização. Pode ser um problema com a rede ou com o " "servidor. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Falha na verificação" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1474,15 +1473,15 @@ "Falha ao verificar atualização. Pode ser um problema com a rede ou com o " "servidor. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Não foi possível executar a ferramenta de atualização" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1490,13 +1489,13 @@ "Isso é causado normalmente por um sistema onde /tmp é montado com noexec. " "Por favor, remonte sem noexec e execute a atualização novamente." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "A mensagem de erro é '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1509,73 +1508,73 @@ "Seu arquivo sources.list original foi salvo em /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Abortando" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Rebaixado:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Por favor, para continuar pressione [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Continuar [sN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Detalhes [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "s" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Não mais suportado: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Remover: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Instalar: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Atualizar: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Continuar [Sn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1641,9 +1640,8 @@ msgstr "Atualização da distribuição" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Atualizando o Ubuntu para a versão 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Atualizando o Ubuntu para a versão 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1661,84 +1659,85 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Por favor, espere. Isto pode levar algum tempo." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Atualização completa" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Não foi possível encontrar as notas de lançamento" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "O servidor pode estar sobrecarregado. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Não foi possível obter as notas de lançamento" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Por favor, verifique sua conexão à Internet." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Atualizar" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Notas de lançamento" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Baixando arquivos de pacotes adicionais..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Arquivo %s de %s a %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Arquivo %s de %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Abrir link no navegador" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Copiar link para área de transferência" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Baixando arquivo %(current)li de %(total)li a %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Baixando arquivo %(current)li de %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Não há mais suporte para a sua versão do Ubuntu." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1747,53 +1746,59 @@ "atualizações críticas. Por favor, atualize para uma versão mais recente do " "Ubuntu." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Informações de atualização" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Instalar" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Nome" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Versão %s \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Não foi detectada uma conexão de rede, você não pode baixar as informações " "do changelog." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Baixando lista de mudanças..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Desmarcar todos" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Selecion_ar Todos" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s atualização foi selecionada." +msgstr[1] "%(count)s atualizações foram selecionadas." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s serão baixados." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "A atualização já foi baixada, mas não instalada." msgstr[1] "As atualizações já foram baixadas, mas não instaladas." @@ -1801,11 +1806,18 @@ msgid "There are no updates to install." msgstr "Não há atualizações para instalar." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Tamanho baixado desconhecido." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1813,7 +1825,7 @@ "Não se sabe quando as informações dos pacotes foram atualizadas. Por favor, " "clique no botão 'Verificar' para atualizar as informações." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1822,14 +1834,14 @@ "As informações dos pacotes foram atualizadas há %(days_ago)s dias.\n" "Clique em \"Verificar\" para consultar se há novas atualizações de software." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "As informações de pacote foram atualizadas há %(days_ago)s dia." msgstr[1] "As informações de pacote foram atualizadas há %(days_ago)s dias." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1838,35 +1850,47 @@ msgstr[1] "As informações de pacote foram atualizadas há %(hours_ago)s horas." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "As informações dos pacotes foram atualizadas há %s minutos." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "As informações dos pacotes acabaram de ser atualizadas." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Atualizações de programas podem corrigir erros, eliminar vulnerabilidades de " +"segurança, e prover novas funcionalidades para você." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" "Atualizações de software podem estar disponíveis para o seu computador." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Bem-vindo ao Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Essas atualizações de programa foram emitidas desde que esta versão do " +"Ubuntu foi lançada." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Atualizações de programa estão disponíveis para este computador." + +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1878,7 +1902,7 @@ "sua lixeira e remova pacotes temporários de instalações anteriores usando " "'sudo apt-get clean'." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1886,25 +1910,25 @@ "O computador precisa ser reiniciado para finalizar a instalação das " "atualizações. Por favor, salve seu trabalho antes de continuar." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Lendo informações do pacote" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Conectando..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Você pode não ser capaz de verificar atualizações ou baixar novas " "atualizações." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Não foi possível inicializar as informações do pacote" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1918,7 +1942,7 @@ "Por favor relate este erro do pacote 'update-manager' e inclua a seguinte " "mensagem de erro:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1931,31 +1955,31 @@ "Por favor reporte esse erro do pacote 'update-manager' e inclua a seguinte " "mensagem de erro:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Nova instalação)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Tamanho: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Da versão %(old_version)s para %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Versão %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Não é possível fazer a atualização de versão agora" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1964,21 +1988,21 @@ "Não é possível executar a atualização de versão no momento. Por favor, tente " "novamente mais tarde. O servidor relatou: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Baixando a ferramenta de atualização" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Nova versão do Ubuntu '%s' está disponível" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "O índice de software está danificado" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1988,6 +2012,17 @@ "Gerenciador de Pacotes \"Synaptic\" ou execute \"sudo apt-get install -f\" " "em um terminal para resolver esse problema primeiro." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Novo lançamento '%s' está disponível." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Cancelar" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Verificar se há atualizações" @@ -1997,22 +2032,18 @@ msgstr "Instalar todas as atualizações disponíveis" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Cancelar" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Registro de alterações" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Atualizações" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Construindo lista de atualizações" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2036,20 +2067,20 @@ " * Pacotes de software não-oficiais não fornecidos pelo Ubuntu\n" " * Alterações normais de uma versão de pré-lançamento do Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Baixando o registro de mudanças" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Outras atualizações (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "Essa atualização não veio de uma fonte que suporta changelogs." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2057,7 +2088,7 @@ "Falha ao baixar a lista de alterações. \n" "Por favor verifique sua conexão à Internet." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2070,7 +2101,7 @@ "Versão disponível: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2083,7 +2114,7 @@ "Por favor, use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "até que as alterações se tornem disponíveis ou tente novamente, mais tarde." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2096,53 +2127,44 @@ "Por favor utilize http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "até que as mudanças estejam disponíveis ou tente novamente mais tarde." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Falha ao detectar a distribuição" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" "Um erro '%s' ocorreu enquanto verificava-se que sistema você está utilizando." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Principais atualizações de segurança" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Atualizações recomendadas" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Atualizações sugeridas" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backports" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Atualizações da distribuição" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Outras atualizações" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Iniciando o Gerenciador de atualizações" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Atualizações de programas podem corrigir erros, eliminar vulnerabilidades de " -"segurança, e prover novas funcionalidades para você." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "Atualização _parcial" @@ -2215,37 +2237,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Atualizações de software" +msgid "Update Manager" +msgstr "Gerenciador de atualizações" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Atualizações de software" +msgid "Starting Update Manager" +msgstr "Iniciando gerenciador de atualizações" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "At_ualizar" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "atualizações" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Instalar" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Alterações" +msgid "updates" +msgstr "atualizações" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Descrição" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Descrição da atualização" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2253,25 +2265,35 @@ "Você está conectado via roaming e poderá ser cobrado pelo consumo de dados " "desta atualização." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Você está conectado através de um modem sem fio." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "É recomendável conectar o computador à uma fonte de energia antes de " "atualizar." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Instalar atualizações" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Alterações" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "Configuraçõe_s..." +msgid "Description" +msgstr "Descrição" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Instalar" +msgid "Description of update" +msgstr "Descrição da atualização" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "Configuraçõe_s..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2295,9 +2317,8 @@ msgstr "Você se recusou a atualização para o novo Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Você pode atualizar depois abrindo o Gerenciador de atualização e clique em " @@ -2311,60 +2332,60 @@ msgid "Show and install available updates" msgstr "Mostrar e instalar as atualizações disponíveis" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Mostrar a versão e sair" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Diretório que contém os arquivos de dados" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Verificar se uma nova versão do Ubuntu está disponível" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "Verificar se é possível atualizar para a versão de desenvolvimento mais " "recente" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Atualize usando a versão sugerida mais recente do atualizador de lançamento" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Não focar o mapa ao iniciar" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Tentar executar uma atualização inteligente" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Não verificar por atualização na inicialização" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Testar atualização com uma sobreposição de aufs na área segura." -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Executando uma atualização parcial" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Mostrar a descrição dos pacotes ao invés do registro de alterações" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Tente atualizar para a última versão usando o atualizador de $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2374,11 +2395,11 @@ "Atualmente são suportadas 'desktop' para atualizações apartir de um sistema " "desktop e 'server' para sistema tipo servidor." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Executar a interface especificada" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2386,11 +2407,11 @@ "Somente verificar se um novo lançamento da distribuição está disponível e " "informe o resultado através do código de saída" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Verificando por uma nova versão do Ubuntu" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2398,58 +2419,58 @@ "Para informações sobre atualização, visite:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Nenhuma nova versão encontrada" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Novo lançamento '%s' está disponível." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Execute 'do-release-upgrade' para atualizá-lo." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Atualização do Ubuntu %(version)s disponível" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Você desistiu de atualizar para o Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Adicionar saída de depuração" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Mostrar pacotes não suportados nessa máquina" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Mostrar pacotes suportados nessa máquina" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Mostrar todos os pacotes com o seu estado" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Mostrar todos os pacotes em uma lista" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Sumário do estado de suporte de '%s':" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "Você tem %(num)s pacotes (%(percent).1f%%) suportados até %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" @@ -2457,11 +2478,11 @@ "Você tem %(num)s pacotes (%(percent).1f%%) que não podem ou não estão " "disponíveis para serem baixados" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "Você tem %(num)s pacotes (%(percent).1f%%) que não são suportados" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2469,124 +2490,154 @@ "Executar com --show-unsupported, --show-supported ou --show-all para ver " "mais detalhes" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Não é mais baixável:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Não suportado: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Suportado até %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Não suportado" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Método não implementado: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Um arquivo no disco" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "pacote .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Instalar pacote que está faltando." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Pacote %s deve ser instalado." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "pacote .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s precisa ser marcado como instalado manualmente." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"Ao atualizar, se estiver kdelibs4-dev instalado, kdelibs5-dev precisa ser " -"instalado. Veja bugs.launchpad.net, bug # 279621 para obter mais detalhes." - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i entradas obsoletas no arquivo de status" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Entradas obsoletas no status do dpkg" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Entradas de status do dpkg obsoletas" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"Ao atualizar, se estiver kdelibs4-dev instalado, kdelibs5-dev precisa ser " +"instalado. Veja bugs.launchpad.net, bug # 279621 para obter mais detalhes." + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s precisa ser marcado como instalado manualmente." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Remover o lilo desde que o grub esteja instalado. (Veja o bug #314004 para " "detalhes.)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Depois que suas informações do pacote foram atualizadas, o pacote " -#~ "essencial '%s' não pode mais ser encontrado, portanto um relatório do " -#~ "erro está sendo iniciado." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Atualizando o Ubuntu para a versão 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s atualização foi selecionada." -#~ msgstr[1] "%(count)s atualizações foram selecionadas." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Bem-vindo ao Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Essas atualizações de programa foram emitidas desde que esta versão do " -#~ "Ubuntu foi lançada." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Atualizações de programa estão disponíveis para este computador." - -#~ msgid "Update Manager" -#~ msgstr "Gerenciador de atualizações" - -#~ msgid "Starting Update Manager" -#~ msgstr "Iniciando gerenciador de atualizações" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Você está conectado através de um modem sem fio." - -#~ msgid "_Install Updates" -#~ msgstr "_Instalar atualizações" +#~ "Depois que suas informações do pacote foram atualizadas, o pacote " +#~ "essencial '%s' não pode mais ser encontrado, portanto um relatório do " +#~ "erro está sendo iniciado." #~ msgid "Checking for a new ubuntu release" #~ msgstr "Verificando se há uma nova versão do Ubuntu" @@ -2723,6 +2774,9 @@ #~ "você pode encontrar problemas depois da atualização. Você deseja " #~ "continuar com a atualização?" +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Atualizando o Ubuntu para a versão 11.10" + #~ msgid "%.0f kB" #~ msgstr "%.0f kB" diff -Nru update-manager-17.10.11/po/pt.po update-manager-0.156.14.15/po/pt.po --- update-manager-17.10.11/po/pt.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/pt.po 2017-12-23 05:00:38.000000000 +0000 @@ -2,11 +2,12 @@ # Copyright (C) 2005 Free Software Foundation, Inc. # This file is distributed under the same license as the update-manager package. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-02-23 20:03+0000\n" "Last-Translator: Almufadado \n" "Language-Team: Ubuntu Portuguese Team \n" @@ -19,7 +20,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -27,13 +28,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Servidor para %s" @@ -41,20 +42,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Servidor principal" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Servidores personalizados" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Não foi possivel calcular a entrada sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -62,11 +63,11 @@ "Não foi possível localizar ficheiros de pacotes, talvez isto não seja um " "Disco Ubuntu ou é de uma outra arquitectura?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Falha ao adicionar o CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -81,13 +82,13 @@ "A mensagem de erro foi:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Remover o pacote em mau estado" msgstr[1] "Remover os pacotes em mau estado" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -108,15 +109,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "O servidor pode estar sobrecarregado" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Pacotes quebrados" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -126,7 +127,7 @@ "continuar." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -148,12 +149,12 @@ " * Pacotes de software não oficial e não disponibilizadas pelo Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Isto é provavelmente um problema temporário, por favor tente mais tarde." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -161,16 +162,16 @@ "Se nenhum destes se aplicar, então, por favor, reporte este bug utilizando o " "comando 'ubuntu-bug update-manager' num terminal." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Impossível calcular a actualização de versão" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Erro ao autenticar alguns pacotes" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -180,29 +181,29 @@ "rede temporário. Tente novamente mais tarde. Verifique abaixo uma lista de " "pacotes não autenticados." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" "O pacote '%s' está marcado para remoção mas está na lista negra de remoção." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "O pacote essencial '%s' está marcado para remoção." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Tentando instalar a versão '%s' da lista negra" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Impossível instalar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -211,11 +212,11 @@ "utilizando 'ubuntu-bug update-manager' num terminal." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Impossível descobrir meta-pacote" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -229,15 +230,15 @@ " Por favor instale um dos pacotes acima mencionados usando o synaptic ouo " "apt-get antes de continuar." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "A ler a cache" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Incapaz de obter o acesso exclusivo ao sistema" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -246,11 +247,11 @@ "ou o aptitude) em execução. Tem de sair dessa aplicação primeiro antes de " "continuarmos." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "A actualização através de uma ligação remota não é suportada" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -264,11 +265,11 @@ "\n" "A actualização de versão vai ser cancelada. Por favor tente sem SSH." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Continuar a correr sobre SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -285,11 +286,11 @@ "Se continuar, um daemon SSH adicional será iniciado na porta '%s'.\n" "Deseja continuar ?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "A iniciar um sshd adicional" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -300,7 +301,7 @@ "porta '%s'. Se alguma coisa correr mal com o ssh actual, você poderá ligar-" "se ao adicional.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -313,31 +314,31 @@ "porta com:\n" "\"%s\"" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Impossível actualizar a versão" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" "Uma actualização de versão de '%s' para '%s' não é suportada por esta " "ferramenta." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "A configuração sandbox (teste) falhou" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Não foi possível criar um ambiente sandbox (teste)" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Modo sandbox" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -347,18 +348,18 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "A sua instalação de python está corrompida. Por favor corriga a ligação " "simbólica para '/usr/bin/python'" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "O pacote 'debsig-verify' está instalado" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -369,12 +370,12 @@ "Por favor remova-o primeiro com o Synaptic ou 'apt-get remove debsig-verify' " "e inicie a actualização de versão novamente." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -382,11 +383,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Incluir últimas actualizações a partir da Internet?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -408,16 +409,16 @@ "fazer isto, terá de instalar as últimas actualizações depois de ter sido " "actualizada a distribuição." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "desactivada na actualização para a versão %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Nenhum repositório válido encontrado" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -438,11 +439,11 @@ "Se escolher 'Não', a actualização será cancelada." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Gerar as fontes padrão?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -456,21 +457,21 @@ "Devem ser adicionadas as entradas predefinidas de '%s' ? Se escolher 'Não', " "a actualização de versão será cancelada." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Informação de repositório inválida" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Fontes de terceiros desactivadas" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -480,13 +481,13 @@ "actualização de versão, pode reactivá-las com uns dos seus gestores de " "pacotes (synaptic, apt)." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "O pacote está num estado inconsistente" msgstr[1] "Os pacotes estão num estado inconsistente" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -505,11 +506,11 @@ "reinstalados, mas não é possível encontrar um arquivo para eles. Por favor " "reinstale estes pacotes manualmente ou remova-os do sistema." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Erro durante a actualização" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -517,13 +518,13 @@ "Ocorreu um problema durante a actualização. Habitualmente trata-se de algum " "problema na rede, por favor verifique a sua ligação à rede e tente novamente." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Não existe espaço livre suficiente em disco" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -538,21 +539,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "A aplicar as alterações" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Deseja iniciar a actualização de versão?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Actualização de versão cancelada" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -560,12 +561,12 @@ "A actualização vai ser cancelada e o sistema original será restaurado. Pode " "retomar esta actualização posteriormente." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Impossível descarregar as actualizações" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -576,27 +577,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Erro ao submeter" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "A restaurar o estado original do sistema" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Impossível instalar as actualizações" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -604,7 +605,7 @@ "A actualização foi abortada. O seu sistema pode encontrar-se num estado não " "utilizável. Uma recuperação vai correr agora (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -615,7 +616,7 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -623,20 +624,20 @@ "A actualização de versão foi abortada. Por favor verifique a sua ligação à " "Internet ou o seu meio de instalação e tente novamente. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Remover pacotes obsoletos?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Manter" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Remover" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -646,37 +647,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "A dependência requerida não foi instalada" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "A dependência '%s' requerida não foi instalada. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "A verificar gestor de pacotes" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "A preparação da actualização de versão falhou" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Falhou a obtenção do pré-requisitos da actualização de versão" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -684,70 +685,70 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "A actualizar informação de repositórios" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Falhou a adicionar o CD-ROM" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Desculpe, mas a adição do CD não foi bem sucedida." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Informação de pacotes inválida" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "A recolher" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "A actualizar" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Actualização concluída" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "A actualização da versão do sistema foi concluída, mas ocorreram erros " "durante o processo." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "À procura de software obsoleto" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "A actualização da versão do sistema foi concluída." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "A actualização parcial de versão foi concluída." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms em uso" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -757,11 +758,11 @@ "software \"evms\" já não tem suporte. Por favor desactive-o e faça a " "actualização novamente quando esta acção estiver terminada." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -769,9 +770,9 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -779,8 +780,8 @@ "Actualizar pode reduzir os efeitos do ambiente de trabalho, bem como o " "desempenho em jogos e outros programas graficamente exigentes." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -794,7 +795,7 @@ "\n" "Pretende continuar?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -808,11 +809,11 @@ "\n" "Pretende continuar?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Nenhum CPU i686" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -824,11 +825,11 @@ "arquitectura i686 mínima. Não é possível actualizar o seu systema para a " "nova versão do Ubuntu com o hardware actual." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Sem CPU ARMv6" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -840,11 +841,11 @@ "arquitectura mínima. Não é possível fazer upgrade para uma nova versão de " "Ubuntu com este hardware." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Sem inicialização disponível" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -860,17 +861,17 @@ "\n" "De certeza que quer continuar?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Actualização em 'Sandbox' usando o aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Utilize o caminho fornecido para pesquisar os pacotes actualizáveis no " "leitor de cds" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -878,59 +879,59 @@ "Utilize o frontend. Actualmente disponíveis: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*OBSOLETO* esta opção será ignorada" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Executar apenas uma actualização parcial (não se irá escrever no sources." "list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Deactivar o suporte de Ecrã GNU" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Definir datadir" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Por favor insira '%s' no leitor '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "A transferência está completa" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "A obter o ficheiro %li de %li a %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Cerca de %s restantes" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "A obter o ficheiro %li de %li" @@ -940,27 +941,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "A aplicar as alterações" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "problemas com dependências - a deixar por configurar" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Impossível instalar '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -972,7 +973,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -983,7 +984,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -991,20 +992,20 @@ "Perderá todas as alterações que fez a este ficheiro de configuração caso o " "substitua por uma versão mais recente." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "O comando 'diff' não foi encontrado" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Ocorreu um erro fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1016,13 +1017,13 @@ "no seu relatório. A actualização de versão foi abortada.\n" "A sua sources.list foi guardada em /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Foi pressionado Ctrl-c" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1031,137 +1032,137 @@ "inconsistente. Tem a certeza que o deseja fazer?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Para prevenir a perda de dados feche todas as aplicações e documentos " "abertos." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Não é suportado pela Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Desactualizar (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Remover (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Não mais necessário (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Instalar (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Actualizar versão (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Alterar Media" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Mostrar Diferença >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Esconder Diferença" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Erro" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Cancelar" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Fechar" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Mostrar Consola >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Esconder Consola" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Informação" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Detalhes" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Já não é suportado %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Remover %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Remover (foi instalado automaticamente) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Instalar %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Actualizar versão %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Necessário reiniciar" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" "Reinicie o sistema para completar a actualização de versão" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Reiniciar agora" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1173,32 +1174,32 @@ "O sistema poderá ser deixado num estado inutilizável se cancelar a " "actualização. É aconselhado a prosseguir com a actualização de versão." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Cancelar a actualização de versão?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li dia" msgstr[1] "%li dias" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li hora" msgstr[1] "%li horas" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minuto" msgstr[1] "%li minutos" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1214,7 +1215,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1228,14 +1229,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1245,34 +1246,32 @@ "%s com um modem de 56k." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Esta transferência irá consumir aproximadamente %s da sua ligação. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "A preparar para actualizar" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "A obter novos canais de software" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "A obter novos pacotes" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "A instalar as actualizações" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "A efectuar a limpeza" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1289,28 +1288,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "o pacote %d irá ser removido." msgstr[1] "os pacotes %d serão removidos." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d novo pacote irá ser instalado." msgstr[1] "%d novos pacotes serão instalados." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d pacote irá ser actualizado." msgstr[1] "%d pacotes serão actualizados." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1321,28 +1320,28 @@ "\n" "Terá de descarregar um total de %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1350,37 +1349,37 @@ "Não há actualizações disponíveis para o seu sistema. A actualização irá ser " "cancelada." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Necessário reiniciar" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "A actualização terminou e é necessário reiniciar. Deseja reiniciar agora?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Impossível de executar a ferramenta de actualização" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1388,35 +1387,35 @@ "Isto é provavelmente um bug na ferramenta de atualização. Por favor, reporte " "este bug utilizando o comando 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Assinatura da ferramenta de actualização" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Ferramenta de actualização de versão" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Falha a obter" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "Falhou ao obter a actualização de versão. Poderá existir um problema de " "rede. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Autenticação falhou" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1424,13 +1423,13 @@ "Autenticação da actualização falhou. Poderá existir um problema com a rede " "ou com o servidor. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Falhou ao extrair" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1438,13 +1437,13 @@ "Extracção da actualização de versão falhou. Poderá existir um problema com a " "rede ou com o servidor. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "A verificação foi mal sucedida" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1452,15 +1451,15 @@ "A verificação da actualização falhou. Poderá existir um problema com a rede " "ou com o servidor. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Impossível executar a actualização" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1468,13 +1467,13 @@ "Isto é normalmente causado por um sistema onde /tmp está montado noexec. Por " "favor, remonte sem noexec e corra a atualização novamente." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "A mensagem de erro é '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1485,73 +1484,73 @@ "main.log e /var/log/dist-upgrade/apt.log no seu relatório. A actualização de " "versão foi abortada." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "A abortar" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Despromovido:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Para continuar por favor pressione [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "_Continuar [sN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Detalhes [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "s" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Não é mais suportado: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Remover %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Instalar: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Actualizar: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Continuar [Sn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1619,9 +1618,8 @@ msgstr "Actualização de Versão da Distribuição" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Atualizando o Ubuntu para a versão 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1639,148 +1637,161 @@ msgid "Terminal" msgstr "Consola" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Por favor aguarde, isto pode levar algum tempo." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "A actualização está completa" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Impossível encontrar notas de lançamento" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "O servidor poderá estar sobrecarregado. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Impossível descarregar as notas de lançamento" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Por favor verifique a sua ligação à internet." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Actualizar" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Notas de Lançamento" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "A descarregar pacotes adicionais..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Ficheiro %s de %s a %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Ficheiro %s de %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Abrir link no Browser" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Copiar link para a Área de Transferência" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "A descarregar ficheiro %(current)li de %(total)li a %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "A descarregar ficheiro %(current)li de %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Este lançamento do Ubuntu já não é suportado." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Informação de actualização de versão" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Instalar" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Versão %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Nenhuma ligação detectada, não pode transferir as informações do registo." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "A descarregar a lista de alterações..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Desmarcar Todos" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Selecionar _Todos" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s actualização foi seleccionada." +msgstr[1] "%(count)s actualizações foram seleccionadas." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s vai ser transferido." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "A actualização já foi transferida mas ainda não foi instalada" +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" msgstr[1] "" -"As actualizações já foram transferidas mas ainda não foram instaladas" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Tamanho de transferência desconhecido." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1788,7 +1799,7 @@ "Não se sabe quando as informações de pacotes foram atualizadas pela última " "vez. Por favor, clique no botão 'Verificar' para atualizar a informação." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1798,7 +1809,7 @@ "Clique no botão 'Verificar' para saber se existem novas actualizações de " "software." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1806,7 +1817,7 @@ msgstr[1] "" "A informação dos pacotes foi actualizada há %(days_ago)s dias atrás." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1817,36 +1828,46 @@ "A informação dos pacotes foi actualizada há %(hours_ago)s horas atrás." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" "As informações de pacotes foram atualizadas pela última vez há %s minutos " "atrás." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "As informações de pacotes acabaram de ser atualizadas." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Actualizações de aplicações podem corrigir erros, eliminar problemas de " +"segurança, e fornecer novas funcionalidades." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Podem existir actualizações disponíveis para o seu computador." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Bem vindo ao Ubuntu" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1858,7 +1879,7 @@ "reciclagem e remova pacotes temporários de instalações antigas usando 'sudo " "apt-get clean'" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1866,25 +1887,25 @@ "O computador precisa de reiniciar para acabar de instalar as actualizações. " "Por favor guarde o seu trabalho antes de continuar." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "A ler a informação dos pacotes" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "A Ligar..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Pode não ser capaz de verificar a existência de actualizações ou fazer a " "transferências de novas actualizações." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Impossível inicializar a informação do pacote" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1898,7 +1919,7 @@ "Por favor reporte este erro no pacote 'update-manager' e inclua a seguinte " "mensagem de erro:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1910,31 +1931,31 @@ "Por favor reporte este erro no pacote 'update-manager' e inclua a seguinte " "mensagem de erro:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Nova instalação)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Tamanho: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Da versão: %(old_version)s para %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Versão %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Não é possível neste momento fazer a actualização de versão" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1943,21 +1964,21 @@ "A actualização da versão não pode ser executada agora, por favor tente " "novamente mais tarde. o servidor reportou: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "A descarregar a ferramenta de actualização da nova versão" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Nova versão '%s' do Ubuntu está disponível" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "O índice de aplicações está quebrado" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1967,6 +1988,17 @@ "gestor de pacotes \"Synaptic\" ou execute \"sudo apt-get install -f\" numa " "consola para corrigir este problema em primeiro lugar." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Nova versão '%s' disponível." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Cancelar" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Verificar Atualizações" @@ -1976,22 +2008,18 @@ msgstr "Instalar Todas as Atualizações Disponíveis" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Cancelar" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "A Construir Lista de Actualizações" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2015,21 +2043,21 @@ " Pacotes de software não-oficiais não fornecidos pelo Ubuntu\n" " Alterações normais numa versão beta do Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "A descarregar o registo de alterações" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Outras actualizações (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" "Esta atualização não provém de uma fonte que suporte o registo de alterações." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2037,7 +2065,7 @@ "Falha ao descarregar a lista de alterações. \n" "Por favor verifique a sua ligação à Internet." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2050,7 +2078,7 @@ "Versão disponível: % s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2063,7 +2091,7 @@ "Por favor utilize o http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "até que as alterações estejam disponíveis ou tente novamente mais tarde." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2076,52 +2104,43 @@ "Por favor use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "até que as alterações estejam disponíveis ou volte a tentar mais tarde." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Falha ao detectar a distribuição" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Ocorreu um erro '%s' ao verificar que sistema está a usar." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Actualizações de segurança importantes" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Actualizações recomendadas" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Actualizações propostas" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backports" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Actualizações de Distribuição" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Outras actualizações" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "A iniciar o Gestor de Actualizações" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Actualizações de aplicações podem corrigir erros, eliminar problemas de " -"segurança, e fornecer novas funcionalidades." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Actualização Parcial" @@ -2195,37 +2214,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Actualizações de Software" +msgid "Update Manager" +msgstr "Gestor de Actualizações" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Actualizações de Software" +msgid "Starting Update Manager" +msgstr "A Iniciar o Gestor de Actualizações" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "A_ctualização" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "actualizações" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Instalar" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Alterações" +msgid "updates" +msgstr "actualizações" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Descrição" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Descrição da actualização" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2233,24 +2242,34 @@ "Está ligado por roaming e poderá ser cobrado o tráfego consumido por esta " "actualização." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Está ligado através dum modem sem fios." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "É mais seguro ligar o seu portátil à corrente antes de fazer a actualização." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Instalar Actualizações" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Alterações" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Definições..." +msgid "Description" +msgstr "Descrição" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Instalar" +msgid "Description of update" +msgstr "Descrição da actualização" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Definições..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2274,9 +2293,8 @@ msgstr "Você declinou a actualização para o novo Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Pode actualizar mais tarde ao abrir o Gestor de Actualizações e clicar em " @@ -2290,59 +2308,59 @@ msgid "Show and install available updates" msgstr "Mostrar e instalar actualizações disponíveis" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Mostrar a versão e sair" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Directório que contém os ficheiros de dados" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Verificar se está disponível uma nova versão do Ubuntu" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "Verifique se é possível actualizar para a última versão em desenvolvimento" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "Actualizar usando a última versão proposta do actualizador." -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Não focar o mapa quando inicia" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Tente executar um dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Não verificar por actualizações ao iniciar" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Testar actualização com uma sobreposição de aufs na área segura" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "A executar actualização parcial" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Tente actualizar para a última versão com o programa de actualização do " "$distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2352,11 +2370,11 @@ "Actualmente 'desktop' para actualizações regulares do sistema desktop e " "'server' para o sistema servidor são suportados." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Executar o frontend específico" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2364,11 +2382,11 @@ "Verificar apenas se está disponível uma nova versão da distribuição e " "comunicar o resultado através do código de saída" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2377,122 +2395,139 @@ "visite:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Não existem novos lançamentos" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Nova versão '%s' disponível." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" "Correr 'do-release-upgrade' para actualizar para o lançamento mais recente." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Actualização Ubuntu %(version)s Disponível" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Você não aceitou a actualização para o Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Método não implementado: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Um ficheiro no disco" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "Pacote .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Instalar pacote em falta." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "O pacote %s deve ser instalado." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "Pacote .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s precisa de ser marcado como instalado manualmente." +msgid "%i obsolete entries in the status file" +msgstr "%i entradas obsoletas no ficheiro de status" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "Entradas obsoletas no estado do dpkg" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "Entradas obsoletas no estado do dpkg" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2501,48 +2536,74 @@ "de ser instalado. Consulte bugs.launchpad.net, erro #279621 para mais " "detalhes." -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "%i entradas obsoletas no ficheiro de status" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "Entradas obsoletas no estado do dpkg" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "Entradas obsoletas no estado do dpkg" +msgid "%s needs to be marked as manually installed." +msgstr "%s precisa de ser marcado como instalado manualmente." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Remova o LILO porque o GRUB já está instalado. (Veja o bug #314004 para " "detalhes.)" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s actualização foi seleccionada." -#~ msgstr[1] "%(count)s actualizações foram seleccionadas." - -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" - -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Bem vindo ao Ubuntu" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Gestor de Actualizações" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "Starting Update Manager" -#~ msgstr "A Iniciar o Gestor de Actualizações" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Está ligado através dum modem sem fios." +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "_Instalar Actualizações" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "Your system is up-to-date" #~ msgstr "O seu sistema está actualizado" @@ -2567,6 +2628,12 @@ #~ msgid "There are no updates to install" #~ msgstr "Não existem actualizações para instalar" +#~ msgid "The update has already been downloaded, but not installed" +#~ msgid_plural "The updates have already been downloaded, but not installed" +#~ msgstr[0] "A actualização já foi transferida mas ainda não foi instalada" +#~ msgstr[1] "" +#~ "As actualizações já foram transferidas mas ainda não foram instaladas" + #~ msgid "" #~ "You will not get any further security fixes or critical updates. Please " #~ "upgrade to a later version of Ubuntu Linux." @@ -2669,6 +2736,9 @@ #~ "comando 'ubuntu-bug update-manager' num terminal e inclua os ficheiros " #~ "em /var/log/dist-upgrade/ no relatório de erro." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Atualizando o Ubuntu para a versão 11.10" + #~ msgid "Your graphics hardware may not be fully supported in Ubuntu 11.04." #~ msgstr "" #~ "Os seus dispositivos gráficos podem não ser totalmente suportados no " diff -Nru update-manager-17.10.11/po/qu.po update-manager-0.156.14.15/po/qu.po --- update-manager-17.10.11/po/qu.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/qu.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2009-06-29 03:01+0000\n" "Last-Translator: Launchpad Translations Administrators \n" "Language-Team: Quechua \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "" @@ -42,30 +43,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -75,13 +76,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -96,22 +97,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -124,65 +125,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -191,25 +192,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -218,11 +219,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -233,11 +234,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -245,7 +246,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -254,29 +255,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -286,28 +287,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -315,11 +316,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -331,16 +332,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -353,11 +354,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -366,34 +367,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -406,23 +407,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -433,32 +434,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -466,33 +467,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -503,26 +504,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -530,37 +531,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -568,79 +569,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -648,16 +649,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -666,7 +667,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -675,11 +676,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -687,11 +688,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -699,11 +700,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -713,71 +714,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -787,27 +788,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -817,7 +818,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -826,26 +827,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -853,147 +854,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1001,32 +1002,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1042,7 +1043,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1056,14 +1057,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1071,34 +1072,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1111,28 +1110,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1140,145 +1139,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1286,73 +1285,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1410,7 +1409,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1429,133 +1428,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1563,31 +1570,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1596,34 +1610,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1631,29 +1653,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1662,7 +1684,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1670,58 +1692,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1731,22 +1763,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1760,26 +1788,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1788,7 +1816,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1797,7 +1825,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1806,47 +1834,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1907,54 +1929,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1979,7 +2004,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1991,216 +2016,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/ro.po update-manager-0.156.14.15/po/ro.po --- update-manager-17.10.11/po/ro.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/ro.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # Dan Damian , 2005. # Lucian Adrian Grijincu , 2010, 2011. +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-04-08 10:56+0000\n" "Last-Translator: Marian Vasile \n" "Language-Team: Romanian Gnome Team \n" @@ -21,7 +22,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -30,13 +31,13 @@ msgstr[2] "%(size).0f de kO" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MO" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Server pentru %s" @@ -44,20 +45,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Server principal" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Servere preferențiale" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Nu s-a putut calcula intrarea sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -65,11 +66,11 @@ "Nu s-au găsit pachete, poate că acesta nu e un disc Ubuntu sau este pentru o " "altă arhitectură?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Adăugarea CD-ului a eșuat" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -84,14 +85,14 @@ "Mesajul de eroare a fost:\n" "„%s”" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Șterge pachetul aflat într-o stare eronată" msgstr[1] "Șterge pachetele aflate într-o stare eronată" msgstr[2] "Șterge pachetele aflate într-o stare eronată" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -116,15 +117,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "S-ar putea ca serverul să fie suprasolicitat" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Pachete deteriorate" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -133,7 +134,7 @@ "program. Înainte de a continua, remediați-le utilizând Synaptic sau apt-get." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -154,11 +155,11 @@ " * pachete de programe neoficiale care nu provin din Ubuntu.\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Cel mai probabil este o problemă trecătoare, încercați mai târziu." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -166,16 +167,16 @@ "Dacă niciuna nu se potrivește, vă rugăm raportați această neregulă folosind " "într-un terminal comanda 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Nu s-a putut calcula înnoirea" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Eroare la validarea unor pachete" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -185,7 +186,7 @@ "probleme temporare ale rețelei. Puteți încerca mai târziu. Aveți mai jos o " "listă a pachetelor neautentificate." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -193,24 +194,24 @@ "Pachetul „%s” este marcat pentru eliminare, dar este pe lista de interzicere " "de eliminare." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Pachetul esențial „%s” este marcat pentru eliminare." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" "Se încearcă instalarea versiunii „%s” care este pe lista versiunilor " "interzise la instalare" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Nu s-a putut instala „%s”" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -219,11 +220,11 @@ "folosind 'ubuntu-bug update-manager' într-un terminal." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Nu s-a putut ghici meta-pachetul" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -237,15 +238,15 @@ "Înainte de a continua, instalați unul din pachetele de mai sus folosind " "Synaptic sau apt-get." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Se citește cache-ul" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Nu s-a putut obține accesul exclusiv" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -253,12 +254,12 @@ "Aceasta de obicei înseamnă că mai rulează o altă aplicație de administrare a " "pachetelor (ca apt-get sau aptitude). Închideți mai întâi acea aplicație." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" "Înnoirile prin intermediul conexiunilor de la distanță nu sunt suportate" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -272,11 +273,11 @@ "\n" "Înnoirea va fi abandonată. Încercați fără ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Continuați rularea în SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -293,11 +294,11 @@ "Dacă veți continua, un nou daemon ssh va fi pornit pe portul „%s”.\n" "Doriți să continuați?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Se pornește serviciul sshd adițional" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -309,7 +310,7 @@ "ssh care rulează acum, puteți în continuare să vă conectați la cel " "adițional.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -322,29 +323,29 @@ "automat. De ex., aveți posibilitatea să deschideți un port cu:\n" "'% s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Nu s-a putut înnoi" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Înnoirea de la „%s” la „%s” nu este suportată cu acest program." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Inițializarea cutiei de nisip a eșuat" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Nu s-a putut crea mediul cutiei de nisip." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Mod cutie de nisip" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -359,18 +360,18 @@ "*Nicio* modificare scrisă în dosarele de sistem de-acum până la următoarea " "repornire nu este permanentă." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Python-ul instalat este deteriorat. Reparați legătura simbolică „/usr/bin/" "python”." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Pachetul „debsig-verify” este instalat" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -380,12 +381,12 @@ "Dezinstalați-l cu Synaptic sau tastați comanda „apt-get remove debsig-" "verify” și reluați înnoirea." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Nu se poate scrie în '%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -396,11 +397,11 @@ "Actualizarea nu poate continua.\n" "Asigurați-vă că dosarul de sistem nu este în modul doar citire." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Includeți ultimele actualizări de pe Internet?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -420,16 +421,16 @@ "instalați ultimele actualizări curând după înnoirea sistemului.\n" "Dacă răspunsul aici este „nu”, rețeaua nu va fi folosită deloc." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "dezactivat la înnoirea la %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Nu s-a găsit niciun site oglindă valid" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -450,11 +451,11 @@ "Dacă alegeți „Nu” înnoirea va fi anulată." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Generați surse implicite?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -468,11 +469,11 @@ "Doriți să se adauge o intrare implicită pentru „%s”? Dacă selectați „Nu”, " "înnoirea va fi anulată." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Informațiile despre depozite nu sunt valide" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -480,11 +481,11 @@ "Actualizarea informațiilor despre arhive a creat un fișier nevalid, așa că a " "fost inițiat un raport pentru defecte de programare." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Surse terțe dezactivate" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -494,14 +495,14 @@ "dezactivate. Le puteți reactiva după înnoire cu aplicația „software-" "properties” sau din administratorul de pachete." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Pachet aflat într-o stare inconsecventă" msgstr[1] "Pachete aflate în stări inconsecvente" msgstr[2] "Pachete aflate în stări inconsecvente" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -524,11 +525,11 @@ "dar nu pot fi găsite arhive pentru ele. Reinstalați manual pachetele sau " "eliminați-le din sistem." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Eroare în timpul actualizării" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -536,13 +537,13 @@ "A apărut o problemă în timpul actualizării. De obicei este legată de " "probleme de rețea, verificați conexiunea și încercați din nou." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Spațiu liber pe disc insuficient" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -557,21 +558,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Se calculează modificările" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Doriți să porniți înnoirea?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Înnoire anulată" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -579,12 +580,12 @@ "Înnoirea va fi anulată și se va restaura starea originală a sistemului. " "Puteți relua înnoirea mai târziu." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Nu s-au putut descărca înnoirile" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -595,27 +596,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Eroare în timpul comiterii" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Se revine la starea inițială a sistemului" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Nu s-au putut instala înnoirile" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -623,7 +624,7 @@ "Înnoirea a fost abandonată. Sistemul dumneavoastră ar putea fi într-o stare " "inutilizabilă. Va fi executată o recuperare (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -640,7 +641,7 @@ "in /var/log/dist-upgrade/ to the bug report.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -648,20 +649,20 @@ "Înnoirea a fost abandonată. Verificați conexiunea la internet sau mediile de " "instalare și reîncercați. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Ștergeți pachetele învechite?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Păstrează" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Elimină" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -671,27 +672,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "O dependență necesară nu este instalată." -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Dependență necesară „%s” nu este instalată. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Se verifică managerul de pachete" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Pregătirea înnoirii a eșuat" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -699,11 +700,11 @@ "Pregătirea sistemului în vederea actualizării a eșuat, astfel că se pornește " "un proces pentru raportarea defecțiunilor." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Obținerea cerințelor pentru înnoire a eșuat" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -715,69 +716,69 @@ "\n" "În plus, a fost inițiat un raport pentru defecte de programare." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Se actualizează informațiile despre depozite" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Nu s-a putut adăuga CDROM-ul" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Nu s-a putut adăuga CDROM-ul" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Informații despre pachete nevalide" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Se descarcă" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Se înnoiește" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Înnoire finalizată" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "Înnoirea s-a terminat, dar au existat erori în timpul procesului de înnoire." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Se caută aplicații învechite" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Înnoirea sistemului este completă." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Înnoirea parțială a fost încheiată." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms în uz" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -787,13 +788,13 @@ "mounts. Programul „evms” nu mai beneficiază de asistență. Dezactivați-l și " "apoi reporniți procesul de înnoire." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "Există posibilitatea ca funcțiile plăcii grafice să nu fie recunoscute pe " "deplin în Ubuntu 12.04 LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -805,9 +806,9 @@ "mai multe informații consultați https://wiki.ubuntu.com/X/Bugs/" "UpdateManagerWarningForI8xx. Doriți să continuați actualizarea?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -815,8 +816,8 @@ "Înnoirea ar putea reduce efectele vizuale, performanța în jocuri și a altor " "aplicații intensive din punct de vedere grafic." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -830,7 +831,7 @@ "\n" "Doriți să continuați?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -844,11 +845,11 @@ "\n" "Doriți să continuați?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Niciun CPU i686" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -860,11 +861,11 @@ "arhitectură minimă. Nu este posibilă actualizarea sistemului dumneavoastră " "la o nouă versiune Ubuntu cu acest hardware." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Nu există nici un procesor ARMv6" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -876,11 +877,11 @@ "optimizări care necesită ARMv6, ca arhitectură minimă. Cu acest hardware, nu " "se poate înnoi sistemul la noua versiune Ubuntu." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Nu există niciun serviciu „init” disponibil" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -896,16 +897,16 @@ "\n" "Sigur doriți să continuați?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Înnoire de tip „cutie de nisip” folosind aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Folosește calea primită pentru a căuta un cdrom cu pachete ce pot fi înnoite" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -913,58 +914,58 @@ "Folosește interfața. Disponibile: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*ÎNVECHIT* această opțiune va fi ignorată" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Execută doar o înnoire parțială (fără rescrierea fișierului sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Dezactivează suportul pentru „GNU screen”" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Stabilește datadir" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Introduceți „%s” în unitatea „%s”" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Descărcarea este completă" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Se descarcă fișierul %li din %li cu %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Mai rămân aproximativ %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Se descarcă fișierul %li din %li" @@ -974,27 +975,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Se aplică modificările" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "probleme de dependențe - lăsat neconfigurat" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Nu s-a putut instala „%s”" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -1006,7 +1007,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1017,7 +1018,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1025,20 +1026,20 @@ "Veți pierde orice schimbări făcute la acest fișier de configurare dacă " "alegeți să îl înlocuiți cu o versiune nouă." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Comanda „diff” nu a putut fi localizată" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "S-a produs o eroare fatală" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1050,13 +1051,13 @@ "Înnoirea a fost abandonată. Fișierul sources.list original a fost salvat în /" "etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c apăsat" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1065,136 +1066,136 @@ "deteriorată. Siguri doriți să faceți asta?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Pentru a preveni pierderea datelor, salvați documentele și închideți toate " "aplicațiile." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Nu mai este suportat de Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Regresie (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Elimină (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Nu mai este necesar (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Instalează (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Actualizează (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Modificare mediu de stocare" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Afișează diferențele >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Ascunde diferențele" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Eroare" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Anulează" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "În&chide" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Afișează terminalul >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Ascunde terminalul" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Informații" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Detalii" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Nu mai este suportat %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Șterge %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Șterge %s (a fost instalat automat)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Instalează %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Înnoiește %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Este necesară repornirea" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Reporniți sistemul pentru ca înnoirea să se încheie" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Repornește acum" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1206,11 +1207,11 @@ "În cazul în care anulați această înnoire este posibil ca sistemul să rămână " "într-o stare neutilizabilă. Este foarte indicat să continuați înnoirea." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Anulați înnoirea?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" @@ -1218,7 +1219,7 @@ msgstr[1] "%li zile" msgstr[2] "%li de zile" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" @@ -1226,7 +1227,7 @@ msgstr[1] "%li ore" msgstr[2] "%li de ore" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" @@ -1234,7 +1235,7 @@ msgstr[1] "%li minute" msgstr[2] "%li de minute" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1251,7 +1252,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1265,14 +1266,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1282,34 +1283,32 @@ "aproximativ %s pentru un modem de 56k." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Acestă descărcare va dura aproximativ %s cu conexiunea dumneavoastră. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Se pregătește înnoirea" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Se obțin noi canale software" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Se obțin pachete noi" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Se instalează înnoirile" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Se curăță" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1329,7 +1328,7 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." @@ -1337,7 +1336,7 @@ msgstr[1] "%d pachete vor fi șterse." msgstr[2] "%d de pachete vor fi șterse." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." @@ -1345,7 +1344,7 @@ msgstr[1] "%d pachete noi vor fi instalate." msgstr[2] "%d de pachete noi vor fi instalate." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." @@ -1353,7 +1352,7 @@ msgstr[1] "%d pachete vor fi înnoite." msgstr[2] "%d de pachete vor fi înnoite." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1364,7 +1363,7 @@ "\n" "Trebuie să descărcați un total de %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1372,7 +1371,7 @@ "Instalarea actualizărilor poate dura câteva ore. Odată ce descărcarea este " "terminată, procesul nu mai poate fi anulat." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1380,16 +1379,16 @@ "Aducerea și instalarea actualizărilot poate dura câteva ore. Odată ce " "descărcarea acestora este terminată, procesul nu mai poate fi anulat." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Ștergerea pachetelor poate dura câteva ore. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Programele din acest calculator sunt la zi." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1397,38 +1396,38 @@ "Nu există înnoiri disponibile sistemului dumneavoastră. Înnoirea va fi " "anulată." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Este necesară repornirea" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Înnoirea s-a încheiat și este necesară repornirea calculatorului. Doriți să " "faceți acest lucru acum?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "'%(file)s' fișiere autentificate prin '%(signature)s' " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "se extrage '%s'" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Nu s-a putut executa programul de înnoire" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1436,33 +1435,33 @@ "Cel mai probabil este vorba despre o neregulă în utilitarul pentru " "actualizare. Raportați-o utilizâând comanda 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Înnoiește semnătura utilitarului" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Program de înnoire" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Descărcare eșuată" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Descărcarea înnoirii a eșuat. Ar putea exista o problemă la rețea. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Autentificare eșuată" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1470,13 +1469,13 @@ "Autentificarea înnoirii a eșuat. Ar putea exista o problemă cu rețeaua sau " "cu serverul. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Nu s-a putut extrage" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1484,13 +1483,13 @@ "Extragerea înnoirii a eșuat. Ar putea exista o problemă cu rețeaua sau cu " "serverul. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Verificarea a eșuat" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1498,15 +1497,15 @@ "Verificarea înnoirii a eșuat. S-ar putea să fie o problemă cu rețeaua sau cu " "serverul. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Nu s-a putut executa înnoirea" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1514,13 +1513,13 @@ "Apare de regulă pe sisteme în care /tmp este montat noexec. Remontați fără " "opțiunea noexec și rulați din nou actualizarea." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Mesajul de eroare este „%s”." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1532,73 +1531,73 @@ "Fișierul sources.list original a fost salvat în /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Se abandonează" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Retrogradat:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Pentru a continua apăsați [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Continuă [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Detalii [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Nu mai sunt suportate: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Șterge: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Instalează: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Înnoiește: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Continuă [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1665,8 +1664,7 @@ msgstr "Înnoire distribuție" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "Se înnoiește Ubuntu la versiunea 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1685,84 +1683,85 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Așteptați, ar putea dura ceva timp." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Actualizarea este completă" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Nu s-au putut găsi notițele de lansare" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Serverul ar putea fi supraîncărcat. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Nu s-a putut descărca notițele de lansare" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Verificați conexiunea la internet." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Înnoiește" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Notițe de lansare" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Se descarcă pachete adiționale..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Fișierul %s din %s la %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Fișierul %s din %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Deschide legătura în navigator" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Copiază legătura în clipboard" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Se descarcă fișierul %(current)li din %(total)li cu %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Se descarcă fișierul %(current)li din %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Această versiune Ubuntu nu mai primește asistență." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1770,53 +1769,60 @@ "Nu veți mai primi alte actualizări critice sau de securitate. Vă rugăm să " "actualizați la o versiune de Ubuntu mai nouă." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Informații despre înnoire" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Instalează" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Nume" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Versiunea %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Nu s-a detectat nicio conexiune la rețea; nu se poate descărca jurnalul " "modificărilor." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Se descarcă listă modificărilor..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Deselectează tot" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Selecte_ază tot" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "O actualizare a fost selectată." +msgstr[1] "%(count)s actualizări au fost selectate." +msgstr[2] "%(count)s de actualizări au fost selectate." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s va fi descărcat." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "Actualizarea a fost descărcată deja, dar nu a fost instalată." msgstr[1] "Actualizările au fost descărcate deja, dar nu au fost instalate." msgstr[2] "Actualizările au fost descărcate deja, dar nu au fost instalate." @@ -1825,11 +1831,18 @@ msgid "There are no updates to install." msgstr "Nu există actualizări de instalat." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Dimensiune descărcare necunoscută." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1838,7 +1851,7 @@ "oară. Efectuați click pe butonul \"Verifică\" pentru a actualiza această " "informație." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1849,7 +1862,7 @@ "Apăsați butonul „Verifică” de mai jos pentru a verifica dacă au apărut noi " "actualizări." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1863,7 +1876,7 @@ "Informațiile despre pachete au fost actualizate ultima dată acum " "%(days_ago)s de zile." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1879,34 +1892,46 @@ "%(hours_ago)s de ore." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Informațiile despre pachet au fost actualizate acum %s minute." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Chiar acum au fost actualizate informațiile despre pachete." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Actualizările programelor corectează erorile, elimină vulnerabilitățile de " +"securitate și vă pun la dispoziție funcționalități noi." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Este posibil să existe actualizări pentru calculatorul dumneavoastră." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Bine ați venit la Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Aceste actualizări de programe au apărut în intervalul de timp scurs de la " +"lansarea acestei versiuni Ubuntu." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Pentru acest calculator sunt disponibile actualizări de programe." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1917,7 +1942,7 @@ "spațiu pe discul „%s”. Goliți coșul de gunoi și ștergeți pachetele temporare " "ale actualizărilor mai vechi folosind comanda „sudo apt-get clean”." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1925,25 +1950,25 @@ "Pentru a finaliza actualizările, calculatorul trebuie repornit. Înainte de a " "continua, salvați modificările curente." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Se citesc informațiile pachetului" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Se conectează..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "S-ar putea să nu puteți să mai verificați existența actualizărilor sau să " "descărcați noile actualizări." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Nu s-au putut inițializa informațiile despre pachet" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1957,7 +1982,7 @@ "Raportați acest defect al pachetului „update-manager” și includeți următorul " "mesaj de eroare:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1969,31 +1994,31 @@ "Raportați acest defect al pachetului „update-manager” și includeți următorul " "mesaj de eroare:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Instalare nouă)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Mărime: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "De la versiunea %(old_version)s la %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Versiunea %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Înnoirea la o nouă versiune nu este posibilă acum" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -2002,21 +2027,21 @@ "Înnoirea la o nouă versiune nu este posibilă acum, încercați mai târziu. " "Serverul a raportat: „%s”" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Se descarcă utilitarul de înnoire" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Este disponibilă versiunea nouă de Ubuntu „%s”" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Indexul pachetelor software este deteriorat" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -2026,6 +2051,17 @@ "pachete „Synaptic” sau executați comanda „sudo apt-get install -f” într-un " "terminal pentru a remedia mai întâi această problemă." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "O nouă versiune „%s” disponibilă." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Anulează" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Verifică pentru actualizări" @@ -2035,22 +2071,18 @@ msgstr "Instalează actualizările disponibile" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Anulează" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Istoric modificări" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Actualizări" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Se construiește lista de actualizări" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2074,22 +2106,22 @@ " * pachete de programe neoficiale care nu au fost furnizate de Ubuntu,\n" " * modificări normale ale unei versiuni încă nepublicate de Ubuntu." -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Se descarcă jurnalul de modificări" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Alte actualizări (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" "Această actualizare nu vine dintr-o sursă care are funcție pentru istoric " "modificări." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2097,7 +2129,7 @@ "Nu s-a putut descărca lista modificărilor. \n" "Verificați dacă aveți o conexiune la internet activă." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2110,7 +2142,7 @@ "Versiunea disponibilă: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2123,7 +2155,7 @@ "Folosiți http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "până când modificările devin disponibile sau încercați mai târziu." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2136,52 +2168,43 @@ "Folosiți http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "până ce modificările vor fi disponibile sau încercați din nou mai târziu." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Nu s-a putut detecta distribuția" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "S-a produs eroarea „%s” la verificarea sistemului pe care îl folosiți." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Actualizări importante de securitate" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Actualizări recomandate" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Actualizări propuse" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Portări către versiuni anterioare" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Actualizări distribuție" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Alte actualizări" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Se pornește administratorul de actualizări" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Actualizările programelor corectează erorile, elimină vulnerabilitățile de " -"securitate și vă pun la dispoziție funcționalități noi." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "Înnoire _parțială" @@ -2251,37 +2274,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Actualizări software" +msgid "Update Manager" +msgstr "Administrator actualizări" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Actualizări software" +msgid "Starting Update Manager" +msgstr "Se pornește administratorul de actualizări" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "Înnoieș_te" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "actualizări" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Instalează" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Modificări" +msgid "updates" +msgstr "actualizări" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Descriere" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Descrierea actualizării" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2289,24 +2302,34 @@ "Sunteți conectat prin intermediul serviciului de roaming și puteți fi taxat " "pentru datele consumate de această actualizare." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Sunteți conectat prin intermediul unui modem fără fir." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Este recomandat să conectați calculatorul la priză înainte de actualizare." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Instalează actualizările" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Modificări" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "Config_urări..." +msgid "Description" +msgstr "Descriere" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Instalează" +msgid "Description of update" +msgstr "Descrierea actualizării" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "Config_urări..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2331,9 +2354,8 @@ msgstr "Ați refuzat înnoirea la cea mai nouă versiune Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Puteți înnoi mai târziu pornind Administratorului de actualizări și apăsând " @@ -2347,62 +2369,62 @@ msgid "Show and install available updates" msgstr "Afișează și instalează actualizările disponibile" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Afișează versiunea și ieși" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Dosarul care conține fișierele cu date" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Verifică dacă este disponibilă o nouă versiune Ubuntu" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "Verifică dacă este posibilă înnoirea la cea mai recentă versiune în " "dezvoltare" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Înnoiește folosind ultima versiune propusă de utilitarul de înnoire a " "versiunilor" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Nu adu harta în prim-plan la demarare" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Încercați să executați dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Nu căuta actualizări la pornire" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Testează înnoirea într-o cutie de nisip cu aufs" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Se execută înnoirea parțială" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Arată descrierea pachetului în locul istoricului modificărilor" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Încercați o înnoire la ultima versiune folosind utilitarul de înnoire din " "$distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2412,11 +2434,11 @@ "Momentan sunt suportate „desktop” pentru o actualizare normală a unui sistem " "de birou sau „server” pentru actualizarea unui sistem de tip server." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Lansează interfața specificată" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2424,11 +2446,11 @@ "Verifică doar dacă o nouă versiune de distribuție este disponibilă și " "raportează rezultatul prin codul de ieșire" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Se verifică dacă există versiuni noi pentru Ubuntu" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2436,71 +2458,71 @@ "Pentru informații despre înnoire, vizitați:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Nu s-a găsit o versiune nouă" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "O nouă versiune „%s” disponibilă." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Executați „do-release-upgrade” pentru a o aplica." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Înnoire disponibilă pentru Ubuntu %(version)s" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Ați refuzat înnoirea la Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Adaugă informații pentru depanare" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Arată pachetele fără asistență de pe acest calculator" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Arată pachetele pentru care se acordă asistență de pe acest calculator" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Arată toate pachetele cu informații suplimentare" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Arată toate pachetele într-o listă" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Asigură informații despre statutul '%s':" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" "Aveți %(num)s pachete (%(percent).1f%%) pentru care se asigură asistență " "până la %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "Aveți %(num)s pachete (%(percent).1f%%) care nu mai pot fi descărcate" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" "Aveți %(num)s pachete (%(percent).1f%%) pentru care nu se asigură asistență" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2508,54 +2530,71 @@ "Pentru mai multe detalii, rulați comanda cu argumentele --show-unsupported, " "--show-supported sau --show-all" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Nu mai pot fi descărcate:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Nu se asigură asistență: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Se acordă asistență până la %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Fără asistență" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Metodă neimplementată: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Un fișier de pe disc" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "pachet .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Instalează pachetul lipsă." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Pachetul %s ar trebui să fie instalat." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "pachet .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s trebuie marcat ca instalat manual." +msgid "%i obsolete entries in the status file" +msgstr "%i înregistrări învechite în fișierul de stare" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "Intrări învechite în starea dpkg" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "Intrări învechite în starea dpkg" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2564,26 +2603,75 @@ "dev. Pentru detalii consultați raportul de eroare #279621 de pe bugs." "launchpad.net." -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "%i înregistrări învechite în fișierul de stare" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "Intrări învechite în starea dpkg" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "Intrări învechite în starea dpkg" +msgid "%s needs to be marked as manually installed." +msgstr "%s trebuie marcat ca instalat manual." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Se șterge lilo, deoarece grub este instalat. (Pentru detalii consultați bug " "#314004.)" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" + +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + #~ msgid "" #~ "After your package information was updated the essential package '%s' can " #~ "not be found anymore so a bug reporting process is being started." @@ -2592,40 +2680,6 @@ #~ "esențial '%s' nu poate fi găsit, așa că a fost inițiat un raport pentru " #~ "defecte de programare." -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "O actualizare a fost selectată." -#~ msgstr[1] "%(count)s actualizări au fost selectate." -#~ msgstr[2] "%(count)s de actualizări au fost selectate." - -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" - -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Bine ați venit la Ubuntu" - -#~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." -#~ msgstr "" -#~ "Aceste actualizări de programe au apărut în intervalul de timp scurs de " -#~ "la lansarea acestei versiuni Ubuntu." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Pentru acest calculator sunt disponibile actualizări de programe." - -#~ msgid "Update Manager" -#~ msgstr "Administrator actualizări" - -#~ msgid "Starting Update Manager" -#~ msgstr "Se pornește administratorul de actualizări" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Sunteți conectat prin intermediul unui modem fără fir." - -#~ msgid "_Install Updates" -#~ msgstr "_Instalează actualizările" - #~ msgid "Your system is up-to-date" #~ msgstr "Sistemul dumneavoastră este actualizat" diff -Nru update-manager-17.10.11/po/ru.po update-manager-0.156.14.15/po/ru.po --- update-manager-17.10.11/po/ru.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/ru.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # Igor Zubarev , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-04-13 00:54+0000\n" "Last-Translator: Evgeny \n" "Language-Team: Russian \n" @@ -21,7 +22,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -30,13 +31,13 @@ msgstr[2] "%(size).0f КБ" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f МБ" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Сервер для %s" @@ -44,20 +45,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Основной сервер" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Пользовательские серверы" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Не удалось рассчитать элемент sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -65,11 +66,11 @@ "Не удалось найти файлы пакетов, может быть, это не диск дистрибутива Ubuntu " "или неверная архитектура?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Не удалось добавить компакт-диск" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -85,14 +86,14 @@ "Сообщение об ошибке:\n" "«%s»" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Удалить пакет, помеченный как ошибочный" msgstr[1] "Удалить пакеты, помеченные как ошибочные" msgstr[2] "Удалить пакеты, помеченные как ошибочные" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -117,15 +118,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Возможно, сервер перегружен" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Повреждённые пакеты" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -135,7 +136,7 @@ "прежде чем продолжить." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -156,11 +157,11 @@ " * Неофициальным программным обеспечением, которое не поддерживается Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Вероятно, это временная проблема. Попробуйте повторить позднее." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -168,16 +169,16 @@ "Если из предложенного ничего не подходит, пожалуйста, отправьте этот отчёт, " "используя в терминале команду 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Не удалось рассчитать обновление системы" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Ошибка при проверке подлинности некоторых пакетов" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -187,7 +188,7 @@ "кратковременная проблема с сетью и стоит повторить операцию позже. Ниже " "приведен список пакетов, не прошедших проверку." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -195,22 +196,22 @@ "Пакет «%s» отмечен для удаления, но он находится в списке запрещённых к " "удалению." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Основной пакет «%s» отмечен для удаления." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Попытка установки внесённой в чёрный список версии «%s»" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Не удалось установить «%s»" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -219,11 +220,11 @@ "используя в терминале команду «ubuntu-bug update-manager»." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Не удалось подобрать мета-пакет" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -237,15 +238,15 @@ " Пожалуйста, установите сначала один из этих пакетов с помощью synaptic или " "apt-get перед продолжением." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Чтение временных файлов" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Не удалось получить исключительную блокировку" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -254,11 +255,11 @@ "пакетами (например, apt-get или aptitude). Пожалуйста, закройте эту " "программу, чтобы продолжить." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Обновление через удалённое соединение не поддерживается" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -271,11 +272,11 @@ "\n" "Обновление остановлено. Попробуйте без ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Продолжить работу через SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -291,11 +292,11 @@ "Если вы продолжите, дополнительная служба ssh будет запущена на порту «%s».\n" "Хотите ли вы продолжить?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Запускается дополнительный sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -306,7 +307,7 @@ "sshd будет запущена на порту «%s». Если что-либо случится с используемым " "ssh, вы сможете подключиться к дополнительной службе.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -319,29 +320,29 @@ "Вы можете открыть следующий способом:\n" "«%s» порт." -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Не удалось обновить" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Обновление от «%s» к «%s» не поддерживается этой утилитой." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Установка безопасного окружения не удалась" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Не удалось создать безопасное окружение." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Режим безопасного окружения («песочницы»)" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -356,18 +357,18 @@ "До следующей перезагрузки никаких изменений в системном каталоге " "производиться не будет." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Python установлен некорректно. Пожалуйста, исправьте символическую ссылку «/" "usr/bin/python»." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Установлен пакет «debsig-verify»" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -377,12 +378,12 @@ "Сначала удалите его в Synaptic или с помощью «apt-get remove debsig-verify» " "и запустите обновление снова." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Невозможно выполнить запись в '%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -393,11 +394,11 @@ "продолжаться.\n" "Пожалуйста, убедитесь в наличии доступа к системному каталогу." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Загрузить последние обновления из интернета?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -417,16 +418,16 @@ "последние обновления как можно скорее.\n" "Если вы ответите «Нет», то обновления через интернет скачаны не будут." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "заблокировано при обновлении до %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Не найдено ни одного действующего зеркала" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -446,11 +447,11 @@ "Если же вы выберите «Нет», то обновление будет отменено." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Сгенерировать источники по умолчанию?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -463,11 +464,11 @@ "Добавить стандартную запись для «%s»? Выбор «Нет» означает отказ от " "обновления." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Информация о репозитории неверна" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -475,11 +476,11 @@ "Обновление сведений о репозиториях привело к созданию повреждённого файла. " "Выполняется запуск системы сообщения о неполадке." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Сторонние источники отключены" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -489,14 +490,14 @@ "сможете их снова включить после обновления с помощью утилиты «Источники " "приложений» или вашего менеджера пакетов." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Пакет в состоянии" msgstr[1] "Пакеты в нестабильном состоянии" msgstr[2] "Пакеты в нестабильном состоянии" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -519,11 +520,11 @@ "для них не найдены архивные файлы. Переустановите пакеты вручную, либо " "удалите их из системы." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Ошибка при обновлении" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -531,13 +532,13 @@ "При обновлении возникла проблема. Обычно это бывает вызвано проблемами в " "сети. Проверьте сетевые подключения и повторите попытку." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Недостаточно свободного места на диске" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -552,21 +553,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Вычисление изменений" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Вы хотите начать обновление системы?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Обновление отменено" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -574,12 +575,12 @@ "Это обновление сейчас будет отменено и произойдет восстановление исходного " "состояния системы. Вы можете продолжить это обновление позже." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Не удалось загрузить обновления" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -590,27 +591,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Ошибка при фиксировании" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Восстановление первоначального состояния системы" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Не удалось установить обновления" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -619,7 +620,7 @@ "использования состоянии. Сейчас будет запущен процесс восстановления (dpkg --" "configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -636,7 +637,7 @@ "содержащиеся в /var/log/dist-upgrade/ к сообщению о неполадке.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -644,20 +645,20 @@ "Обновление было отменено. Проверьте ваше соединение с интернетом или ваш " "установочный носитель и попробуйте снова. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Удалить устаревшие пакеты?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Оставить" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Удалить" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -666,27 +667,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Не установлены требуемые зависимости" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Требуемая зависимость «%s» не установлена. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Проверка менеджера пакетов" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Подготовка к обновлению завершилась неудачно" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -694,11 +695,11 @@ "Подготовки системы к обновлению не удалась, будет запущена программа отчетов " "об ошибках." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Подготовка к обновлению завершилась неудачно" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -711,69 +712,69 @@ "\n" "Выполняется запуск системы сообщения о неполадке." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Обновление информации о репозитории" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Добавление компакт-диска завершилось неудачно" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Добавление компакт-диска завершилось неудачно." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Неверная информация о пакете" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Загрузка" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Обновление" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Обновление завершено" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "Обновление завершено, но во время процесса обновления произошли ошибки." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Поиск устаревших программ" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Обновление системы завершено." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Частичное обновление завершено." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "Программа «evms» используется" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -783,11 +784,11 @@ "«evms» больше не поддерживается. Пожалуйста, закройте её и запустите " "обновление снова." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "Ваша видеокарта не будет поддерживаться полностью в Ubuntu 12.04 LTS" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -799,9 +800,9 @@ "wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx Вы действительно хотите " "продолжить обновление?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -809,8 +810,8 @@ "Обновление может повлечь снижение качества эффектов рабочего стола и " "производительности в играх и приложениях, активно работающих с графикой." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -823,7 +824,7 @@ "\n" "Вы хотите продолжить?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -837,11 +838,11 @@ "\n" "Вы хотите продолжить?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Нет i686-совместимого процессора" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -853,11 +854,11 @@ "архитектуру i686 и выше. Обновить вашу систему до новой версии Ubuntu на " "этом компьютере не получится." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Нет процессора ARMv6" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -869,11 +870,11 @@ "выше. Вашу систему невозможно обновить до нового релиза Ubuntu с текущим " "аппаратным обеспечением." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Служба init недоступна" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -889,16 +890,16 @@ "\n" "Вы уверены, что хотите продолжить?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Обновление в безопасном окружении, используя aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Использовать данный путь для поиска компакт-диска с пакетами обновлений" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -906,58 +907,58 @@ "Использовать интерфейс. Сейчас доступны: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "Этот параметр *УСТАРЕЛ* и не будет учитываться" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Подготовить только частичное обновление (sources.list перезаписан не будет)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Отключить поддержку экрана GNU" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Установить каталог с данными" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Вставьте «%s» в привод «%s»" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Загрузка завершена" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Загрузка файла %li из %li на скорости %s Байт/сек" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Осталось приблизительно %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Загрузка файла %li из %li" @@ -967,27 +968,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Применение изменений" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "проблемы зависимостей — оставляем не настроенным" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Не удалось установить «%s»" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -999,7 +1000,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1010,7 +1011,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1018,20 +1019,20 @@ "Вы потеряете все изменения, которые сделали в этом файле конфигурации, если " "замените его новой версией." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Команда «diff» не найдена" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Произошла критическая ошибка" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1044,13 +1045,13 @@ "Ваш оригинальный файл sources.list был сохранён в /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Нажаты Ctrl+C" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1059,135 +1060,135 @@ "Вы действительно хотите продолжить?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Чтобы избежать потерь данных, закройте все открытые приложения и документы." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Больше не поддерживается компанией Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Установка старой версии (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Удаление (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Больше не нужен (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Установка (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Обновление (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Смена носителя" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Показать различия >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Скрыть различия" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Ошибка" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "О&тмена" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Закрыть" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Показать терминал >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Скрыть терминал" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Сведения" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Подробности" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Больше не поддерживается (%s)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Удалить %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Удалить %s (было установлено автоматически)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Установить %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Обновить %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Требуется перезагрузка" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Для завершения обновления перезагрузите систему" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Перезагрузить сейчас" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1199,11 +1200,11 @@ "Если вы прервёте обновление, система может работать нестабильно. " "Настоятельно рекомендуем продолжить обновление." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Отменить обновление?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" @@ -1211,7 +1212,7 @@ msgstr[1] "%li дня" msgstr[2] "%li дней" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" @@ -1219,7 +1220,7 @@ msgstr[1] "%li часа" msgstr[2] "%li часов" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" @@ -1227,7 +1228,7 @@ msgstr[1] "%li минуты" msgstr[2] "%li минут" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1244,7 +1245,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1258,14 +1259,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1275,34 +1276,32 @@ "соединении на скорости 56Кбит." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Загрузка займёт примерно %s на вашем соединении. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Подготовка к обновлению" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Получение новых источников приложений" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Загрузка новых пакетов" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Установка обновлений" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Очистка" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1322,7 +1321,7 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." @@ -1330,7 +1329,7 @@ msgstr[1] "%d пакета будут удалены." msgstr[2] "%d пакетов будут удалены." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." @@ -1338,7 +1337,7 @@ msgstr[1] "%d новых пакета будут установлены." msgstr[2] "%d новых пакетов будут установлены." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." @@ -1346,7 +1345,7 @@ msgstr[1] "%d пакета будут обновлены." msgstr[2] "%d пакетов будут обновлены." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1357,7 +1356,7 @@ "\n" "Всего требуется загрузить %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1365,7 +1364,7 @@ "Установка обновления может занять несколько часов. После завершения загрузки " "отменить установку будет нельзя." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1373,52 +1372,52 @@ "Загрузка и установка обновления может занять несколько часов. Когда загрузка " "завершится, отменить процесс будет невозможно." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Удаление пакетов может занять несколько часов. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Программное обеспечение на этом компьютере актуально." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" "Для вашей системы не доступно ни одно обновление. Обновление будет отменено." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Требуется перезагрузка" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "Обновление завершено и требуется перезагрузка. Перезагрузиться сейчас?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "аутентифицировать '%(file)s' вместо '%(signature)s' " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "извлечение '%s'" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Не удалось запустить утилиту обновления" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1426,33 +1425,33 @@ "В программе обновления, вероятно, ошибка. Пожалуйста, отправьте этот отчёт, " "используя в терминале команду 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Подпись утилиты обновления" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Утилита обновления" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Не удалось получить" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Не удалось получить обновление. Возможно, возникла проблема в сети. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Проверка подлинности не удалась" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1460,13 +1459,13 @@ "Проверка подлинности обновления не удалась. Возможно, возникла проблема в " "сети или на сервере. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Не удалось извлечь" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1474,13 +1473,13 @@ "Не удалось извлечь обновление. Возможно, возникла проблема в сети или на " "сервере. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Проверка не удалась" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1488,15 +1487,15 @@ "Проверка обновления завершилась неудачно. Возможно, возникла проблема в сети " "или на сервере. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Не удалось запустить процесс обновления" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1504,13 +1503,13 @@ "Обычно возникает в системе, где /tmp смонтирован с флагом noexec. " "Пожалуйста, перемонтируйте без флага noexec и запустите обновление снова." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Сообщение об ошибке «%s»." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1523,73 +1522,73 @@ "Ваш оригинальный файл sources.list был сохранён в /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Прерывание" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Понижено:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Для продолжения нажмите ввод [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Продолжить [дН] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Подробности [п]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "д" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "н" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "п" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Больше не поддерживается: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Удалить: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Установить: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Обновить: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Продолжить [Дн] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1656,9 +1655,8 @@ msgstr "Обновление дистрибутива" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Обновление Ubuntu до версии 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Обновление Ubuntu до версии 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1676,84 +1674,85 @@ msgid "Terminal" msgstr "Терминал" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Пожалуйста, подождите, это может занять некоторое время." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Обновление завершено" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Не удалось найти примечания к выпуску" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Возможно, сервер перегружен. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Не удалось загрузить примечания к выпуску" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Пожалуйста, проверьте ваше сетевое соединение." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Обновление" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Примечания к выпуску" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Загрузка дополнительных файлов пакетов..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Файл %s из %s на скорости %sБ/с" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Файл %s из %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Открыть ссылку в браузере" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Копировать ссылку в буфер" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Загрузка файла %(current)li из %(total)li со скоростью %(speed)s/с" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Загрузка файла %(current)li из %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Ваша версия Ubuntu больше не поддерживается." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1762,51 +1761,58 @@ "связанные с безопасностью. Пожалуйста, выполните обновление до последней " "версии Ubuntu." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Информация об обновлении" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Установка" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Название" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Версия %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "Не обнаружено сетевое соединение, невозможно скачать список изменений." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Загрузка списка изменений..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "Сн_ять выделение" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "В_ыделить всё" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s обновление выбрано." +msgstr[1] "%(count)s обновлений выбрано." +msgstr[2] "%(count)s обновлений выбрано." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s будет загружено." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "Обновление было загружено, но его установка не производилась." msgstr[1] "Обновления были загружены, но их установка не производилась." msgstr[2] "Обновления были загружены, но их установка не производилась." @@ -1815,11 +1821,18 @@ msgid "There are no updates to install." msgstr "Нет доступных обновлений для установки." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Загружаемый размер неизвестен." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1827,7 +1840,7 @@ "Неизвестно, когда информация о пакете была обновлена ​​в последний раз. " "Пожалуйста, нажмите кнопку \"Проверить\" для обновления этой информации." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1836,7 +1849,7 @@ "Информация о пакетах была обновлена %(days_ago)s дней назад.\n" "Нажмите кнопку «Проверить» для проверки новых обновлений программ." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1844,7 +1857,7 @@ msgstr[1] "Информация о пакетах была обновлена %(days_ago)s дня назад." msgstr[2] "Информация о пакетах была обновлена %(days_ago)s дней назад." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1854,34 +1867,46 @@ msgstr[2] "Информация о пакетах была обновлена %(hours_ago)s часов назад." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Сведения о пакетах были обновлены примерно %s минут назад." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Сведения о пакетах были только что обновлены." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Обновления программ исправляют ошибки, уязвимости и добавляют новые " +"возможности." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Возможно, доступны обновления программ для вашего компьютера." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Добро пожаловать в Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Эти обновления программ были опубликованы, начиная с выпуска текущей версии " +"Ubuntu." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Доступны обновления программ для этого компьютера." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1893,7 +1918,7 @@ "корзину и удалите временные пакеты установок, выполнив в терминале команду " "«sudo apt-get clean»." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1901,23 +1926,23 @@ "Для завершения установки обновлений требуется перезагрузить компьютер. " "Пожалуйста, сохраните результаты вашей работы перед тем, как продолжить." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Чтение информации о пакетах" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Подключение..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "Нет возможности проверить наличие обновлений или скачать их." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Не удалось получить информацию о пакетах" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1930,7 +1955,7 @@ "Пожалуйста, сообщите об этой ошибке пакета «update-manager» и включите это " "сообщение:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1942,31 +1967,31 @@ "Пожалуйста, сообщите об этой ошибке пакета «Менеджер обновлений» и включите " "это сообщение:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Новая установка)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Размер: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "С версии %(old_version)s на %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Версия %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Обновление релиза сейчас не возможно" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1975,21 +2000,21 @@ "Обновление релиза сейчас не может быть выполнено, попробуйте позже. Сервер " "сообщил: «%s»" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Загрузка программы для обновления дистрибутива" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Доступна новая версия Ubuntu %s" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Индекс программ повреждён" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1999,6 +2024,17 @@ "используйте менеджер пакетов Synaptic или запустите в терминале «sudo apt-" "get install -f»." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Доступна новая версия «%s»." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Отмена" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Проверить наличие обновлений" @@ -2008,22 +2044,18 @@ msgstr "Установить все доступные обновления" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Отмена" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Журнал изменений" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Обновления" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Формируется список обновлений" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2047,21 +2079,21 @@ " * Неофицальными пакетами, которые не поддерживаются Ubuntu\n" " * Естественными изменениями в предварительной версии Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Загрузка списка изменений" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Другие обновления (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" "Это обновление поставляется источником, не поддерживающим списки изменений." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2069,7 +2101,7 @@ "Ошибка при загрузке списка изменений. \n" "Проверьте ваше сетевое соединение." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2082,7 +2114,7 @@ "Доступная версия: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2096,7 +2128,7 @@ "+changelog\n" "пока не станет доступен список изменений или попробуйте позже." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2109,52 +2141,43 @@ "Пожалуйста, посмотрите http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "пока изменения не станут доступны или попробуйте еще раз позднее." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Не удалось определить дистрибутив" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Произошла ошибка «%s» во время проверки используемой вами системы." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Важные обновления безопасности" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Рекомендованные обновления" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Предлагаемые обновления" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Адаптации из более поздних версий (backports)" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Обновления дистрибутива" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Другие обновления" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Запускается Менеджер обновлений" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Обновления программ исправляют ошибки, уязвимости и добавляют новые " -"возможности." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Частичное обновление" @@ -2225,37 +2248,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Обновления программ" +msgid "Update Manager" +msgstr "Менеджер обновлений" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Обновления программ" +msgid "Starting Update Manager" +msgstr "Запуск Менеджера обновлений" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Обновить" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "обновления" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Установка" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Изменения" +msgid "updates" +msgstr "обновления" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Описание" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Описание обновления" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2263,23 +2276,33 @@ "Вы находитесь в роуминге и с вас может взиматься плата за данные, " "передаваемые при обновлении." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Вы подключены через беспроводной модем." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "Безопаснее подключить компьютер к источнику питания перед обновлением." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Установить обновления" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Изменения" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Настройки..." +msgid "Description" +msgstr "Описание" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Установка" +msgid "Description of update" +msgstr "Описание обновления" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Настройки..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2302,9 +2325,8 @@ msgstr "Вы отклонили обновление до новой версии Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Вы можете обновить систему позже, открыв Менеджер обновлений и нажав " @@ -2318,58 +2340,58 @@ msgid "Show and install available updates" msgstr "Показать и установить доступные обновления" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Показать версию и выйти" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Каталог, который содержит файлы данных" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Проверить, доступен ли новый выпуск дистрибутива Ubuntu" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "Проверка возможности обновления до последней нестабильной версии дистрибутива" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "Обновление с использованием последней версии Менеджера обновлений" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Не выбирать карту при запуске" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Попробовать запустить dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Не проверять обновления при запуске" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Протестировать обновление в безопасном режиме" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Идёт частичное обновление" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Показать описание пакета вместо журнала изменений" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Попробуйте обновиться до самого последнего выпуска с помощью $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2379,11 +2401,11 @@ "В настоящее время поддерживается регулярное обновление для настольных и " "серверных систем." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Запустить указанный интерфейс" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2391,11 +2413,11 @@ "Проверять наличие новой версии дистрибутива и возвращать результат с помощью " "кода выхода" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Проверка наличия нового релиза Ubuntu" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2403,71 +2425,71 @@ "Для получения информации об обновлении посетите:\n" "%(url)\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Новая версия не обнаружена" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Доступна новая версия «%s»." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Чтобы обновиться до него, выполните «do-release-upgrade»." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Доступно обновление Ubuntu %(version)s" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Вы отклонили обновление до Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Добавить результаты отладки" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Показать неподдерживаемые пакеты, установленные на данном компьютере" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Показать поддерживаемые пакеты, установленные на данный компьютер" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Показать все пакеты и их состояние" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Показать все пакеты в виде списка" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Сводка состояния поддержки «%s»:" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" "Обнаружено %(num)s пакетов (%(percent).1f%%), поддерживаемых до %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "Обнаружено %(num)s пакетов (%(percent).1f%%), которые недоступны" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" "Здесь установлено %(num)s пакетов (%(percent).1f%%), которые не " "поддерживаются" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2475,54 +2497,71 @@ "Выполните с использованием --show-unsupported, --show-supported или --show-" "all для просмотра подробных сведений" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Недоступны:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Не поддерживаются: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Поддерживаются до %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Не поддерживаются" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Невыполненный метод: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Файл на диске" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb пакет" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Установить отсутствующий пакет." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Необходимо установить пакет %s." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb пакет" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s должен быть помечен как установленный вручную." +msgid "%i obsolete entries in the status file" +msgstr "Устарелое содержимое %i в файле статуса" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "Устарелое содержимое в статусе dpkg" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "Устарелое содержимое статусов dpkg" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2531,67 +2570,79 @@ "dev. Это ошибка, о которой можно прочитать здесь - bugs.launchpad.net, bug " "#279621" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "Устарелое содержимое %i в файле статуса" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "Устарелое содержимое в статусе dpkg" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "Устарелое содержимое статусов dpkg" +msgid "%s needs to be marked as manually installed." +msgstr "%s должен быть помечен как установленный вручную." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "Удалите lilo, если grub уже установлен. (bug #314004 для деталей)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "После обновления сведений о пакетах, основной пакет '%s' не может быть " -#~ "найден. Выполняется запуск системы сообщения о неполадке." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Обновление Ubuntu до версии 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s обновление выбрано." -#~ msgstr[1] "%(count)s обновлений выбрано." -#~ msgstr[2] "%(count)s обновлений выбрано." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Добро пожаловать в Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Эти обновления программ были опубликованы, начиная с выпуска текущей " -#~ "версии Ubuntu." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Доступны обновления программ для этого компьютера." - -#~ msgid "Update Manager" -#~ msgstr "Менеджер обновлений" - -#~ msgid "Starting Update Manager" -#~ msgstr "Запуск Менеджера обновлений" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Вы подключены через беспроводной модем." - -#~ msgid "_Install Updates" -#~ msgstr "_Установить обновления" +#~ "После обновления сведений о пакетах, основной пакет '%s' не может быть " +#~ "найден. Выполняется запуск системы сообщения о неполадке." #~ msgid "Checking for a new ubuntu release" #~ msgstr "Проверка наличия новой версии Ubuntu" @@ -2658,6 +2709,9 @@ #~ "может быть ограниченной, а также может привести к возникновению " #~ "неисправностей. Вы действительно хотите продолжить обновление?" +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Обновление Ubuntu до версии 11.10" + #~ msgid "Your graphics hardware may not be fully supported in Ubuntu 11.04." #~ msgstr "" #~ "Ваше графическое оборудование может не полностью поддерживаться в Ubuntu " diff -Nru update-manager-17.10.11/po/rw.po update-manager-0.156.14.15/po/rw.po --- update-manager-17.10.11/po/rw.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/rw.po 2017-12-23 05:00:38.000000000 +0000 @@ -11,11 +11,12 @@ # Augustin KIBERWA , 2005. # Donatien NSENGIYUMVA , 2005.. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2010-03-09 05:37+0000\n" "Last-Translator: Launchpad Translations Administrators \n" "Language-Team: Kinyarwanda \n" @@ -28,7 +29,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -36,13 +37,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "" @@ -50,30 +51,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -83,13 +84,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -104,22 +105,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -132,65 +133,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -199,25 +200,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -226,11 +227,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -241,11 +242,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -253,7 +254,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -262,29 +263,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -294,28 +295,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -323,11 +324,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -339,16 +340,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -361,11 +362,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -374,34 +375,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -414,23 +415,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -441,32 +442,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -474,33 +475,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -511,26 +512,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -538,37 +539,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -576,79 +577,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -656,16 +657,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -674,7 +675,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -683,11 +684,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -695,11 +696,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -707,11 +708,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -721,71 +722,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -795,27 +796,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -825,7 +826,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -834,26 +835,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -861,147 +862,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1009,32 +1010,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1050,7 +1051,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1064,14 +1065,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1079,34 +1080,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1119,28 +1118,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1148,145 +1147,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1294,73 +1293,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1418,7 +1417,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1437,133 +1436,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1571,31 +1578,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1604,34 +1618,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1639,29 +1661,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1670,7 +1692,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1678,58 +1700,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1739,22 +1771,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1768,26 +1796,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1796,7 +1824,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1805,7 +1833,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1814,47 +1842,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1915,56 +1937,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Ibihuzagihe bya porogaramumudasobwa" +msgid "Update Manager" +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Ibihuzagihe bya porogaramumudasobwa" +msgid "Starting Update Manager" +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Amahinduka" +msgid "updates" +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Isobanuramiterere" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." -msgstr "" +msgid "Changes" +msgstr "Amahinduka" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "" +msgid "Description" +msgstr "Isobanuramiterere" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1989,7 +2012,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -2001,216 +2024,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/sco.po update-manager-0.156.14.15/po/sco.po --- update-manager-17.10.11/po/sco.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/sco.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2009. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-10-14 04:00+0000\n" "Last-Translator: dava4444 \n" "Language-Team: Scots \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Server for %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Main server" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Custom servers" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Couldna calculate sources.list entry" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Unable tae find ony package files, perhaps this isnae a Ubuntu Disc or the " "wrang architecture?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Failed tae add the CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,12 +83,12 @@ "The error message wus:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Remove package in bad state" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -106,15 +107,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "The server mey be overloaded" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Browkn Packages" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -123,7 +124,7 @@ "Please fix 'em first using synaptic or apt-get afore gan on." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -144,26 +145,26 @@ " * Unofficial software packages no provided by Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "This is mæ'st likely tae be a transient problem, try it again later." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Couldnae calculate the upgrade" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Error authenticatin some o the packages" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -173,40 +174,40 @@ "transient network problem. Ye might want tae try it again later. See below " "fur a list o unauthenticated packages." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" "The packæ'ge '%s' is marked fur removal but it's in the removal blacklist." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -215,25 +216,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -242,11 +243,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Continue runnin uner SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -257,11 +258,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Starting additional sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -269,7 +270,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -278,29 +279,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Cannae upgrade" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Sanbox setup failed" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "It wisnae possible tae create the sandbox environment." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Sandbox mode" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -310,28 +311,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Package 'debsig-verify' is installed" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -339,11 +340,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Include latest updates fae the Internet?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -355,16 +356,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "disabled on upgrade tae %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Nae valid mirror fun" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -377,11 +378,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Generate default sources?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -390,21 +391,21 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Repository information invalid" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Third party sources disabled" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -414,13 +415,13 @@ "them after the upgrade wae the 'software-properies' tool or yer package " "manager." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Package in jiggert state" msgstr[1] "Packages in jiggert state" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -433,23 +434,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -460,32 +461,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -493,33 +494,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -530,26 +531,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -557,37 +558,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -595,79 +596,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -675,16 +676,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -693,7 +694,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -702,11 +703,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -714,11 +715,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -726,11 +727,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -740,71 +741,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -814,27 +815,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -844,7 +845,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -853,26 +854,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -880,147 +881,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1028,32 +1029,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1069,7 +1070,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1083,14 +1084,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1098,34 +1099,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1138,28 +1137,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1167,145 +1166,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1313,73 +1312,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1437,7 +1436,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1456,133 +1455,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1590,31 +1597,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1623,34 +1637,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1658,29 +1680,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1689,7 +1711,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1697,58 +1719,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1758,22 +1790,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1787,26 +1815,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1815,7 +1843,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1824,7 +1852,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1833,47 +1861,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1934,54 +1956,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -2006,7 +2031,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -2018,216 +2043,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/sc.po update-manager-0.156.14.15/po/sc.po --- update-manager-17.10.11/po/sc.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/sc.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2009. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2010-09-06 03:55+0000\n" "Last-Translator: Borealis \n" "Language-Team: Sardinian \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MiB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Server pro %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Server printzipale" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Server personalitzados" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Impossibile agatare files de pachetes. Forsis custu no est unu discu de " "Ubuntu, o est pro una architetura diferente." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Annanta de su CD no arrenèschida." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -77,13 +78,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -98,22 +99,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -126,65 +127,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -193,25 +194,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -220,11 +221,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -235,11 +236,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -247,7 +248,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -256,29 +257,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -288,28 +289,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -317,11 +318,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -333,16 +334,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -355,11 +356,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -368,34 +369,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -408,23 +409,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -435,32 +436,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -468,33 +469,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -505,26 +506,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -532,37 +533,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -570,79 +571,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -650,16 +651,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -668,7 +669,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -677,11 +678,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -689,11 +690,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -701,11 +702,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -715,71 +716,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -789,27 +790,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -819,7 +820,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -828,26 +829,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -855,147 +856,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1003,32 +1004,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1044,7 +1045,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1058,14 +1059,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1073,34 +1074,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1113,28 +1112,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1142,145 +1141,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1288,73 +1287,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1412,7 +1411,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1431,133 +1430,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1565,31 +1572,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1598,34 +1612,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1633,29 +1655,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1664,7 +1686,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1672,58 +1694,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1733,22 +1765,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1762,26 +1790,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1790,7 +1818,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1799,7 +1827,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1808,47 +1836,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1909,54 +1931,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1981,7 +2006,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1993,216 +2018,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/sd.po update-manager-0.156.14.15/po/sd.po --- update-manager-17.10.11/po/sd.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/sd.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2011. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-02-02 10:07+0000\n" "Last-Translator: Abdul-Rahim Nizamani \n" "Language-Team: Sindhi \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "" @@ -42,30 +43,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "سي ڊي شامل ڪرڻ ۾ ناڪامي" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -75,13 +76,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -96,22 +97,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -124,65 +125,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -191,25 +192,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -218,11 +219,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -233,11 +234,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -245,7 +246,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -254,29 +255,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -286,28 +287,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -315,11 +316,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -331,16 +332,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -353,11 +354,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -366,34 +367,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -406,23 +407,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -433,32 +434,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -466,33 +467,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -503,26 +504,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -530,37 +531,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -568,79 +569,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -648,16 +649,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -666,7 +667,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -675,11 +676,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -687,11 +688,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -699,11 +700,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -713,71 +714,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -787,27 +788,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -817,7 +818,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -826,26 +827,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -853,147 +854,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1001,32 +1002,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1042,7 +1043,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1056,14 +1057,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1071,34 +1072,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1111,28 +1110,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1140,145 +1139,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1286,73 +1285,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1410,7 +1409,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1429,133 +1428,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1563,31 +1570,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1596,34 +1610,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1631,29 +1653,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1662,7 +1684,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1670,58 +1692,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1731,22 +1763,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1760,26 +1788,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1788,7 +1816,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1797,7 +1825,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1806,47 +1834,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1907,54 +1929,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1979,7 +2004,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1991,216 +2016,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/shn.po update-manager-0.156.14.15/po/shn.po --- update-manager-17.10.11/po/shn.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/shn.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2012. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-01-18 13:03+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Shan \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "" @@ -42,30 +43,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -75,13 +76,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -96,22 +97,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -124,65 +125,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -191,25 +192,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -218,11 +219,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -233,11 +234,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -245,7 +246,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -254,29 +255,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -286,28 +287,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -315,11 +316,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -331,16 +332,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -353,11 +354,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -366,34 +367,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -406,23 +407,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -433,32 +434,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -466,33 +467,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -503,26 +504,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -530,37 +531,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -568,79 +569,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -648,16 +649,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -666,7 +667,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -675,11 +676,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -687,11 +688,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -699,11 +700,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -713,71 +714,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -787,27 +788,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -817,7 +818,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -826,26 +827,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -853,147 +854,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1001,32 +1002,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1042,7 +1043,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1056,14 +1057,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1071,34 +1072,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1111,28 +1110,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1140,145 +1139,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1286,73 +1285,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1410,7 +1409,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1429,133 +1428,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1563,31 +1570,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1596,34 +1610,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1631,29 +1653,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1662,7 +1684,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1670,58 +1692,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1731,22 +1763,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1760,26 +1788,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1788,7 +1816,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1797,7 +1825,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1806,47 +1834,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1907,54 +1929,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1979,7 +2004,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1991,216 +2016,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/si.po update-manager-0.156.14.15/po/si.po --- update-manager-17.10.11/po/si.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/si.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2008. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-02-23 20:03+0000\n" "Last-Translator: පසිඳු කාවින්ද \n" "Language-Team: Sinhalese \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s සඳහා සර්වරය" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "ප්‍රධාන සර්වරය" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "ව්‍යවහාර සර්වරයන්" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "sources.list ඇතුලු කිරීම ගණනය කළනොහැක." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -64,11 +65,11 @@ "උබුන්ටු වල සංගත තැටිය නොවන්නට ඇති එසේ නොමැති නම් මේ මෘදුකාංගය ඔබේ පරිගණක පද්ධතියට " "නොගැලපෙන එකක් විය හැක." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "සුසංහිත තැටිය එක් කිරීම අසාර්ථක වුණි" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -78,13 +79,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -99,22 +100,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "සමහරවිට සර්වරය අතිබැර වී ඇත" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "බිදුණු පැකේජ" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -127,65 +128,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "උසස් කෙරුම ගණනය කල නොහැක" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "'%s' ස්ථාපනය කල නොහැක" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -194,25 +195,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "ගබඩාව කියවමින්" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -221,11 +222,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -236,11 +237,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -248,7 +249,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -257,29 +258,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "උසස් කල නොහැක" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "වැලිපිල්ල සැකසීම අසාර්ථකයි" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "වැලිපිල්ල ක්‍රමය" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -289,28 +290,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -318,11 +319,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -334,16 +335,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -356,11 +357,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -369,34 +370,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -409,23 +410,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -436,32 +437,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -469,33 +470,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -506,26 +507,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -533,37 +534,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -571,79 +572,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -651,16 +652,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -669,7 +670,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -678,11 +679,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -690,11 +691,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -702,11 +703,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -716,71 +717,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -790,27 +791,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -820,7 +821,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -829,26 +830,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -856,147 +857,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1004,32 +1005,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1045,7 +1046,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1059,14 +1060,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1074,34 +1075,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1114,28 +1113,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1143,145 +1142,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1289,73 +1288,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1413,7 +1412,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1432,133 +1431,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1566,31 +1573,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1599,34 +1613,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1634,29 +1656,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1665,7 +1687,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1673,58 +1695,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1734,22 +1766,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1763,26 +1791,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1791,7 +1819,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1800,7 +1828,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1809,47 +1837,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1910,54 +1932,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1982,7 +2007,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1994,216 +2019,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/sk.po update-manager-0.156.14.15/po/sk.po --- update-manager-17.10.11/po/sk.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/sk.po 2017-12-23 05:00:38.000000000 +0000 @@ -7,11 +7,12 @@ # Jozef Bucha , 2007. # Ivan Masár , 2009. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: sk\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-04-04 21:02+0000\n" "Last-Translator: Pavol Klačanský \n" "Language-Team: \n" @@ -24,7 +25,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -33,13 +34,13 @@ msgstr[2] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Server pre %s" @@ -47,20 +48,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Hlavný server" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Vlastné servery" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Nemožno vypočítať položku v sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -68,11 +69,11 @@ "Nemožno lokalizovať žiadne balíčky súborov. Pravdepodobne toto nie je CD/DVD " "Ubuntu alebo je určené pre inú architektúru." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Zlyhalo pridanie CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -87,14 +88,14 @@ "Chybová správa bola:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Odstrániť balíky v zlom stave" msgstr[1] "Odstrániť balík v zlom stave" msgstr[2] "Odstrániť balíky v zlom stave" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -119,15 +120,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Server môže byť preťažený" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Poškodené balíky" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -136,7 +137,7 @@ "opravené. Pred pokračovaním ich opravte programom synaptic alebo apt-get." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -157,11 +158,11 @@ "* používate neoficiálne balíky softvéru, ktoré neposkytuje tím Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Toto je pravdepodobne dočasný problém, prosím skúste to neskôr." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -169,16 +170,16 @@ "Ak nič z tohto nie je relevantné, prosím, pošlite toto hlásenie o chybe " "príkazom „ubuntu-bug update-manager“ v termináli." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Nepodarilo sa vypočítať aktualizáciu" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Chyba pri overovaní niektorých balíkov" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -188,7 +189,7 @@ "sieťou. Môžete to opäť skúsiť neskôr. Nižšie je uvedený zoznam neoverených " "balíkov." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -196,22 +197,22 @@ "Balík „%s“ je označený na odstránenie ale nachádza sa na zozname balíkov, " "ktoré sa nemajú odstraňovať." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Nevyhnutný balík „%s“ je označený na odstránenie." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Pokus o nainštalovanie verzie „%s“ z čiernej listiny" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Nie je možné nainštalovať „%s“" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -220,11 +221,11 @@ "príkazom „ubuntu-bug update-manager“ v termináli." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Nie je možné odhadnúť meta-balík" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -238,15 +239,15 @@ " Prosím, než budete pokračovať, najprv nainštalujte jeden z vyššie uvedených " "balíkov pomocou Synaptic alebo apt-get." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Číta sa vyrovnávacia pamäť" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Nepodarilo sa uzamknúť databázu softvéru" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -254,11 +255,11 @@ "Zvyčajne to znamená, že je už spustená iná aplikácia na správu balíkov (ako " "apt-get alebo aptitude). Prosím, najskôr ukončite danú aplikáciu." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Aktualizácia prostredníctvom vzdialeného pripojenia nie je podporovaná" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -272,11 +273,11 @@ "\n" "Táto aktualizácia sa teraz preruší. Prosím, skúste to bez použitia ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Pokračovať v spojení cez SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -292,11 +293,11 @@ "Ak chcete pokračovať, na porte „%s“ sa spustí ďalší ssh démon.\n" "Chcete pokračovať?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Štartuje sa ďalší sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -307,7 +308,7 @@ "porte „%s“. Ak nastane problém s momentálne bežiacim ssh môžete sa stále " "pripojiť k tomuto ďalšiemu.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -320,29 +321,29 @@ "môžete otvoriť napr. pomocou:\n" "„%s“" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Nie je možné vykonať prechod na novšiu verziu" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Tento nástroj nepodporuje aktualizáciu z '%s' na '%s'." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Zlyhalo vytvorenie pieskoviska" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Nebolo možné vytvoriť prostredie pieskoviska." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Režim pieskoviska" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -357,18 +358,18 @@ "*Žiadne* zmeny zapísané do systémového adresára odteraz do najbližšieho " "reštartu sa nezachovajú." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Vaša inštalácia Pythonu je pokazená. Prosím, opravte symbolický odkaz „/usr/" "bin/python“." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Balík 'debsig-verify' je nainštalovaný" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -378,12 +379,12 @@ "Najprv ho, prosím, odstránte pomocou programu synaptic alebo 'apt-get remove " "debsig-verify' a spustite aktualizáciu znovu." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Nie je možné zapisovať do „%s“" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -394,11 +395,11 @@ "Aktualizácia nemôže pokračovať.\n" "Prosím, uistite sa, že sa do systémového adresára dá zapisovať." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Použiť najnovšie aktualizácie z internetu?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -418,16 +419,16 @@ "najnovšie aktualizácie čo najskôr po aktualizácii systému.\n" "Ak na túto možnosť odpoviete „Nie“, sieť nebude vôbec použitá." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "vypnuté pri aktualizácii na %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Nebol nájdený vhodný server" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -447,11 +448,11 @@ "Ak zvolíte „Nie“, aktualizácia sa preruší." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Vytvoriť štandardný zoznam zdrojov softvéru?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -465,11 +466,11 @@ "Majú sa pridať štandardné záznamy pre „%s“? Ak zvolíte „Nie“, aktualizácia " "sa preruší." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Neplatná informácia o zdrojoch softvéru" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -477,11 +478,11 @@ "Aktualizácia informácií zdroja softvéru spôsobila neplatný súbor, preto sa " "spúšťa proces hlásenia chyby ." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Zdroje tretích strán sú zakázané" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -491,14 +492,14 @@ "prechode na novšiu verziu ich môžete znova zapnúť nástrojom 'software-" "properties' vášho správcu balíkov." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Balíky sú v nekonzistentnom stave" msgstr[1] "Balík je v nekonzistentnom stave" msgstr[2] "Balíky sú v nekonzistentnom stave" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -521,11 +522,11 @@ "neboli pre ne nájdené žiadne archívy. Prosím, preinštalujte balíky ručne " "alebo ich odstráňte zo systému." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Chyba počas aktualizácie" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -534,13 +535,13 @@ "sieťového pripojenia, skontrolujte prosím sieťové pripojenie a skúste to " "znova." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Nedostatok voľného miesta na disku" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -555,21 +556,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Počítajú sa zmeny" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Chcete začať s aktualizáciou?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Aktualizácia zrušená" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -577,12 +578,12 @@ "Aktualizácia sa teraz preruší a obnoví sa pôvodný stav systému. V " "aktualizácii môžete neskôr pokračovať." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Nebolo možné stiahnuť aktualizácie" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -593,27 +594,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Chyba počas potvrdzovania" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Obnovuje sa pôvodný stav systému" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Nebolo možné nainštalovať aktualizácie" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -621,7 +622,7 @@ "Aktualizácia bola prerušená. Váš systém sa môže nachádzať v nepoužiteľnom " "stave. Teraz sa spustí pokus o obnovenie (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -638,7 +639,7 @@ "hláseniu súbory v /var/log/dist-upgrade/.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -646,20 +647,20 @@ "Aktualizácia bola prerušená. Prosím, skontrolujte svoje pripojenie k " "internetu alebo inštalačné médium a skúste to znova. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Odstrániť zastarané balíky?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Ponechať" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Odstrániť" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -669,27 +670,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Požadované závislosti nie sú nainštalované" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Požadovaná závislosť '%s' nie je nainštalovaná. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Kontroluje sa správca balíkov" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Príprava prechodu na vyššiu verziu zlyhala" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -697,11 +698,11 @@ "Príprava systému na aktualizáciu zlyhala, preto sa spúšťa proces hlásenia " "chyby ." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Zisťovanie predpokladov aktualizácie zlyhalo" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -713,68 +714,68 @@ "\n" "Okrem toho sa spúšťa proces hlásenia chyby ." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Aktualizujú sa informácie o zdrojoch softvéru" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Nepodarilo sa pridať CD-ROM" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Ľutujeme, pridanie CD-ROM neprebehlo úspešne" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Neplatná informácia o balíku" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Sťahuje sa" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Prebieha prechod na novšiu verziu" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Aktualizácia dokončená" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "Aktualizácia bola dokončená, ale počas nej sa vyskytli chyby." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Vyhľadávanie zastaraného softvéru" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Aktualizácia systému je dokončená." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Čiastočná aktualizácia je dokončená." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "používa sa evms" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -784,11 +785,11 @@ "ďalej nie je podporovaný. Vypnite ho prosím a následne znova spustite " "aktualizáciu." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "Ubuntu 12.04 LTS nemusí plne podporovať váš grafický hardvér." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -800,9 +801,9 @@ "https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx Chcete pokračovať " "v aktualizácii?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -810,8 +811,8 @@ "Aktualizácia systému môže vypnúť niektoré efekty prostredia a znížiť výkon " "hier a iných graficky náročných programov." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -825,7 +826,7 @@ "\n" "Chcete pokračovať?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -839,11 +840,11 @@ "\n" "Chcete pokračovať?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "CPU nie je i686" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -854,11 +855,11 @@ "vytvorené a optimalizované pre procesory i686 alebo vyššie. Nie je možné " "nainštalovať nové vydanie Ubuntu na tento hardvér." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Neobsahuje procesor ARMv6" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -870,11 +871,11 @@ "architektúru ARMv6 alebo lepšiu. Na tomto hardvéri nie je možné aktualizovať " "váš systém na nové vydanie Ubuntu." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Nie je dostupný žiaden init" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -889,15 +890,15 @@ "\n" "Ste si istý, že chcete pokračovať?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Aktualizácia v pieskovisku pomocou aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Použiť zadanú cestu na hľadanie CD s aktualizačnými balíkami" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -905,57 +906,57 @@ "Použiť frontend. Momentálne dostupné: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*ZAVRHOVANÉ* táto voľba bude ignorovaná" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "Vykonať iba čiastočnú aktualizáciu (bez prepísania sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Vypnúť podporu GNU screen" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Nastaviť dátový priečinok" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Prosím, vložte „%s“ do mechaniky „%s“" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Sťahovanie je dokončené" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Získava sa súbor %li z %li rýchlosťou %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Zostáva približne %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Sťahuje sa súbor %li z %li" @@ -965,27 +966,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Aplikujú sa zmeny" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "problém so závislosťami - ponecháva sa nenakonfigurované" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Nebolo možné nainštalovať „%s“" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -997,7 +998,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1008,7 +1009,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1016,20 +1017,20 @@ "Ak si vyberiete nahradiť novšou verziou, stratíte všetky zmeny, ktoré ste " "spravili v tejto konfigurácii." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Príkaz „diff“ nebol nájdený." -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Vyskytla sa nenapraviteľná chyba" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1042,13 +1043,13 @@ "Váš pôvodný súbor sources.list bol uložený ako /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Stlačené Ctrl-c" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1057,136 +1058,136 @@ "si istý, že to chcete?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Aby ste zamedzili strate údajov, zatvorte všetky otvorené aplikácie a " "dokumenty." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Tento balík už Canonical nepodporuje (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Znížiť verziu (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Odstrániť (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Už nie je potrebné (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Nainštalovať (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Aktualizovať (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Výmena nosiča" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Zobraziť rozdiel >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Skryť rozdiel" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Chyba" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Zrušiť" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Zavrieť" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Zobraziť Terminál >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Skryť Terminál" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Informácie" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Podrobnosti" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Už nie je podporované %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Odstrániť %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Odstrániť (bol nainštalovaný automaticky) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Inštalovať %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Aktualizovať %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Je potrebný reštart" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Pre dokončenie aktualizácie reštartujte počítač" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Reštartovať teraz" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1198,11 +1199,11 @@ "Ak zrušíte prebiehajúcu aktualizáciu, môže to ponechať systém v " "nepoužiteľnom stave. Dôrazne sa odporúča pokračovať v aktualizácii systému." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Zrušiť prechod na novšiu verziu?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" @@ -1210,7 +1211,7 @@ msgstr[1] "deň" msgstr[2] "%li dni" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" @@ -1218,7 +1219,7 @@ msgstr[1] "hodina" msgstr[2] "%li hodiny" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" @@ -1226,7 +1227,7 @@ msgstr[1] "minúta" msgstr[2] "%li minúty" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1243,7 +1244,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s, %(str_hours)s" @@ -1257,14 +1258,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1273,34 +1274,32 @@ "Sťahovanie potrvá asi %s na 1Mbit DSL pripojení a asi %s na 56k modeme." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Sťahovanie s vaším pripojením bude trvať asi %s. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Prebieha príprava aktualizácie" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Získavajú sa softvérové kanály" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Prijímajú sa nové balíky" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Inštalujú sa aktualizácie" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Prebieha čistenie" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1320,7 +1319,7 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." @@ -1328,7 +1327,7 @@ msgstr[1] "Bude odstránený %d balík." msgstr[2] "Budú odstránené %d balíky." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." @@ -1336,7 +1335,7 @@ msgstr[1] "Bude nainštalovaný %d nový balík." msgstr[2] "Budú nainštalované %d nové balíky." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." @@ -1344,7 +1343,7 @@ msgstr[1] "Bude aktualizovaný %d balík." msgstr[2] "Budú aktualizované %d balíky." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1355,7 +1354,7 @@ "\n" "Musíte stiahnuť celkom %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1363,7 +1362,7 @@ "Inštalácia aktualizácie môže trvať niekoľko hodín. Po dokončení sťahovania " "nebude možné proces zrušiť." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1371,16 +1370,16 @@ "Sťahovanie a inštalácia aktualizácií môže trvať niekoľko hodín. Po skončení " "sťahovania nie je možné proces zrušiť." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "odstraňovanie balíkov môže trvať niekoľko hodín. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Softvér na tomto počítači je aktuálny." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1388,38 +1387,38 @@ "Pre váš systém nie sú dostupné žiadne aktualizácie. Proces aktualizácie bude " "zrušený." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Je potrebný reštart" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Bola dokončená aktualizácia a je potrebné reštartovať počítač. Chcete " "vykonať reštart teraz?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "overenie „%(file)s“ voči „%(signature)s“ " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "extrahuje sa „%s“" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Nebolo možné spustiť aktualizačný program" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1427,34 +1426,34 @@ "Toto je pravdepodobne chyba v nástroji na aktualizáciu. Prosím, nahláste to " "ako chybu príkazom „ubuntu-bug update-manager“." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Podpis aktualizačného programu" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Aktualizačný nástroj" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Zlyhalo získavanie" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "Zlyhalo získavanie aktualizácie. Môže to byť spôsobené sieťovým problémom. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Overenie totožnosti zlyhalo" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1462,13 +1461,13 @@ "Zlyhalo overenie pravosti aktualizácie. Môže to byť spôsobené sieťovým " "problémom alebo nedostupnosťou servera. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Chyba pri rozbaľovaní" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1476,13 +1475,13 @@ "Nebolo možné rozbaliť aktualizáciu. Môže to byť spôsobené sieťovým problémom " "alebo nedostupnosťou servera. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Overenie zlyhalo" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1490,15 +1489,15 @@ "Zlyhalo overenie aktualizácie. Mohol to spôsobiť problém siete alebo " "servera. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Nie je možné spustiť aktualizáciu systému" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1506,13 +1505,13 @@ "To zvyčajne spôsobuje systém, kde je /tmp pripojený s príznakom noexec. " "Prosím, znova ho pripojte bez príznaku noexec a znova spustite aktualizáciu." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Chybová správa je '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1525,73 +1524,73 @@ "Váš pôvodný súbor sources.list bol uložený ako /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Ruší sa" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Znížená verzia:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Prosím, pokračujte stlačením [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Pokračovať [aN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Podrobnosti [p]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "a" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "p" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Už nie je podporované: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Odstrániť: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Inštalovať: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Aktualizovať: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Pokračovať [An] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1658,9 +1657,8 @@ msgstr "Prechod na vyššiu verziu distribúcie" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Aktualizácia Ubuntu na verziu 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Aktualizuje sa Ubuntu na verziu 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1678,84 +1676,85 @@ msgid "Terminal" msgstr "Terminál" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Čakajte prosím, toto môže chvíľu trvať." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Aktualizácia je dokončená" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Nebolo možné nájsť poznámky k vydaniu" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Server môže byť preťažený. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Nebolo možné stiahnuť poznámky k vydaniu" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Skontrolujte si internetové pripojenie." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Aktualizovať" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Poznámky k vydaniu" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Sťahujú sa ďalšie balíky..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Súbor %s z %s, %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Súbor %s z %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Otvoriť odkaz v prehliadači" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Skopírovať odkaz do schránky" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Sťahuje sa súbor %(current)li z %(total)li s %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Sťahuje sa súbor %(current)li z %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Vaše vydanie Ubuntu už nie je podporované." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1763,53 +1762,60 @@ "Nebudete dostávať žiadne ďalšie bezpečnostné opravy ani dôležité " "aktualizácie. Prosím, aktualizujte na novšiu verziu Ubuntu." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Informácie o prechode na novšiu verziu" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Nainštalovať" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Názov" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Verzia %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Nebolo nájdené žiadne pripojenie k sieti, preto nie je možné stiahnuť záznam " "zmien." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Sťahuje sa zoznam zmien..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Zrušiť výber všetkých" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Vybrať _všetky" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "Bolo vybraných %(count)s aktualizácií." +msgstr[1] "Bola vybraná %(count)s aktualizácia." +msgstr[2] "Boli vybrané %(count)s aktualizácie." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s sa stiahne." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "Aktualizácie už boli stiahnuté, ale nie nainštalované." msgstr[1] "Aktualizácia už boli stiahnutá, ale nie nainštalovaná." msgstr[2] "Aktualizácie už boli stiahnuté, ale nie nainštalované." @@ -1818,11 +1824,18 @@ msgid "There are no updates to install." msgstr "Nie sú dostupné žiadne aktualizácie na inštaláciu." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Neznáma veľkosť na stiahnutie." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1830,7 +1843,7 @@ "Nie je známe, kedy boli informácie balíka naposledy aktualizované. Prosím, " "aktualizujte informácie kliknutím na tlačidlo „Skontrolovať“." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1840,7 +1853,7 @@ "Nové aktualizácie môžete skontrolovať teraz stlačením tlačidla " "„Skontrolovať“." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1851,7 +1864,7 @@ msgstr[2] "" "Informácie o balíkoch boli naposledy aktualizované pred %(days_ago)s dňami." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1867,34 +1880,45 @@ "hodinami." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Informácie balíka naposledy aktualizované pred %s minútami." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Informácie balíka boli práve aktualizované." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Softvérové aktualizácie opravujú chyby, odstraňujú bezpečnostné " +"zraniteľnosti alebo poskytujú nové vlastnosti." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Pre váš počítač môžu byť dostupné aktualizácie softvéru." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Vitajte v Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Tieto aktualizácie softvéru boli vydané od vydania tejto verzie Ubuntu." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Pre tento počítač sú k dispozícii aktualizácie softvéru." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1905,7 +1929,7 @@ "aspoň ďalších %s miesta na disku „%s“. Vyprázdnite odpadkový kôš a odstráňte " "dočasné balíky z predošlých aktualizácií príkazom „sudo apt-get clean“." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1913,25 +1937,25 @@ "Je potrebné reštartovať počítač aby sa dokončila inštalácia aktualizácií. " "Prosím, uložte svoju prácu než budete pokračovať." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Načítavajú sa informácie o balíku" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Pripája sa..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Je možné, že nebudete môcť kontrolovať aktualizácie alebo sťahovať nové " "aktualizácie." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Nebolo možné inicializovať informácie o balíku" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1944,7 +1968,7 @@ "Prosím, nahláste to ako problém voči balíku „update-manager“ a priložte " "nasledovnú chybovú správu:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1956,31 +1980,31 @@ "Prosím, nahláste to ako problém voči balíku „update-manager“ a priložte " "nasledovnú chybovú správu:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Nová inštalácia)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Veľkosť: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Z verzie %(old_version)s na verziu %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Verzia %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Aktualizácia vydania nie je práve teraz možná" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1989,21 +2013,21 @@ "Aktualizáciu vydania momentálne nie je možné vykonať. Prosím, skúste to " "znova neskôr. Server oznámil „%s“" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Sťahuje sa nástroj na prechod na vyššiu verziu distribúcie." -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Je dostupné nové vydanie Ubuntu „%s“" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Index softvéru je poškodený" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -2013,6 +2037,17 @@ "Na odstránenie tohto problému použite správcu balíkov „Synaptic“ alebo " "spustite „sudo apt-get install -f“ v termináli." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Je dostupné nové vydanie „%s“." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Zrušiť" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Skontrolovať aktualizácie" @@ -2022,22 +2057,18 @@ msgstr "Nainštalovať všetky dostupné aktualizácie" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Zrušiť" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Záznam zmien" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Aktualizácie" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Zostavuje sa zoznam aktualizácií" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2061,20 +2092,20 @@ "* neoficiálne balíky softvéru, ktoré neposkytol tím Ubuntu\n" "* bežné zmeny zatiaľ nevydanej novej verzie Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Sťahuje sa záznam zmien" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Ďalšie aktualizácie (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "Aktualizácia nepochádza zo zdroja, ktorý podporuje záznamy zmien." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2082,7 +2113,7 @@ "Nepodarilo sa stiahnuť zoznam zmien. \n" "Skontrolujte svoje pripojenie k internetu." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2095,7 +2126,7 @@ "Dostupná verzia: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2108,7 +2139,7 @@ "Použite prosím http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "kým nebude zoznam zmien dostupný alebo to skúste znova." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2121,52 +2152,43 @@ "Použite, prosím, http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "pokiaľ nebudú dostupné zmeny alebo to neskôr skúste znovu." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Zlyhalo zistenie distribúcie" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Chyba '%s' sa vyskytla počas kontroly systému, ktorý používate." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Dôležité bezpečnostné aktualizácie" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Odporúčané aktualizácie" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Navrhované aktualizácie" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backporty" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Aktualizácie distribúcie" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Ďalšie aktualizácie" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Spúšťa sa Správca aktualizácií" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Softvérové aktualizácie opravujú chyby, odstraňujú bezpečnostné " -"zraniteľnosti alebo poskytujú nové vlastnosti." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "Č_iastočná aktualizácia" @@ -2238,37 +2260,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Aktualizácie softvéru" +msgid "Update Manager" +msgstr "Správca aktualizácií" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Aktualizácie softvéru" +msgid "Starting Update Manager" +msgstr "Spúšťa sa Správca aktualizácií" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Aktualizovať" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "aktualizácie" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Nainštalovať" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Zmeny" +msgid "updates" +msgstr "aktualizácie" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Popis" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Popis aktualizácie" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2276,25 +2288,35 @@ "Ste pripojený prostredníctvom roamingu a je možné, že vám bude zaúčtované " "množstvo dát potrebných na túto aktualizáciu." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Ste pripojený pomocou bezdrôtového modemu." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Je bezpečnejšie pred aktualizáciou pripojiť počítač na napájanie z " "elektrickej siete." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Nainštalovať aktualizácie" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Zmeny" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "Nas_tavenia..." +msgid "Description" +msgstr "Popis" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Nainštalovať" +msgid "Description of update" +msgstr "Popis aktualizácie" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "Nas_tavenia..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2318,9 +2340,8 @@ msgstr "Odmietlu ste aktualizovať na novšiu verziu Ubuntu." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Môžete aktualizovať neskôr otvorením Správcu aktualizácií a kliknutím na " @@ -2334,59 +2355,59 @@ msgid "Show and install available updates" msgstr "Zobraziť a nainštalovať dostupné aktualizácie" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Zobraziť verziu a skončiť" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Adresár s dátovými súbormi" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Skontrolovať dostupnosť nového vydania Ubuntu" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Skontrolovať, či je možné aktualizovať na najnovšiu vývojársku verziu" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Aktualizovať pomocou poslednej navrhovanej verzie aktualizátora vydania" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Pri štarte nezameriavať vstup na mapu" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Skúste spustiť dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Nekontrolovať pri spustení aktualizácie" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Otestovať aktualizáciu v pieskovisku aufs" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Prebieha čiastočná aktualizácia" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Zobraziť popis balíka namiesto záznamu zmien" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Pokúste sa aktualizovať na poslednú verziu použitím aktualizátora z $distro-" "proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2396,11 +2417,11 @@ "Momentálne sú podporované normálne aktualizácie pracovnej stanice a " "serverových systémov." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Spustiť uvedený frontend." -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2408,11 +2429,11 @@ "Skontrolovať iba ak je dostupné nové vydanie distribúcie a oznámiť výsledok " "návratovou hodnotou" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Kontroluje sa dostupnosť nového vydania Ubuntu" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2420,68 +2441,68 @@ "Informácie o aktualizáciách nájdete na:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Žiadne nové vydanie nebolo nájdené" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Je dostupné nové vydanie „%s“." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Ak naň chcete aktualizovať systém, spustite „do-release-upgrade“." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Dostupná nová verzia Ubuntu %(version)s" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Odmietli ste aktualizovať na Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Pridať ladiaci výstup" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Zobraziť nepodporované balíky na tomto počítači" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Zobraziť podporované balíky na tomto počítači" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Zobraziť všetky balíky a ich stav" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Zobraziť všetky balíky v zozname" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Zhrnutie stavu podpory „%s“" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "Máte %(num)s balíkov (%(percent).1f%%) podporovaných do %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "Máte %(num)s balíkov (%(percent).1f%%), ktoré (už) nemožno stiahnuť" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "Máte %(num)s balíkov (%(percent).1f%%)m ktoré sú nepodporované" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2489,123 +2510,153 @@ "Ďalšie podrobnosti uvidíte po spustení s voľbami --show-unsupported, --show-" "supported alebo --show-all" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Už sa viac nedá stiahnuť:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Nepodporované: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Podporované do %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Nepodporované" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "neimplementovaná metóda: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Súbor na disku" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "balík .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Nainštalovať chýbajúci balík." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Balík %s by mal byť nainštalovaný." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "balík .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s je potrebné označiť ako manuálne nainštalovaný." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"Ak je počas aktualizácie nainštalovaný kdelibs4-dev je potrebné nainštalovať " -"kdelibs5-dev. Podrobnosti pozri v hlásení chyby #279621 na bugs.launchpad.net" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i zastaraných záznamov v stavovom súbore" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Zastarané položky v stave dpkg" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Zastarané stavové položky dpkg" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"Ak je počas aktualizácie nainštalovaný kdelibs4-dev je potrebné nainštalovať " +"kdelibs5-dev. Podrobnosti pozri v hlásení chyby #279621 na bugs.launchpad.net" + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s je potrebné označiť ako manuálne nainštalovaný." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Odstrániť lilo, pretože je nainštalovaný grub. (Podrovnosti v hlásení chyby " "#314004)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Po aktualizácii informácií o balíkoch už nie je možné nájsť nevyhnutný " -#~ "balík „%s“preto sa spúšťa proces hlásenia chyby ." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Aktualizuje sa Ubuntu na verziu 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "Bolo vybraných %(count)s aktualizácií." -#~ msgstr[1] "Bola vybraná %(count)s aktualizácia." -#~ msgstr[2] "Boli vybrané %(count)s aktualizácie." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Vitajte v Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Tieto aktualizácie softvéru boli vydané od vydania tejto verzie Ubuntu." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Pre tento počítač sú k dispozícii aktualizácie softvéru." - -#~ msgid "Update Manager" -#~ msgstr "Správca aktualizácií" - -#~ msgid "Starting Update Manager" -#~ msgstr "Spúšťa sa Správca aktualizácií" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Ste pripojený pomocou bezdrôtového modemu." - -#~ msgid "_Install Updates" -#~ msgstr "_Nainštalovať aktualizácie" +#~ "Po aktualizácii informácií o balíkoch už nie je možné nájsť nevyhnutný " +#~ "balík „%s“preto sa spúšťa proces hlásenia chyby ." #~ msgid "Checking for a new ubuntu release" #~ msgstr "Kontroluje sa, či existuje novšia verzia distribúcie Ubuntu" @@ -2724,6 +2775,9 @@ #~ "Prosím, nahláste to ako chybu príkazom „ubuntu-bug update-manager“ v " #~ "termináli." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Aktualizácia Ubuntu na verziu 11.10" + #~ msgid "Your graphics hardware may not be fully supported in Ubuntu 11.04." #~ msgstr "Ubuntu 11.04 nemusí plne podporovať váš grafický hardvér." diff -Nru update-manager-17.10.11/po/sl.po update-manager-0.156.14.15/po/sl.po --- update-manager-17.10.11/po/sl.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/sl.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-04-14 09:15+0000\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian \n" @@ -24,7 +25,7 @@ "X-Poedit-SourceCharset: utf-8\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -34,13 +35,13 @@ msgstr[3] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Strežnik za %s" @@ -48,20 +49,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Glavni strežnik" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Strežniki po meri" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Ni mogoče izračunati vnosa v sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -69,11 +70,11 @@ "Ni mogoče najti nobenih datotek s programskimi paketi. Morda vstavljen disk " "ni Ubuntujev ali pa ni namenjen arhitekturi vašega računalnika." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Nosilca CD ni mogoče dodati" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -89,7 +90,7 @@ "Sporočilo o napaki:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Odstrani pakete v slabem stanju" @@ -97,7 +98,7 @@ msgstr[2] "Odstrani paketa v slabem stanju" msgstr[3] "Odstrani pakete v slabem stanju" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -124,15 +125,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Strežnik je najverjetneje preobremenjen" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Okvarjeni paketi" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -142,7 +143,7 @@ "synaptic ali orodjem apt-get." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -163,11 +164,11 @@ " * neuradni programski paketi, ki jih distribucija ne podpira.\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Napaka je verjetno le začasna, zato poskusite znova kasneje." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -175,16 +176,16 @@ "V primeru da nič od tega ne velja, pošljite poročilo o hrošču z ukazom " "'ubuntu-bug update-manager' v terminalu." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Ni mogoče preračunati zahtev nadgradnje" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Napaka overjanja pristnosti nekaterih paketov" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -193,30 +194,30 @@ "Nekaterih paketov ni mogoče overiti. Napaka je lahko prehodne narave in bo " "kmalu odpravljena. Spodaj je izpisan seznam neoverjenih paketov." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" "Paket '%s' je označen za odstranitev, vendar je na črnem seznamu paketov." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" "Paket '%s', ki je pomemben za delovanje sistema, je označen za odstranitev." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Namešča se različica '%s', ki je na črnem seznamu" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Ni mogoče namestiti '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -225,11 +226,11 @@ "ukazom 'ubuntu-bug update-manager' v terminalu." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Ni mogoče določiti metapaketa" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -243,15 +244,15 @@ "Pred nadaljevanjem je treba s programom synaptic ali z ukazom apt-get " "namestiti enega izmed navedenih paketov." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Branje predpomnilnika" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Ni mogoče dobiti izključnega zaklepa" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -259,11 +260,11 @@ "To običajno pomeni, da je program, ki zahteva dostop do paketov, že zagnan " "(npr. apt-get ali aptitude). Pred nadaljevanjem je treba tak program končati." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Nadgradnja preko oddaljene povezave ni podprta" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -277,11 +278,11 @@ "\n" "Trenutna nadgradnja se bo zdaj preklicala. Poskusite brez ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Ali naj se nadaljuje izvajanje preko varnega SSH protokola?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -298,11 +299,11 @@ "ozadnji program ssh.\n" "Ali želite nadaljevati?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Zaganjanje dodatnega sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -313,7 +314,7 @@ "'%s'. V kolikor se pojavijo težave v delovanju dejavnega sshd, se bo še " "najprej mogoče povezati na dodaten ozadnji program.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -326,29 +327,29 @@ "odprete na primer z:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Ni mogoče nadgraditi" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Nadgradnja iz '%s' v '%s' s tem orodjem ni podprta." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Namestitev peskovnika je spodletela" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Ni mogoče ustvariti okolja peskovnika." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Način peskovnika" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -363,17 +364,17 @@ "*Nobene* spremembe zapisane v sistemsko mapo od zdaj do naslednjega " "ponovnega zagona ne bodo trajne." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Nameščeni python je okvarjen. Popravite simbolno povezavo '/usr/bin/python'." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Paket 'debsig-verify' je nameščen" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -383,12 +384,12 @@ "Odstranite paket s programom Synaptic ali z ukazom 'apt-get remove debsig-" "verify' in ponovno začnite z nadgradnjo." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Pisanje v '%s' ni mogoče" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -399,11 +400,11 @@ "more nadaljevati.\n" "Prepričajte se, da je mogoče pisati v sistemsko mapo." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Ali naj bodo vključene zadnje posodobitve z interneta?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -423,16 +424,16 @@ "priporočljivo, da posodobitve namestite takoj po končani nadgradnji.\n" "V primeru izbire možnosti 'ne', dostop do omrežja ni zahtevan." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "onemogočeno ob nadgradnji na %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Ni mogoče najti veljavnega zrcalnega strežnika" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -453,11 +454,11 @@ "V kolikor izberete možnost 'Ne', bo nadgradnja preklicana." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Ali naj bodo ustvarjeni privzeti viri?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -470,11 +471,11 @@ "Ali naj se dodajo privzeti vnosi za '%s'? Zavrnitev dodajanja vnosov " "prekliče nadgradnjo." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Neveljavni podatki skladišč" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -482,11 +483,11 @@ "Nadgradnja podatkov o skladišču je povzročila neveljavno datoteko, zato se " "je začelo opravilo poročanja hrošča." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Viri tretjih oseb so onemogočeni" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -496,7 +497,7 @@ "onemogočeni. Po nadgradnji jih lahko ponovno omogočite z orodjem 'Programski " "viri' ali z upravljalnikom paketov." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Paketi v neskladnem stanju" @@ -504,7 +505,7 @@ msgstr[2] "Paketa v neskladnem stanju" msgstr[3] "Paketi v neskladnem stanju" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -531,11 +532,11 @@ "vendar pa jih ni mogoče najti v nobenem arhivu. Ponovno namestite pakete " "ročno, ali pa jih odstranite iz sistema." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Napaka med posodabljanjem" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -543,13 +544,13 @@ "Med posodabljanjem je prišlo do napake. Običajno so vzrok napake težave z " "omrežjem. Preverite omrežne nastavitve in poskusite znova." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Ni dovolj prostora na disku" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -564,21 +565,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Preračunavanje sprememb" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Ali želite začeti z nadgradnjo?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Nadgradnja je preklicana" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -586,12 +587,12 @@ "Nadgradnja se bo zdaj preklicala. Obnovljeno bo izvirno stanje sistema. " "Nadgradnjo lahko nadaljujete kasneje." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Paketov za nadgradnjo ni mogoče prejeti" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -602,27 +603,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Napaka med uveljavitvijo" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Obnavljanje prvotnega stanja sistema" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Ni mogoče namestiti nadgrajenih različic" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -630,7 +631,7 @@ "Nadgradnja je bila prekinjena. Vaš sistem je lahko v neuporabnem stanju. " "Sedaj se bo zagnala obnovitev sistema (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -647,7 +648,7 @@ "upgrade/.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -655,20 +656,20 @@ "Nadgranja je bila prekinjena. Preverite svojo omrežno povezavo ali " "namestitveni medij in poskusite znova. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Ali naj bodo zastareli paketi odstranjeni?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "Ob_drži" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "Od_strani" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -678,27 +679,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Zahtevani odvisni paketi niso nameščeni" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Zahtevan odvisni paket '%s' ni nameščen. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Preverjanje upravljalnika paketov" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Priprava nadgradnje ni bila uspešna" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -706,11 +707,11 @@ "Pripravljanje sistema na nadgradnjo je spodletelo, zato se začenja opravilo " "poročanja hrošča." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Pridobivanje predpogojev za nadgradnjo je spodletelo" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -722,69 +723,69 @@ "\n" "Poleg tega se začenja opravilo poročanja hrošča." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Posodabljanje podatkov o skladiščih" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Dodajanje cd-roma je spodletelo" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "DOdajanje nosilca CD je spodletelo." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Neveljani podatki o paketu" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Pridobivanje" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Nadgrajevanje" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Nadgradnja je končana" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "Nadgradnja se je končala, vendar je med opravilom nadgradnje prišlo do napak." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Iskanje zastarelih programov" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Nadgradnja sistema je zaključena." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Delna nadgradnja je končana." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms je v uporabi" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -794,12 +795,12 @@ "Program 'evms' ni več podprt, zato ga je treba onemogočiti in nato ponovno " "zagnati nadgradnjo." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "Vaša grafična strojna oprema morda v Ubuntuju 12.04 LTS ni polno podprta." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -811,9 +812,9 @@ "https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx. Ali želite z " "nadgradnjo nadaljevati?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -821,8 +822,8 @@ "Nadgradnja bo verjetno vplivala na učinke namizja, zmogljivost pri igrah in " "drugih grafično zahtevnih programih." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -835,7 +836,7 @@ "\n" "Ali želite nadaljevati?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -848,11 +849,11 @@ "\n" "Ali želite nadaljevati?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Brez CPE i686" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -864,11 +865,11 @@ "zahtevajo i686. S to strojno opremo vašega sistema ni mogoče nadgraditi na " "novo izdajo Ubuntuja." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Ni CPE ARMv6" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -880,11 +881,11 @@ "različico arhitekture. Na trenutni strojni opremi ni mogoče nadgraditi " "vašega sistema na novo izdajo distribucije Ubuntu." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Init ni na voljo" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -899,15 +900,15 @@ "\n" "Ali res želite nadaljevati?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Nadgradnja peskovnika z aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Uporabi navedeno pot za preiskovanje nosilcev s paketi za nadgradnjo" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -915,57 +916,57 @@ "Uporabite vmesnik. Trenutno so na voljo:\n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*ZASTARELO* ta možnost bo bila prezrta" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "Izvedi le delno nadgradnjo (ne prepiše datoteke sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Onemogoči podporo zaslona GNU" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Nastavi podatkovno mapo" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Vstavite '%s' v pogon '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Pridobivanje je zaključeno" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Pridobivanje datoteke %li od %li s hitrostjo %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Približni preostali čas: %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Pridobivanje datoteke %li od %li" @@ -975,27 +976,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Uveljavljanje sprememb" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "težave z odvisnostmi - paket ne bo nastavljen" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Paketa '%s' ni bilo mogoče namestiti" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -1007,7 +1008,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1018,7 +1019,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1026,20 +1027,20 @@ "V kolikor se odločite za novejšo različico, bodo vse ročno nastavljene " "spremembe izgubljene." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Ukaza 'diff' ni mogoče najti" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Prišlo je do usodne napake" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1052,13 +1053,13 @@ "Izvorna datoteka sources.list je shranjena v /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Sočasno sta bili pritisnjeni tipki Ctrl in C" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1067,136 +1068,136 @@ "Ali ste prepričani, da želite to narediti?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Da ne pride do izgube podatkov, zaprite vse odprte programe in dokumente." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Ni več podpore s strani podjetja Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Za podgradnjo (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Za odstranitev (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Ni več zahtevano (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Za namestitev (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Za nadgradnjo (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Menjava nosilca podatkov" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Pokaži razlike >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Skrij razlike" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Napaka" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Prekliči" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Zapri" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Pokaži Terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Skrij Terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Podatki" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Podrobnosti" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Ni več podprto %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Odstrani %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Odstrani (samodejno nameščeno) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Namesti %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Nadgradi %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Zahtevan je ponovni zagon" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" "Za dokončanje nadgradnje je treba ponovno zagnati sistem." -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Ponovno zaženi sedaj" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1208,11 +1209,11 @@ "S tem bo nadgradnja prekinjena in sistem bo ostal v nedelujočem stanju. " "Priporočamo vam, da nadgradnjo zaključite do konca." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Ali naj se nadgradnja prekliče?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" @@ -1221,7 +1222,7 @@ msgstr[2] "%li dneva" msgstr[3] "%li dni" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" @@ -1230,7 +1231,7 @@ msgstr[2] "%li uri" msgstr[3] "%li ure" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" @@ -1239,7 +1240,7 @@ msgstr[2] "%li minuti" msgstr[3] "%li minute" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1257,7 +1258,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1271,14 +1272,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1288,34 +1289,32 @@ "približno %s s 56k modemom." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Prejemanje bo pri trenutni hitrosti povezave trajalo približno %s. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Pripravljanje na nadgradnjo" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Pridobivanje novih programskih kanalov" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Prejemanje novih paketov" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Nameščanje novih paketov" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Čiščenje zastarelih paketov" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1338,7 +1337,7 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." @@ -1347,7 +1346,7 @@ msgstr[2] "Odstranjena bosta %d paketa." msgstr[3] "Odstranjeni bodo %d paketi." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." @@ -1356,7 +1355,7 @@ msgstr[2] "Nameščena bosta %d nova paketa." msgstr[3] "Nameščeni bodo %d novi paketi." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." @@ -1365,7 +1364,7 @@ msgstr[2] "Nadgrajena bosta %d paketa." msgstr[3] "Nadgrajeni bodo %d paketi." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1376,7 +1375,7 @@ "\n" "Skupaj bo treba prejeti %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1384,7 +1383,7 @@ "Namestitev nadgradnje lahko traja več ur. Ko se prejem konča, opravila ni " "več mogoče preklicati." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1392,53 +1391,53 @@ "Pridobivanje in nameščanje nadgradnje lahko traja več ur. Ko se bo prejem " "končal, opravila ne bo več mogoče preklicati." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Odstranjevanje paketov lahko traja več ur. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Programska oprema na tem računalniku je posodobljena." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "Za vaš sistem nadgradnja ni na voljo. Postopek bo preklican." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Zahtevan je ponoven zagon" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Nadgradnja je končana. Zahtevan je ponoven zagon sistema. Ali želite sistem " "ponovno zagnati takoj?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "overi '%(file)s' z '%(signature)s' " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "razširjanje '%s'" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Orodja za nadgradnjo ni bilo mogoče zagnati" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1446,35 +1445,35 @@ "To je verjetno hrošč v orodju nadgradnje. Prijavite hrošč z uporabo ukaza " "'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Podpis orodja za nadgradnjo" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Orodje za nadgradnjo" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Pridobivanje paketov je spodletelo" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "Pridobivanje paketov nadgradnje je spodletelo. Morda je napaka v omrežni " "povezavi. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Overitev je spodletela" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1482,13 +1481,13 @@ "Overitev nadgradnje je spodletela. Morda je prišlo do napake omrežja ali " "strežniška. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Razširjanje paketov je spodletelo" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1496,13 +1495,13 @@ "Razširjanje paketov nadgradnje je spodletelo. Morda je prišlo do napake " "omrežja ali strežniška. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Overitev je spodletela" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1510,15 +1509,15 @@ "Preverjanje nadgradnje je spodletelo. Morda je prišlo do ali strežniške " "omrežja ali strežnika. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Nadgradnje ni mogoče zagnati" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1527,13 +1526,13 @@ "noexec. Ponovno priklopite nosilec brez zastavice noexec in ponovno zaženite " "nadgradnjo." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Sporočilo o napaki je '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1546,73 +1545,73 @@ "Izvorna datoteka sources.list je shranjena v /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Prekinjanje" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Znižanje različice:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Za nadaljevanje pritisnite [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Nadaljuj [d/N] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Podrobnosti [p]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "d" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "p" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Ni več podprto: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Odstranitev: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Namestitev: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Nadgradnja: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Nadaljuj [D/n] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1679,9 +1678,8 @@ msgstr "Nadgradnja distribucije" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Nadgrajevanje Ubuntuja na različico 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Nadgrajevanje Ubuntu-ja na različico 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1699,86 +1697,87 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Počakajte. Postopek je lahko dolgotrajen." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Posodobitev je zaključena" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Ni mogoče najti opomb ob izdaji" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Strežnik je najbrž preobremenjen. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Opomb ob izdaji ni bilo mogoče prejeti" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Preverite svojo internetno povezavo." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Nadgradnja" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Opombe ob izdaji" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Prejemanje dodatnih paketov ..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Datoteka %s od %s s hitrostjo %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Datoteka %s od %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Odpri povezavo v brskalniku" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Kopiraj povezavo v odložišče" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" "Prejemanje %(current)li. od skupno %(total)li-h datotek s hitrostjo " "%(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Prejemanje %(current)li. od skupno %(total)li datotek." -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Vaša izdaja Ubuntu ni več podprta." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1786,53 +1785,61 @@ "Ne boste več prejemali nadaljnjih varnostnih popravkov ali kritičnih " "posodobitev. Nadgradite na sodobnejšo različico Ubuntuja." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Podrobnosti o nadgradnji" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Namesti" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Ime" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Različica %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Ni bilo zaznane omrežne povezave. Podrobnosti dnevnika sprememb ne morete " "prejeti." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Prejemanje seznama sprememb ..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Odstrani izbor vsega" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Izberi _vse" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "Izbranih je %(count)s posodobitev." +msgstr[1] "Izbrana je %(count)s posodobitev." +msgstr[2] "Izbrani sta %(count)s posodobitvi." +msgstr[3] "Izbrane so %(count)s posodobitve." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "Prejetih bo %s." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "Posodobitve so bile že prejete, a ne nameščene." msgstr[1] "Posodobitev je bila že prejeta, a ne nameščena." msgstr[2] "Posodobitvi sta bili že prejeti, a ne nameščeni." @@ -1842,11 +1849,18 @@ msgid "There are no updates to install." msgstr "Ni posodobitev za namestitev." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Neznana velikost prejema." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1854,7 +1868,7 @@ "Ni znano kdaj so bili podatki o paketih zadnjič posodobljeni. Kliknite na " "gumb 'Preveri' za posodobitev podatkov." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1863,7 +1877,7 @@ "Podatki o paketih so bili zadnjič posodobljeni pred %(days_ago)s dnevi.\n" "Za preverjanje za nove posodobitve programov pritisnite gumb 'Preveri'." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1872,7 +1886,7 @@ msgstr[2] "Podatki o paketih so bili posodobljeni pred %(days_ago)s dnevoma." msgstr[3] "Podatki o paketih so bili posodobljeni pred %(days_ago)s dnevi." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1883,35 +1897,47 @@ msgstr[3] "Podatki o paketih so bili posodobljeni pred %(hours_ago)s urami." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" "Podatki o paketih so bili zadnjič posodobljeni pred približno %s minutami." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Podatki o paketih so bili pravkar posodobljeni." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"S posodobitvami se odpravljajo napake in varnostne luknje v programih in " +"dodajo nove zmožnosti programov." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Mogoče so za vaš računalnik na voljo posodobitve programov." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Dobrodošli v Ubuntuju" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Te programske posodobitve so bile izdane po izidu stabilne različice " +"Ubuntuja." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Posodobitve programov so na voljo za ta računalnik." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1922,7 +1948,7 @@ "prostora na '%s'. Izpraznite smeti in odstranite začasne datoteke predhodnih " "namestitev z uporabo ukaza 'sudo apt-get clean'." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1930,24 +1956,24 @@ "Računalnik se mora ponovno zagnati, da se dokonča posodobitev vseh paketov. " "Pred nadaljevanjem shranite svoje delo." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Branje podrobnosti o paketih" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Povezovanje ..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Morda ne bo mogoče preveriti za posodobitve ali prejeti novih posodobitev." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Ni mogoče pridobiti podatkov o paketih" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1960,7 +1986,7 @@ "Pošljite poročilo o napaki za paket 'update-manager' in priložite naslednje " "podrobnosti:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1972,31 +1998,31 @@ "Pošljite poročilo o napaki za paket 'update-manager' in priložite naslednje " "podrobnosti:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Nova namestitev)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Velikost: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Iz različice %(old_version)s na %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Različica %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Nadgradnja izdaje trenutno ni mogoča" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -2005,21 +2031,21 @@ "Nadgradnja izdaje trenutno ne more biti opravljena. Poskusite kasneje. " "Strežnik je sporočil: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Prejemanje orodja za nadgradnjo izdaje" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Na voljo je nova izdaja Ubuntu '%s'" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Kazalo programskih paketov je okvarjeno" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -2029,6 +2055,17 @@ "napako s pomočjo orodja \"Synaptic\" ali pa v ukazni lupini zaženite \"sudo " "apt-get install -f\"." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Na voljo je nova izdaja '%s'." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Prekliči" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Preveri za posodobitve" @@ -2038,22 +2075,18 @@ msgstr "Namesti vse razpoložljive posodobitve" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Prekliči" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Dnevnik sprememb" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Posodobitve" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Izgradnja seznama posodobitev" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2077,20 +2110,20 @@ " * neuradnih programskih paketih, ki jih Ubuntu na zagotavlja.\n" " * razvojni različici distribucije." -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Prejemanje dnevnika sprememb" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Druge posodobitve (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "Ta posodobitev ne prihaja iz vira, ki podpira dnevnike sprememb." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2098,7 +2131,7 @@ "Prejemanje seznama sprememb ni bilo uspešno. \n" "Preverite svojo internetno povezavo." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2111,7 +2144,7 @@ "Različica, ki je na voljo: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2124,7 +2157,7 @@ "Uporabite http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "dokler dnevnik ne bo posodobljen ali pa poskusite kasneje." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2138,53 +2171,44 @@ "+changelog\n" "ali pa poskusite kasneje." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Zaznavanje distribucije je spodletelo" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" "Prišlo je do napake '%s' med preverjanjem različice uporabljenega sistema." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Pomembne varnostne posodobitve" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Priporočene posodobitve" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Predlagane posodobitve" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Navzdol prikrojeno" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Posodobitve distribucije" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Druge posodobitve" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Začenjanje upravljalnika posodobitev" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"S posodobitvami se odpravljajo napake in varnostne luknje v programih in " -"dodajo nove zmožnosti programov." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Delno nadgradi" @@ -2256,37 +2280,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Posodobitve programov" +msgid "Update Manager" +msgstr "Upravljalnik posodobitev" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Posodobitve programov" +msgid "Starting Update Manager" +msgstr "Upravljalnik posodobitev se zaganja" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "Nad_gradi" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "posodobitve" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Namesti" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Spremembe" +msgid "updates" +msgstr "posodobitve" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Opis" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Opis posodobitve" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2294,25 +2308,35 @@ "Prevezani ste preko gostovanja v omrežju, zato boste morda morali plačati za " "podatke, ki jih bo porabila ta posodobitev." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Povezani ste preko brezžičnega modema." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Varneje je, če svoj računalnik pred posodabljanjem priključite na električno " "omrežje." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Namesti posodobitve" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Spremembe" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Nastavitve ..." +msgid "Description" +msgstr "Opis" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Namesti" +msgid "Description of update" +msgstr "Opis posodobitve" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Nastavitve ..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2337,9 +2361,8 @@ msgstr "Zavrnili ste nadgradnjo na novo različico Ubuntuja." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Sistem je mogoče nadgraditi kadarkoli preko možnosti \"Nadgradi\" " @@ -2353,60 +2376,60 @@ msgid "Show and install available updates" msgstr "Pokaži in namesti razpoložljive posodobitve" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Pokaži različico in končaj" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Mapa, ki vsebuje podatkovne datoteke" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Preveri, ali je na voljo nova izdaja Ubuntu" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "Preveri, ali je mogoče sistem nadgraditi na najnovejšo razvojno različico" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Nadgradi z uporabo najnovejše predlagane različice programa za nadgradnjo" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Ob začenjanju ne postavi v žarišče" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Poskusite zagnati ukaz dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Ob zagonu ne preveri za posodobitve" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Preizkusna nadgradnja v načinu peskovnika aufs" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Izvajanje delne nadgradnje" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Prikaži opis paketa namesto dnevnika sprememb" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Poskusite nadgraditi na najnovejšo različico s pomočjo orodja za " "nadgrajevanje iz $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2416,11 +2439,11 @@ "Trenutno sta podprta načina 'desktop' za namizne sisteme in 'server' za " "strežniške sisteme." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Zaženi navedeno začelje" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2428,11 +2451,11 @@ "Preveri le, ali je na voljo nova različica distribucije in izpiši poročilo s " "pomočjo izhodne kode" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Preverjanje za novo izdajo Ubuntu" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2440,68 +2463,68 @@ "Za podrobnosti o posodobitvah obiščite:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Ni novih izdaj" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Na voljo je nova izdaja '%s'." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Za nadgradnjo na novo izdajo zaženite ukaz 'do-release-upgrade'." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Na voljo je nadgradnja na Ubuntu %(version)s" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Zavrnili ste nadgradnjo na Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Dodaj izhod razhroščevanja" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Prikaži nepodprte pakete na tem računalniku" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Prikaži podprte pakete na tem računalniku" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Pokaži vse pakete z njihovim stanjem" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Pokaži vse pakete na seznamu" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Povzetek stanja podpore '%s':" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "Imate %(num) paketov (%(percent).1f%%), ki so podprti do %(time)" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "Imate %(num)s paketov (%(percent).1f%%), ki jih ni več mogoče prejeti" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "Imate %(num) paketov (%(percent).1f%%), ki niso podprti" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2509,54 +2532,71 @@ "Poženite s --show-unsupported, --show-supported ali --show-all za ogled več " "podrobnosti" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Ni več na voljo za prejem:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Nepodprto: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Podprto do %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Nepodprto" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Nepodprt način: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Datoteka na disku" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "paket .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Namesti mankajoči paket." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Paket %s bi moral biti nameščen." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "paket .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s mora biti označen kot ročno nameščen." +msgid "%i obsolete entries in the status file" +msgstr "%i zastarelih vnosov v datoteki stanja" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "Zastareli vnosi v stanju dpkg" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "Zastareli vnosi stanja dpkg" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2565,70 +2605,81 @@ "kdelibs5-dev. Več podrobnosti o hrošču si lahko ogledate na bugs.launchpad." "net, hrošč #279621." -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "%i zastarelih vnosov v datoteki stanja" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "Zastareli vnosi v stanju dpkg" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "Zastareli vnosi stanja dpkg" +msgid "%s needs to be marked as manually installed." +msgstr "%s mora biti označen kot ročno nameščen." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Odstrani nalagalnik lilo, saj je nalagalnik grub tudi nameščen. (Za več " "podrobnosti si poglejte podrobnosti hrošča #314004.)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Ko ste posodobili podatke o paketih, nujnega paketa '%s' ni bilo več " -#~ "mogoče najti, zato se začenja opravilo poročanja hrošča." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Nadgrajevanje Ubuntu-ja na različico 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "Izbranih je %(count)s posodobitev." -#~ msgstr[1] "Izbrana je %(count)s posodobitev." -#~ msgstr[2] "Izbrani sta %(count)s posodobitvi." -#~ msgstr[3] "Izbrane so %(count)s posodobitve." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Dobrodošli v Ubuntuju" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Te programske posodobitve so bile izdane po izidu stabilne različice " -#~ "Ubuntuja." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Posodobitve programov so na voljo za ta računalnik." - -#~ msgid "Update Manager" -#~ msgstr "Upravljalnik posodobitev" - -#~ msgid "Starting Update Manager" -#~ msgstr "Upravljalnik posodobitev se zaganja" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Povezani ste preko brezžičnega modema." - -#~ msgid "_Install Updates" -#~ msgstr "_Namesti posodobitve" +#~ "Ko ste posodobili podatke o paketih, nujnega paketa '%s' ni bilo več " +#~ "mogoče najti, zato se začenja opravilo poročanja hrošča." #~ msgid "Your system is up-to-date" #~ msgstr "Uporabljate najnovejšo različico sistema." @@ -2683,6 +2734,9 @@ #~ "V prihodnje ne boste dobili varnostnih popravkov ali nujnih posodobitev. " #~ "Nadgradite na novejšo različico Ubuntu Linuxa." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Nadgrajevanje Ubuntuja na različico 11.10" + #~ msgid "" #~ "The system was unable to get the prerequisites for the upgrade. The " #~ "upgrade will abort now and restore the original system state.\n" diff -Nru update-manager-17.10.11/po/sq.po update-manager-0.156.14.15/po/sq.po --- update-manager-17.10.11/po/sq.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/sq.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-21 05:44+0000\n" "Last-Translator: Vilson Gjeci \n" "Language-Team: Albanian \n" @@ -21,7 +22,7 @@ "X-Poedit-Bookmarks: 126,-1,-1,-1,-1,-1,-1,-1,-1,-1\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -29,13 +30,13 @@ msgstr[1] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Serveri për %s" @@ -43,20 +44,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Serveri Kryesor" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Servera të personalizuar" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Nuk mundëm të llogarisim hyrjen sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -64,11 +65,11 @@ "I pamundur lokalizimi i skedarëve të paketave, ndoshta ky nuk është një disk " "i Ubuntu ose është në arkitekturë e gabuar?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Futja e CD dështoi" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -83,13 +84,13 @@ "Mesazhi i gabimit ishte:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Fshije paketën në gjendje të keqe" msgstr[1] "Fshiji paketat në gjendje të keqe" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -110,15 +111,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Serveri mund të jetë i mbingarkuar" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Paketat e dëmtuara" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -128,7 +129,7 @@ "përpara." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -149,13 +150,13 @@ " * Paketa jo zyrtare të programeve që nuk jepen nga Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Ky ka mundësi të jetë një problem kalimtar, ju lutemi provojeni përsëri më " "vonë." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -163,16 +164,16 @@ "Nëse asnjë prej këtyre nuk aplikohet, atëherë ju lutemi ta raportoni këtë " "gabim duke përsorur komandën 'ubuntu-bug update-manager' në një terminal." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Nuk mundëm të llogarisim përditësimin" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Gabim gjatë vërtetimit të origjinalitetit të disa paketave." -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -182,29 +183,29 @@ "problemet me rrjetin.Ju lutemi provoni më vonë edhe një herë.Paketat e " "mëposhtme nuk mund të vërtetohen për nga origjinaliteti." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" "Paketa '%s' është shënuar për tu hequr, por është në listën e zezë të heqjes." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Paketa thelbësore '%s' është shënuar për tu hequr." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Duke u përpjekur të istaloj versionin e listës së zezë '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "'%s' nuk mund të instalohet" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -213,11 +214,11 @@ "gabim duke përdorur 'ubuntu-bug update-manager' në një terminal." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Can't guess meta-package" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -231,15 +232,15 @@ " Ju lutemi instaloni fillimisht një nga paketat e mësipërme duke përdorur " "synaptic apo apt-get para proçedimit." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Duke lexuar depozitën" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Është e pamundur të merret një hyrje ekskluzive" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -247,11 +248,11 @@ "Kjo dmth se me siguri, një tjetër Paketmanager është aktiv (si psh apt-get " "ose aptitude). Ju lutemi mbylleni së pari këtë aplikacion." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Përditësimi nga një lidhje e largët nuk suportohet" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -265,11 +266,11 @@ "\n" "Përditësimi do të mbyllet tani. Ju lutemi provojeni pa ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Të vazhdojmë punën nën SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -286,11 +287,11 @@ "Nëse vazhdoni, një ssh daemon shtesë do të nisë në portin '%s'.\n" "Dëshironi të vazhdoni?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Po nisim sshd shtesë" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -301,7 +302,7 @@ "shtesë do të nisë në portin '%s'. Nëse diçka nuk shkon si duhet me ssh e " "nisur, ju mund të vazhdoni të lidheni me atë shtesë.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -314,29 +315,29 @@ "mund ta hanpi portin me p.sh.:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Nuk mund të aktualizoj" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Një përditësim nga '%s' në '%s' nuk suportohet me këtë mjet." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Instalimi i Sandbox dështoi" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Nuk qe e mundur të krijohej ambienti i sandbox." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Mënyra Sandbox" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -351,18 +352,18 @@ "*Asnjë* ndryshim i shkruajtur në një drejtori të sistemit nga tani e deri në " "rindezje nuk do të jetë i përhershëm." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Instalimi juaj i python është i dëmtuar. Ju lutemi rregulloni '/usr/bin/" "python' symlink." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Paketa 'debsig-verify' është instaluar" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -372,12 +373,12 @@ "Ju lutemi hiqeni paraprakisht me synaptic ose 'apt-get remove debsig-verify' " "dhe nisni përditësimin përsëri." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Nuk mund të shkruaj tek '%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -388,11 +389,11 @@ "tuaj. Përditësimi nuk mund të vazhdojë.\n" "Ju lutemi ta bëni të shkruajtshme drejtorinë tuaj të sistemit." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Të përfshijmë edhe përditësimet e fundit nga Interneti?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -413,16 +414,16 @@ "ju duhet të instaloni përditësimet e fundit me njëherë pas instalimit.\n" "Nëse përgjigjeni 'jo' këtu, rrjeti nuk do të përdoret fare." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "u çaktivizua në përditësimin e %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Nuk u gjet asnjë lidhje e vlefshme" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -441,11 +442,11 @@ "Nëse zgjidhni 'Jo' përditësimi do të anullohet." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Të gjenerojmë resurset e parazgjedhura?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -458,11 +459,11 @@ "A duhet të shtohen hyrjet e parazgjedhura për '%s'? Nëse zgjidhni 'Jo', " "përditësimi do të anullohet." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Informacioni i magazinës është i pavlefshëm" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -470,11 +471,11 @@ "Përditësimi i informacionit të magazinës krijoi një skedar të apvlefshëm " "kështu që një proçes i raportimit të gabimit u krijua." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Burimet e palëve të treta janë çaktivizuar" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -484,13 +485,13 @@ "riaktivizoni ato pas përditësimit me mjetin 'parametrat e programeve' ose me " "menaxhuesin tuaj të paketave." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Paketë në gjendje të paqëndrueshme" msgstr[1] "Paketa në gjendje të paqëndrueshme" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -509,11 +510,11 @@ "por për to nuk mund të gjendet asnjë arkiv. ju lutemi riinstalojini paketat " "në mënyrë manuale ose hiqini nga sistemi." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Gabim gjatë përditësimit" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -522,13 +523,13 @@ "me rrjetin, ju lutemi kontrolloni lidhjen tuaj me rrjetin dhe provojeni " "përsëri." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Nuk ka hapësirë të lirë sa duhet" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -543,21 +544,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Duke llogaritur ndryshimet" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Dëshironi të nisni përditësimin?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Përditësimi u anullua" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -565,12 +566,12 @@ "Përditësimi do të anullohet tani dhe do të kthehet gjendja origjinale e " "sistemit. Ju mund ta rinisni përditësimin më vonë." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Nuk mund të aktualizohen, shkarkimet" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -581,27 +582,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Gabim gjatë vendosjes" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Duke kthyer gjendjen origjinale të sistemit" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Nuk mund të instalohen, aktualizimet" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -609,7 +610,7 @@ "Përditësimi u anullua. Sistemi juaj mund të jetë në një gjendje të " "paqëndrueshme. Tani do të nisë rekuperimi (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -626,7 +627,7 @@ "var/log/dist-upgrade/ në raportin e gabimit.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -634,20 +635,20 @@ "Përditësimi u anullua. Ju lutemi të kontrolloni lidhjen tuaj me internetin " "apo median e instalimit dhe të provoni përsëri. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Ti heqim paketat e vjetra?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Mbaj" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Hiqe" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -657,27 +658,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Vartësitë e kërkuara nuk janë instaluar" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Vartësia e kërkuar '%s' nuk është instaluar. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Duke kontrolluar menaxhuesin e paketave" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Përgatitja e përditësimit dështoi" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -685,11 +686,11 @@ "Përgatitja e sistemit për përditësim dështoi ndaj një proçes i raportimit të " "gabimit po niset." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Marrja e kërkesave të përditësimit dështoi" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -702,69 +703,69 @@ "\n" "Gjithashtu, një proçes i raportimit të gabimit do të niset." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Duke përditësuar informacionin e magazinës" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Dështova në shtimin e cdrom" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Më vjen keq, shtimi i cdrom nuk qe i suksesshëm." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Informacion i pavlefshëm i paketave" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Duke mbledhur" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Aktualizo" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Aktualizimi përfundoi" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "Përditësimi u kompletua por pati gabime gjatë proçesit të përditësimit." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Duke kërkuar për programe të vjetra" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Aktualizimi i sistemit është komplet" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Përditësimi i pjesshëm nuk u kompletua." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms është në përdorim" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -774,11 +775,11 @@ "'evms' nuk suportohet më, ju lutemi fikeni atë dhe nisni përditësimin " "përsëri kur të keni mbaruar." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "Grafikët tuaj mund të mos suportohen plotësisht në Ubuntu 12.04 LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -790,9 +791,9 @@ "informacion shikoni https://wiki.ubuntu.com/X/Bugs/" "UpdateManagerWarningForI8xx Dëshironi të vazhdoni me përditësimin?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -800,8 +801,8 @@ "Përditësimi mund të pakësojë efektet e desktopit, performancën e lojërave " "dhe të programeve të tjerë me grafikë intensivë." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -815,7 +816,7 @@ "\n" "Dëshironi të vazhdoni?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -829,11 +830,11 @@ "\n" "Dëshironi të vazhdoni?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Jo i686 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -845,11 +846,11 @@ "arkitekturë minimale. Nuk është e mundur ta përditësoni sistemin tuaj në një " "version të ri të Ubuntu me këtë hardware." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Jo ARMv6 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -861,11 +862,11 @@ "ARMv6 si arkitekturë minimale. Nuk është e mundur ta përditësoni sistemin " "tuaj në një version të ri të Ubuntu me këtë hardware." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Nuk ka init të disponueshëm" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -881,17 +882,17 @@ "\n" "Jeni i sigurtë që dëshironi të vazhdoni?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Po përditësojmë Sandbox duke përdorur aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Përdor shkurtoren e dhënë për të kërkuar për një cdrom me paketa të " "përditësueshme" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -899,57 +900,57 @@ "Përdor frontend. E disponueshme për momentin: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*DEPRECATED* ky opsion do të shpërfillet." -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "Kryej një përditësim të pjesshëm (pa rishkruar sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Çaktivizo mbështetjen për ekranin e GNU" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Vendos datadir" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Ju lutem Fut '%s' Në ngases '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Marrja u kompletua" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Duke marrë skedarin %li e %li në %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Rreth %s të mbetura" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Duke marrë skedarin %li të %li" @@ -959,27 +960,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Duke aplikuar ndryshimet" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "probleme vartësie - po e lëmë të pakonfiguruar" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Nuk mund të instalojmë '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -991,7 +992,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1002,7 +1003,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1010,20 +1011,20 @@ "Ju do të humbisni çdo ndryshim që i keni bërë këtij skedari konfigurimi nëse " "vendosni që ta zëvendësoni atë me një version më të ri." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Komanda 'diff' nuk u gjet" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Ndodhi një gabim fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1035,13 +1036,13 @@ "apt.log në raportin tuaj. Përditësimi u anullua.\n" "Origjinali i sources.list u ruajt tek /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c i shtypur" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1050,136 +1051,136 @@ "qëndrueshëm. A jeni të sigurtë, se dëshironi ta bëni këtë?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Për të parandaluar humbjen e të dhënave mbyllni të gjitha programet dhe " "dokumentat e hapura." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Nuk suportohet më nga Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Ulje në Shkallë (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Hiqe (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Nuk nevojitet më (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Instalo (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Përditëso (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Ndryshim i Medias" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Shfaq Ndryshimin >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Fshihe Ndryshimin" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Gabim" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Anullo" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Mbylle" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Trego Terminalin >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Fshihe Terminalin" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Informacion" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Detajet" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Nuk suportohet më %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Largo %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Hiqe (ishte vetë instaluar) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Instalo %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Aktualizo %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Kërkohet rinisja" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Rinisni sistemin për të kompletuar përditësimin" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Rinis tani" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1191,32 +1192,32 @@ "Sistemi mund të ngelet në një gjendje të paqëndrueshme nëse e anulloni " "përditësimin. Ju këshillojmë që ta vazhdoni përditësimin." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Anullo Aktualizimin?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li ditë" msgstr[1] "%li ditët" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li orë" msgstr[1] "%li orë" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minutë" msgstr[1] "%li minuta" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1232,7 +1233,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1246,14 +1247,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1263,34 +1264,32 @@ "një modem 56k." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Ky shkarkim do të dojë %s me lidhjen tuaj. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Duke u përgatitur për përditësim" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Duke marrë kanalet e reja të programeve" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Duke marrë paketat e reja" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Duke instaluar përditësimet" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Duke pastruar" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1307,28 +1306,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d paketë do të hiqet." msgstr[1] "%d paketa do të hiqen." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d paketë e re do të instalohet." msgstr[1] "%d paketa të reja do të instalohen." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d paketë do të përditësohet." msgstr[1] "%d paketa do të përditësohen." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1339,7 +1338,7 @@ "\n" "Juve ju duhet të shkarkoni një total prej %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1347,7 +1346,7 @@ "Instalimi i përditësimit mund të zgjasë disa orë. Pasi shkarkimi të ketë " "përfunduar, proçesi nuk mund të anullohet." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1355,16 +1354,16 @@ "Marrja dhe instalimi i përditësimit mund të zgjasë disa orë. Pasi shkarkimi " "të ketë përfunduar, proçesi nuk mund të anullohet." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Heqja e paketave mund të zgjasë disa orë. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Programet në këtë kompjuter janë të përditësuara." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1372,37 +1371,37 @@ "Ato aktualizime nuk jan te gatshem per sistemin tuaj. Aktualizimet nuk mun " "te largohen." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Kërkohet rinisja" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Përditësimi përfundoi dhe kërkohet një rindezje. Dëshironi ta bëni këtë tani?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "identifiko '%(file)s' kundrejt '%(signature)s' " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "duke ekstraktuar '%s'" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Nuk mund ta nisim mjetin e përditësimit" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1411,33 +1410,33 @@ "raportoni këtë si një gabim duke përdorur komandën 'ubuntu-bug update-" "manager'." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Përditësoni firmën e mjeteve" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Mjeti përditësues" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Dështuam në marrje" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Marrja e përditësimit dështoi. Mund të jetë një problem rrjeti. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Identifikimi dështoi" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1445,13 +1444,13 @@ "Identifikimi i përditësimit dështoi. Mund të ketë një problem me rrjetin ose " "me serverin. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Dështuam në nxjerrje" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1459,13 +1458,13 @@ "Nxjerrja e përditësimit dështoi. Mund të ketë një problem me rrjetin apo me " "serverin. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Verifikimi dështoi" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1473,15 +1472,15 @@ "Verifikimi i përditësimit dështoi. Mund të ketë një problem me rrjetin apo " "me serverin. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Nuk mund të nisim përditësimin" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1489,13 +1488,13 @@ "Kjo zakonisht shkaktohet nga një sistem ku /tmp montohet noexec. Ju lutemi " "ta rimontoni pa noexec dhe nisni përditësimin përsëri." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Mesazhi i gabimit është '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1507,73 +1506,73 @@ "Përditësimi u anullua.\n" "Origjinali i sources.list u ruajt tek /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Duke Ndërprerë" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Demoted:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Për të vazhduar ju lutemi të shtypni [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Vazhdo [pJ] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Detajet [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "p" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "j" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Nuk suportohet më: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Fshij: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Instalo: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Aktualizo: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Vazhdo [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1640,9 +1639,8 @@ msgstr "Përditësim i Distribucionit" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Duke përditësuar Ubuntu në versionin 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Duke përditësuar Ubuntu në versionin 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1660,84 +1658,85 @@ msgid "Terminal" msgstr "Terminali" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Ju lutem prisni, mund të duhet pak kohë." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Rifreskimi është komplet" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Nuk mund të gjejmë shënimet e versionit" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Serveri mund të jetë i mbingarkuar. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Nuk mund të shkarkojmë shënimet e versionit" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Ju lutemi kontrolloni lidhjen tuaj me internetin." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Aktualizo" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Shënime Mbi Versionin" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Duke shkarkuar skedarë shtesë të paketave..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Skedari %s nga %s në %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "skedari %s nga %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Hape Shkurtoren në Shfletues" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Kopjoje Shkurtoren në Kujtesë" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Duke shkarkuar skedarin %(current)li nga %(total)li me %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Duke shkarkuar skedarin %(current)li nga %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Versioni juaj i Ubuntu nuk suportohet më." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1745,53 +1744,59 @@ "Ju nuk do të merrni më rregullime t[ sigurisë dhe përditësime kritike. Ju " "lutemi të përditësoheni në një version të ri të Ubuntu." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Informacioni i përditësimit" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Instalo" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Emri" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Versioni %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Nuk u dallua asnjë lidhje me rrjetin, ju nuk mund të shkarkoni informacionin " "rreth ndryshimeve." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Duke shkarkuar një listë të ndryshimeve..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "Mos _Zgjidh Asnjë" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Përzgjidhi të _Gjitha" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s përditësim është përzgjedhur." +msgstr[1] "%(count)s përditësime janë përzgjedhur." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s do shkarkohet." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "Përditësimi është shkarkuar tashmë, por nuk është instaluar." msgstr[1] "Përditësimet janë shkarkuar tashmë, por nuk janë instaluar." @@ -1799,11 +1804,18 @@ msgid "There are no updates to install." msgstr "Nuk ka përditësime për tu instaluar." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Madhësia e shkarkimit e panjohur." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1811,7 +1823,7 @@ "Nuk dihet kur informacioni i paketave u përditësua për herë të fundit. Ju " "lutemi të klikoni mbi butonin 'Kontrollo' për të përditësuar informacionin." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1822,7 +1834,7 @@ "Klikoni butonin 'Kontrollo' këtu poshtë për të kontrolluar për përditësime " "të programeve." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1833,7 +1845,7 @@ "Informacioni i paketave u përditësuar për herë të fundit %(days_ago)s ditë " "më parë." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1846,37 +1858,49 @@ "parë." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" "Informacioni i paketave u përditësua për herë të fundit rreth %s minuta më " "parë." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Informacioni i paketave sapo u përditësua." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Përditësimet e programeve korrigjojnë gabimet, eleminojnë vrimat e sigurisë " +"dhe japin mjete të reja." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" "Përditësime programesh mund të jenë të disponueshme për kompjuterin tuaj." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Mirëse erdhët në Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Këto përditësime të programeve janë publikuar që kur ka dalë ky version i " +"Ubuntu." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Ka përditësime të programeve të disponueshme për këtë kompjuter." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1888,7 +1912,7 @@ "koshin dhe hiqni paketat e përkohshme të instalimeve të mëparshme duke " "përdorur 'sudo apt-get clean'." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1896,25 +1920,25 @@ "Kompjuteri ka nevojë të rindizet për të përfunduar përditësimet. ju lutemi " "të ruani punën tuaj para se të vazhdoni." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Duke lexuar informacionin e paketave" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Duke u lidhur......" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Ju mund të mos jeni në gjendje të kontrolloni për përditësime apo të " "shkarkoni përditësimet e reja." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Nuk mund ta nisim informacionin e paketave" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1927,7 +1951,7 @@ "Ju lutemi raportojeni këtë gabim të paketës 'update-manager' dhe përfshini " "mesazhin e gabimit që vijon:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1939,31 +1963,31 @@ "Ju lutemi raportojeni këtë gabim të paketës 'update-manager' dhe përfshini " "mesazhin e gabimit që vijon:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Instalim i Ri)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Madhësia: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Nga versioni %(old_version)s tek %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Versioni %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Përditësimi i versionit nuk është i mundur për momentin." -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1972,21 +1996,21 @@ "Përditësimi i versionit nuk mund të bëhet siç duhet. Ju lutemi ta provoni " "përsëri më vonë. Serveri raportoi: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Duke shkarkuar mjetin për përditësimin e versionit" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Një version i ri i Ubuntu '%s' është i disponueshëm" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Treguesi i programeve është dëmtuar" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1996,6 +2020,17 @@ "përdorni menaxhuesin e paketave \"Synaptic\" ose nisni \"sudo apt-get " "install -f\" në një terminal për të rregulluar fillimisht këtë çështje." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Versioni i ri '%s' i disponueshëm." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Anullo" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Kontrollo për Përditësime" @@ -2005,22 +2040,18 @@ msgstr "Instalo Të Gjitha Përditësimet e Disponueshme" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Anullo" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Lista e Ndryshimeve" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Përditësime" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Duke Ndërtuar Listën e Përditësimeve" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2044,21 +2075,21 @@ " * paketa jo zyrtare të programeve që nuk jepen nga Ubuntu\n" " * Ndryshime normale të versioneve të testimit të Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Protokoli i ndryshimeve do të shkarkohet" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Përditësime të tjera (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" "Ky përditësim nuk vjen me një burim që suporton ndryshimin e informacionit." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2066,7 +2097,7 @@ "Dlshtuam në shkarkimin e listës së ndryshimeve. \n" "Ju lutemi kontrolloni lidhjen tuaj të internetit." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2079,7 +2110,7 @@ "Versioni i disponeshëm: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2092,7 +2123,7 @@ "Ju lutemi përdorni http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "deri sa ndryshimet të bëhen të disponueshme, ose provoni përsëri më vonë." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2105,53 +2136,44 @@ "Ju lutemi përdorni http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "deri sa ndryshimet të bëhen të disponueshme ose provoni përsëri më vonë." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Dështuam në dallimin e distribucionit" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" "Një gabim '%s' ndodhi ndërkohë që po kontrollonim kë sistem po përdorni." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Rifreskime të rëndësishme të sigurisë!" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Rifreskimet e rekomanduara" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Aktualizimet e propozuara" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Portet mbështetëse" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Përditësimet e distribucionit" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Përditësime të tjera" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Duke Nisur Menaxhuesin e Përditësimeve" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Përditësimet e programeve korrigjojnë gabimet, eleminojnë vrimat e sigurisë " -"dhe japin mjete të reja." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Aktualizim i pjesërishëm" @@ -2224,37 +2246,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Përditësimet e programeve" +msgid "Update Manager" +msgstr "Menaxhuesi i Përditësimeve" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Përditësimet e programeve" +msgid "Starting Update Manager" +msgstr "Duke nisur Menaxhuesin e Përditësimeve" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "P_ërditësim" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "përditësimet" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Instalo" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Ndryshimet" +msgid "updates" +msgstr "përditësimet" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Zgjedhja" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Përshkrimi i përditësimit" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2262,25 +2274,35 @@ "Jeni të lidhur me roaming the mund të tatoheni për të dhënat e konsumuara " "nga ky përditësim." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Ju jeni lidhur me një modem wireless." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Është më e sigurtë të lidhni kompjuterin me tensionin AC para se ta " "përditësoni." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Instalo Përditësimet" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Ndryshimet" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Parametrat..." +msgid "Description" +msgstr "Zgjedhja" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Instalo" +msgid "Description of update" +msgstr "Përshkrimi i përditësimit" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Parametrat..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2305,9 +2327,8 @@ msgstr "Ju e keni mohuar përditësimin për Ubuntu-n e ri" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Ju mund ta përditësoni edhe më vonë duke hapur Menaxhuesin e Përditësimeve " @@ -2321,61 +2342,61 @@ msgid "Show and install available updates" msgstr "Shfaq dhe instalo përditësimet e disponueshme" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Shfaq versionin dhe dil" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Direktori që përmban skedarët e të dhënave" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Kontrollo nëse ka një version të ri të disponueshëm të Ubuntu" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "Kontrollo nëse përditësimi në versionin e fundit dlevel është i disponueshëm" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Përditësoni duke përdorur versionin e fundit të propozuar të përditësuesit " "të versionit" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Mos u fokuso tek harta kur niset" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Përpiqu të mos nisësh një dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Mos kontrollo për përditësime në nisje" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Testoje përditësimin me mbivedosjen e sandbox aufs" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Duke nisur një përditësim të pjesshëm" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Shfaq përshkrimin e paketës në vend të listës së ndryshimeve" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Përpiqu të përditësosh në versionin e fundit duke përdorur përditësuesin nga " "$distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2385,11 +2406,11 @@ "Për momentin suportohet 'desktop' për përditësimet e rregullta dhe 'server' " "për sistemet server." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Nis hapin e specifikuar" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2397,11 +2418,11 @@ "Kontrollo vetëm nëse një version i ri i distribucionit është i disponueshëm " "dhe raporto rezultatin me anë të kodit në dalje" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Duke kontrolluar për një version të ri të Ubuntu" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2409,69 +2430,69 @@ "Për informacionin e përditësimeve, ju lutemi të vizitoni:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Nuk u gjet asnjë version i ri" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Versioni i ri '%s' i disponueshëm." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Nis 'do-release-upgrade' për të përditësuar atë." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Ubuntu %(versioni)s Përditësim i Disponueshëm" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Ju e keni mohuar përditësimin tek ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Shto daljen e kontrollit të gabimeve" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Shfaq paketat e pa suportuara në këtë makinë" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Shfaq paketat e suportuara në këtë makinë" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Shfaq të gjitha paketat me gjendjen e tyre" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Shfaqi të gjitha paketat në një listë" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Përmbledhje e gjendjes së mbështetjes për '%s':" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" "Ju keni %(num)s paketa (%(percent).1f%%) të suportuara deri në %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "Ju keni %(num)s paketa (%(percent).1f%%) që nuk mund të shkarkohen më" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "Ju keni %(num)s paketa (%(percent).1f%%) që nuk suportohen" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2479,123 +2500,153 @@ "Nise me --show-unsupported, --show-supported ose --show-all për të parë më " "tepër detaje" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Nuk është më i shkarkueshëm:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "I pa suportuar: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "I suportuar deri në %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Nuk suportohet" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Metodë e pa implimetuar: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "një skedar në disk" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "paket .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Instalo paketën që mungon." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Paketa %s duhet instaluar." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "paket .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s ka nevojë të shënohet si e instaluar në mënyrë manuale." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"Kur përditësoni, nëse kdelibs4-dev është instaluar, kdelibs5-dev nevojitet " -"të instalohet. Shikoni defektin bugs.launchpad.net, bug #279621 për detaje." - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i hyrje të vjetra në skedarin e statusit" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Hyrje të vjetra në statusin dpkg" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Hyrje të vjetra në statusin dpkg" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"Kur përditësoni, nëse kdelibs4-dev është instaluar, kdelibs5-dev nevojitet " +"të instalohet. Shikoni defektin bugs.launchpad.net, bug #279621 për detaje." + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s ka nevojë të shënohet si e instaluar në mënyrë manuale." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Hiqe lilo përderisa është instaluar edhe grub. (shiko gabimin #314004 për " "detaje.)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Pasi informacioni i paketave tuaja u përditësua paketa thelbësore '%s' " -#~ "nuk po gjendet më ndaj po niset një proçes i raportimit të gabimit." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Duke përditësuar Ubuntu në versionin 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s përditësim është përzgjedhur." -#~ msgstr[1] "%(count)s përditësime janë përzgjedhur." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Mirëse erdhët në Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Këto përditësime të programeve janë publikuar që kur ka dalë ky version i " -#~ "Ubuntu." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Ka përditësime të programeve të disponueshme për këtë kompjuter." - -#~ msgid "Update Manager" -#~ msgstr "Menaxhuesi i Përditësimeve" - -#~ msgid "Starting Update Manager" -#~ msgstr "Duke nisur Menaxhuesin e Përditësimeve" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Ju jeni lidhur me një modem wireless." - -#~ msgid "_Install Updates" -#~ msgstr "_Instalo Përditësimet" +#~ "Pasi informacioni i paketave tuaja u përditësua paketa thelbësore '%s' " +#~ "nuk po gjendet më ndaj po niset një proçes i raportimit të gabimit." #~ msgid "Your system is up-to-date" #~ msgstr "Sistemi juaj është i përditësuar" @@ -2693,6 +2744,9 @@ #~ "pavlefshëm. Ju lutemi ta raportoni këtë gabim duke përdorur komandën " #~ "'ubuntu-bug update-manager' në një terminal." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Duke përditësuar Ubuntu në versionin 11.10" + #~ msgid "" #~ "The system was unable to get the prerequisites for the upgrade. The " #~ "upgrade will abort now and restore the original system state.\n" diff -Nru update-manager-17.10.11/po/sr.po update-manager-0.156.14.15/po/sr.po --- update-manager-17.10.11/po/sr.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/sr.po 2017-12-23 05:00:38.000000000 +0000 @@ -4,11 +4,12 @@ # Copyright (C) 2007 Marko Uskokovic # Marko Uskokovic , 2009. # Мирослав Николић , 17.12.2010, 2011, 2012. +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-14 19:48+0000\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian \n" @@ -22,7 +23,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -31,13 +32,13 @@ msgstr[2] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Земља сервера %s" @@ -45,20 +46,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Главни сервер" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Ручно подешени сервери" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Не могу да урачунам ставку „sources.list“ (списак извора)" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -66,11 +67,11 @@ "Не могу да пронађем ниједну датотеку пакета, можда ово није Убунту диск или " "је погрешна архитектура?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Нисам успео да додам ЦД диск" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -85,14 +86,14 @@ "Грешка беше:\n" "„%s“" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Уклони пакет у лошем стању" msgstr[1] "Уклони пакете у лошем стању" msgstr[2] "Уклони пакете у лошем стању" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -117,15 +118,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Сервер је можда преоптерећен" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Оштећени пакети" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -135,7 +136,7 @@ "наставите." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -156,12 +157,12 @@ " * Употребом незваничних пакета софтвера\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Ово је највероватније пролазни проблем, молим покушајте поново касније." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -169,16 +170,16 @@ "Ако ништа од овога не може да се примени, онда будите љубазни и пријавите " "ову грешку користећи наредбу „ubuntu-bug update-manager“ у терминалу." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Нисам могао да испланирам надоградњу" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Грешка приликом провере веродостојности неких пакета" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -188,7 +189,7 @@ "пролазни мрежни проблем, те уколико желите, можете пробати још једном " "касније. Испод се налази списак пакета који нису проверени." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -196,22 +197,22 @@ "Пакет „%s“ је означен за уклањање али се налази на листи пакета који не " "треба да се уклањају." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Кључни пакет „%s“ је означен за уклањање." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Покушавам да инсталирам верзију „%s“ из црне листе" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Не могу да инсталирам „%s“" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -220,11 +221,11 @@ "као грешку користећи наредбу „ubuntu-bug update-manager“ у терминалу." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Не могу да погодим мета пакет" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -238,15 +239,15 @@ " Молим инсталирајте прво један од тих пакета користећи синаптик или апт-гет " "пре него што наставите." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Читам кеш" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Искључиво закључавање није успело" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -254,11 +255,11 @@ "Ово најчешће значи да је покренут неки други програм за управљање пакета " "(рецимо „apt-get“ или „aptitude“). Молим прво затворите тај програм." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Надоградња преко удаљеног рачунара није подржана" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -272,11 +273,11 @@ "\n" "Надоградња ће сада бити прекинута. Молим пробајте без „ssh“." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Наставити са радом у „SSH“?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -292,11 +293,11 @@ "Ако наставите, додатни „ssh“ демон ће бити покренут на порту „%s“.\n" "Да ли желите да наставите?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Покрећем додатни „sshd“" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -307,7 +308,7 @@ "покренут на порту „%s“. Ако било шта пође непланирано са текућим „ssh“, " "можете се повезати на додатни.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -321,29 +322,29 @@ "„%s“" # Надоградња није могућа? -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Не могу да извршим надоградњу" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Ова алатка не подржава надоградњу са „%s“ на „%s“." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Нисам успео да поставим тест окружења" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Није било могуће направити тест окружење." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Режим тест окружења" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -358,18 +359,18 @@ "*Никакве* измене записане у системском директоријуму од сада све до следећег " "поновног учитавања неће бити сталне." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Пајтон инсталација је оштећена. Молим оправите „/usr/bin/python“ симболичку " "везу." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Пакет „debsig-verify“ је инсталиран" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -379,12 +380,12 @@ "Молим прво га уклоните синаптиком или у терминалу извршите „apt-get remove " "debsig-verify“ и затим поново покрените надоградњу." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Не могу да пишем у „%s“" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -395,11 +396,11 @@ "Надоградња не може бити настављена.\n" "Проверите да ли је могуће уписивање у системски директоријум." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Укључити најновије исправке са интернета?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -419,16 +420,16 @@ "инсталирате најновије исправке након надоградње.\n" "Ако овде изаберете „не“, мрежа неће бити коришћена." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "искљученo приликом надоградње на %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Нисам пронашао важећи мирор" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -448,11 +449,11 @@ "Ако изаберете „Не“ надоградња ће бити отказана." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Направити основне изворе?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -466,11 +467,11 @@ "Требају ли бити додате подразумеване ставке за „%s“? Ако изаберене „Не“, " "надоградња ће бити отказана." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Неважећа информација ризнице" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -478,11 +479,11 @@ "Надограђивање података о ризници је резултирало неисправном датотеком тако " "да је покренут процес за извештавање о грешци." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Искључени су извори трећих лица" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -492,14 +493,14 @@ "искључене. Након надоградње можете их поново укључити помоћу алата „software-" "properties“ или Вашим управником пакета." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Пакет у несагласном стању" msgstr[1] "Пакети у несагласном стању" msgstr[2] "Пакети у несагласном стању" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -519,11 +520,11 @@ "Пакети „%s“ су у несагласном стању и морају бити поново инсталирани, али " "нема архива за њих. Молим инсталирајте их ручно или их уклоните са система." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Грешка приликом ажурирања" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -531,13 +532,13 @@ "Јавио се проблем током ажурирања. Ово је обично нека врста мрежног проблема, " "молим проверите Вашу мрежну везу и покушате поново." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Нема довољно слободног простора на диску" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -552,21 +553,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Прорачунавам измене" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Да ли желите да започнете надоградњу?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Надоградња је отказана" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -574,12 +575,12 @@ "Надоградња ће сада бити отказана и биће враћено оригинално стање система. " "Можете да наставите надоградњу касније." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Нисам могао да преузмем надоградње" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -589,27 +590,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Грешка приликом слања" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Враћам оригинално стање система" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Нисам могао да инсталирам надоградње" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -617,7 +618,7 @@ "Надоградња је прекинута. Ваш систем би могао бити у неупотребљивом стању. " "Сада ће почети процес опоравка (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -634,7 +635,7 @@ "„/var/log/dist-upgrade/“.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -642,20 +643,20 @@ "Надоградња је прекинута. Молим проверите Вашу везу на Интернет или " "инсталациони медијум и покушајте поново. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Уклонити застареле пакете?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "За_држи" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "У_клони" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -665,27 +666,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Неопходна зависност није инсталирана" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Неопходна зависност „%s“ није инсталирана. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Проверавам управника пакета" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Припрема надоградње није успела" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -693,11 +694,11 @@ "Припрема система за надоградњу није успела тако да је покренут процес за " "извештавање о грешки." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Набављање предуслова надоградње није успело" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -709,68 +710,68 @@ "\n" "Уз ово, покренут је и процес за извештавање о грешци." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Ажурирам информације ризница" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Нисам успео да додам ЦД-РОМ" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Извините, додавање ЦД-РОМа није било успешно." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Неважеће информације пакета" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Добављам" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Надограђујем" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Надоградња је завршена" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "Надоградња је завршена, али је било грешака током процеса надоградње." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Тражим застарели софтвер" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Надоградња система је завршена." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Делимична надоградња је завршена." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "„evms“ у употреби" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -780,11 +781,11 @@ "„evms“ више није подржан, молим искључите га и поново покрените надоградњу " "када то урадите." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -792,9 +793,9 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -802,8 +803,8 @@ "Надоградња може смањити ефекте радне површине, перформансе игрица и других " "графички захтевних програма." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -816,7 +817,7 @@ "\n" "Да ли желите да наставите?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -829,11 +830,11 @@ "\n" "Да ли желите да наставите?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Нема „i686“ процесора" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -845,11 +846,11 @@ "архитектуру. Није могуће надоградити Ваш систем на ново Убунту издање са " "овим хардвером." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Нема „ARMv6“ процесора" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -861,11 +862,11 @@ "минималну архитектуру. Није могуће надоградити Ваш систем на ново Убунту " "издање са овим хардвером." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Инит није доступан" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -880,15 +881,15 @@ "\n" "Да ли сте сигурни да желите на наставите?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Надоградња тестирања коришћењем „aufs“" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Потражи диск са пакетима за надоградњу на датој локацији" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -896,58 +897,58 @@ "Користи сучеље. Тренутно је доступно: \n" "„DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE“" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*ЗАСТАРЕЛО* ова опција ће бити занемарена" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Изврши само делимичну надоградњу (без преписивања „sources.list“ датотеке)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Онемогући ГНУ екранску подршку" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Подеси директоријум података" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Молим убаците „%s“ у оптички уређај „%s“" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Добављање је завршено" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Преузимам датотеку број %li од укупно %li брзином %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Око %s је преостало" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Добављам датотеку %li oд %li" @@ -957,27 +958,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Примењујем измене" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "Проблем са међузависностима — остављам неподешено" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Не могу да инсталирам „%s“" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -989,7 +990,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1000,7 +1001,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1008,20 +1009,20 @@ "Изгубићете све измене које сте направили у овој датотеци подешавања ако " "одлучите да је замените новијом верзијом." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Команда „diff“ није пронађена" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Јавила се фатална грешка" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1034,13 +1035,13 @@ "Ваша оригинална датотека „sources.list“ је сачувана у „/etc/apt/sources.list." "distUpgrade“." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Притиснули сте „Ctrl-c“" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1049,135 +1050,135 @@ "сте сигурни да желите то?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Да спречите губитак података затворите све активне програме и документа." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Каноникал не подржава више (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Разгради (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Уклони (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Више није потребно (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Инсталирај (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Надогради (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Промена медијума" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Прикажи разлике >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Сакриј разлике" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Грешка" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "От&кажи" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "Зат&вори" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Прикажи терминал >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Сакриј терминал" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Информације" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Детаљи" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Није више подржан %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Уклони %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Уклони (беше аутоинсталиран) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Инсталирај %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Надогради %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Потребно је поновно покретање" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Поново покрените систем да комплетирате надоградњу" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "По_ново покрени сада" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1189,11 +1190,11 @@ "Систем би могао да буде у неупотребљивом стању ако поништите надоградњу. " "Јако Вам се препоручује да наставите надоградњу." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Поништити надоградњу?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" @@ -1201,7 +1202,7 @@ msgstr[1] "%li дана" msgstr[2] "%li дана" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" @@ -1209,7 +1210,7 @@ msgstr[1] "%li сата" msgstr[2] "%li сати" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" @@ -1217,7 +1218,7 @@ msgstr[1] "%li минута" msgstr[2] "%li минута" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1234,7 +1235,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1248,14 +1249,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1264,34 +1265,32 @@ "Ово преузимање ће „1Mbit DSL“ везом трајати око %s, а 56к модемом око %s." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Ово преузимање ће Вашом везом трајати око %s. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Припремам надоградњу" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Набављам нове канале софтвера" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Набављам нове пакете" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Инсталирам надоградње" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Чистим" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1311,7 +1310,7 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." @@ -1319,7 +1318,7 @@ msgstr[1] "%d пакета ће бити уклоњена." msgstr[2] "%d пакета ће бити уклоњено." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." @@ -1327,7 +1326,7 @@ msgstr[1] "%d нова пакета ће бити инсталирана." msgstr[2] "%d нових пакета ће бити инсталирано." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." @@ -1335,7 +1334,7 @@ msgstr[1] "%d пакета ће бити ажурирана." msgstr[2] "%d пакета ће бити ажурирано." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1346,7 +1345,7 @@ "\n" "Имате за преузимање укупно %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1354,7 +1353,7 @@ "Инсталација надоградње може да потраје неколико сати. Након завршеног " "преузимања, процес не може бити отказан." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1362,54 +1361,54 @@ "Довлачење и инсталација надоградње може да потраје неколико сати. Након " "завршеног преузимања, процес не може бити отказан." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Уклањање пакета може да потраје неколико сати. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Софтвер на овом рачунару је ажуриран." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" "Нема доступних надоградњи за Ваш систем. Надоградња ће сада бити отказана." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Неопходно је поновно покретање" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Надоградња је завршена и неопходно је поново покренути рачунар. Да ли желите " "да то учините сада?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "потврди идентитет „%(file)s“ за потпис „%(signature)s“ " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "извлачим „%s“" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Нисам могао да покренем алатку за надоградњу" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1417,46 +1416,46 @@ "Највероватније се ради о грешци алатке за надоградњу. Будите љубазни и " "пријавите ово као грешку користећи наредбу „ubuntu-bug update-manager“." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Потпис алатке за надоградњу" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Алатка за надоградњу" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Добављање није успело" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Нисам успео да добавим надоградњу. Можда је проблем у мрежи. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Потврђивање идентитета није успело" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" "Нисам успео да потврдим идентитет. Можда је проблем са мрежом или сервером. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Распакивање није успело" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1464,13 +1463,13 @@ "Нисам успео да распакујем надоградњу. Можда постоји проблем са мрежом или " "сервером. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Проверавање није успело" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1478,15 +1477,15 @@ "Нисам успео да извршим проверу надоградње. Можда је проблем са мрежом или " "сервером. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Не могу да покренем надоградњу" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1495,13 +1494,13 @@ "извршавања (noexec). Поново монтирајте без „noexec“ и покрените поново " "надоградњу." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Порука грешке је „%s“." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1514,73 +1513,73 @@ "Ваша оригинална датотека „sources.list“ је сачувана у „/etc/apt/sources.list." "distUpgrade“." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Прекидам" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Премештено:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Да наставите молим притисните [ЕНТЕР]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Наставити [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Појединости [п]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "п" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Није више подржан: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Уклонити: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Инсталирати: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Надоградити: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Наставити? [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1647,9 +1646,8 @@ msgstr "Надоградња дистрибуције" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Надоградња Убунтуа на издање 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Надоградња Убунтуа на издање 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1667,85 +1665,86 @@ msgid "Terminal" msgstr "Терминал" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Молим сачекајте, ово може да потраје." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Ажурирање је завршено" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Не могу да пронађем белешке о издању" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Сервер је можда преоптерећен. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Не могу да преузмем белешке о издању" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Молим проверите Вашу интернет везу." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Надоградња" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Белешке о издању" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Преузимам додатне датотеке пакета..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Датотека број %s од укупно %s брзином %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Датотека број %s од укупно %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Отвори везу у претраживачу" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Умножи везу у бележницу" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" "Преузимам датотеку %(current)li oд укупно %(total)li брзином %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Преузимам датотеку %(current)li oд укупно %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Ваша Убунту верзија више није подржана." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1753,53 +1752,60 @@ "Нећете добити никакве додатне безбедносне исправке и критична ажурирања. " "Молим надоградите систем на најновије издање Убунтуа." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Информације о надоградњи" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Инсталирам" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Верзија %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Није откривена веза са мрежом, нећете моћи да преузмете информације о " "изменама дневника." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Преузимам списак измена..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Поништи све" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Изабери _све" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s ажурирање је изабрано." +msgstr[1] "%(count)s ажурирања су изабрана." +msgstr[2] "%(count)s ажурирања је изабрано." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s биће преузет." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "Ажурирање је већ преузето, али није инсталирано." msgstr[1] "Ажурирања су већ преузета, али нису инсталирана." msgstr[2] "Ажурирања су већ преузета, али нису инсталирана." @@ -1808,11 +1814,18 @@ msgid "There are no updates to install." msgstr "Нема ажурирања за инсталирање." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Непозната величина преузимања." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1820,7 +1833,7 @@ "Није познато када су подаци о пакетима последњи пут освежени. Молим кликните " "на дугме „Провери“ да их освежите." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1830,7 +1843,7 @@ "Притисните дугме Провери да извршите проверу за новим " "исправкама софтвера." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1838,7 +1851,7 @@ msgstr[1] "Информације о пакетима су ажуриране пре %(days_ago)s дана." msgstr[2] "Информације о пакетима су ажуриране пре %(days_ago)s дана." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1848,34 +1861,45 @@ msgstr[2] "Информације о пакетима су ажуриране пре %(hours_ago)s сати." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Информације о пакетима су последњи пут освежене пре %s минута." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Информације о пакетима су управо освежене." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Ажурирање програма исправља грешке, уклања безбедносне пропусте и пружа нове " +"могућности." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Ажурирања софтвера могу бити доступна за Ваш рачунар." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Добродошли у Убунту" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Ова ажурирања софтвера су објављена од када је издато ово издање Убунтуа." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Доступна су ажурирања софтвера за овај рачунар." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1887,7 +1911,7 @@ "привремене пакете претходних инсталација користећи команду „sudo apt-get " "clean“." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1895,25 +1919,25 @@ "Да завршите са инсталирањем освежења, морате поново покренути рачунар. Молим " "сачувајте Ваш рад пре него што наставите." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Читам информације о пакетима" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Повезујем се..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Можда нећете бити у могућности да проверите за ажурирањима или да преузмете " "нова ажурирања." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Не могу да покренем информације о пакетима" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1926,7 +1950,7 @@ "Молим пријавите ово као грешку пакета „update-manager“ и укључите следећу " "поруку о грешци:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1938,31 +1962,31 @@ "Молим пријавите ово као грешку пакета „update-manager“ и укључите следећу " "поруку о грешци:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Нова инсталација)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Величина: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Са верзије %(old_version)s на верзију %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Верзија %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Надоградња издања није тренутно могућа" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1971,21 +1995,21 @@ "Надоградња издања тренутно не може бити извршена, молим покушајте касније. " "Сервер је известио: „%s“" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Преузимам алат надоградње издања" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Ново Убунту издање „%s“ је доступно" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Индекс софтвера је оштећен." -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1995,6 +2019,17 @@ "пакета „Синаптик“ или покрените „sudo apt-get install -f“ у терминалу да " "решите проблем." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Доступно је ново издање „%s“." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Отказујем" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Провери има ли допуна" @@ -2004,22 +2039,18 @@ msgstr "Инсталирај све доступне допуне" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Отказујем" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Дневник измена" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Ажурирања" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Припремам списак ажурирања" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2043,20 +2074,20 @@ " * Незваничним софтверским пакетима које не обезбеђује Убунту\n" " * Нормалним променама пред-издања Убунту верзије" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Преузимам дневник измена" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Остала ажурирања (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "Ова допуна не долази са извора који подржава дневнике измена." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2064,7 +2095,7 @@ "Нисам успео да преузмем списак измена.\n" "Молим проверите Вашу интернет везу." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2077,7 +2108,7 @@ "Доступно издање: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2090,7 +2121,7 @@ "Молим користите http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "док промене не постану доступне или пробајте касније." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2103,52 +2134,43 @@ "Молим користите http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "док промене не постану доступне или пробајте касније." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Нисам успео да откријем дистрибуцију" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Јавила се грешка „%s“ приликом проверавања који систем користите." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Важна сигурносна ажурирања" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Препоручена ажурирања" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Предложена ажурирања" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Позадинци" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Ажурирања дистрибуције" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Остала ажурирања" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Покрећем Управника ажурирања" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Ажурирање програма исправља грешке, уклања безбедносне пропусте и пружа нове " -"могућности." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "Де_лимична надоградња" @@ -2219,37 +2241,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Софтверска ажурирања" +msgid "Update Manager" +msgstr "Управник ажурирања" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Софтверска ажурирања" +msgid "Starting Update Manager" +msgstr "Покрећем Управника ажурирања" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "На_догради" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "ажурирања" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Инсталирам" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Измене" +msgid "updates" +msgstr "ажурирања" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Опис" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Опис ажурирања" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2257,23 +2269,33 @@ "Повезени сте у ромингу и можете утрошити више података него што вам је " "допуштено овим ажурирањем." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Повезани сте бежичним модемом." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "Сигурније је повезати рачунар на мрежно напајање пре ажурирања." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "И_нсталирај ажурирања" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Измене" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Подешавања..." +msgid "Description" +msgstr "Опис" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Инсталирам" +msgid "Description of update" +msgstr "Опис ажурирања" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Подешавања..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2296,9 +2318,8 @@ msgstr "Одбили сте да надоградите на нову верзију Убунтуа" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Можете да надоградите у каснијем времену отварањем Управника ажурирања и " @@ -2312,59 +2333,59 @@ msgid "Show and install available updates" msgstr "Прикажи и инсталирај доступне надоградње" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Приказаће верзију и изаћи ће" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Биће приказан директоријум који садржи датотеке података" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Провериће да ли је доступно ново Убунту издање" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Провериће да ли је могуће надоградити на најновије развојно издање" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Надоградиће користећи последњу предложену верзију програма за надоградњу" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Неће фокусирати на мапу приликом стартовања" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Покушаће да покрене надоградњу система" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Не врши проверу за ажурирањима приликом покретања" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Тестираће ажурирање помоћу „aufs“" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Покрећем делимичну надоградњу" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Прикажи опис пакета уместо дневника измена" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Пробајте са надоградњом на најновије издање коришћењем програма из „$distro-" "proposed“" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2374,11 +2395,11 @@ "Тренутно су подржани „desktop“ за редовне надоградње радних станица и " "„server“ за системе сервера." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Изврши назначени интерфејс" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2386,11 +2407,11 @@ "Провери само да ли је доступно ново издање дистрибуције и извести о " "резултату путем излазног кода" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Проверавам за новим издањем Убунтуа" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2398,69 +2419,69 @@ "За информације о надоградњи, молим посетите:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Нема нових издања" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Доступно је ново издање „%s“." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Покрените команду „do-release-upgrade“ да бисте прешли на то издање." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Доступна је Убунту %(version)s надоградња" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Одбили сте надоградњу на Убунту %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Додај излаз за уклањање грешака" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Прикажи неподржане пакете на овом рачунару" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Прикажи подржане пакете на овом рачунару" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Прикажи све пакете са њиховим стањима" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Прикажи све пакете на списку" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Сажетак стања подршке за „%s“:" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "Број пакета подржаних до %(time)s — %(num)s (%(percent).1f%%)" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" "Број пакета који не могу више бити преузимани — %(num)s (%(percent).1f%%)" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "Број неподржаних пакета — %(num)s (%(percent).1f%%)" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2468,54 +2489,71 @@ "Да прикажете више појединости покрените уз „--show-unsupported“, „--show-" "supported“ или „--show-all“" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Више не могу бити преузети:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Неподржани: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Подржани до %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Неподржан" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Метод није имплементиран: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Датотека на диску" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "„.deb“ пакет" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Инсталирај пакет који недостаје." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Пакет „%s“ треба бити инсталиран." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "„.deb“ пакет" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s мора бити означен као ручно инсталиран." +msgid "%i obsolete entries in the status file" +msgstr "%i превазиђена ставка у датотеци стања" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "Превазиђене ставке у стању „dpkg“-а" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "Превазиђене ставке „dpkg“ стања" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2524,68 +2562,81 @@ "треба бити инсталиран. Погледајте „bugs.launchpad.net“, грешку #279621 за " "детаље." -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "%i превазиђена ставка у датотеци стања" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "Превазиђене ставке у стању „dpkg“-а" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "Превазиђене ставке „dpkg“ стања" +msgid "%s needs to be marked as manually installed." +msgstr "%s мора бити означен као ручно инсталиран." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Уклони лило с обзиром да је груб такође инсталиран.(Погледајте грешку број " "#314004 за више детаља.)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Након ажурирања података о пакетима основни пакет „%s“ више не може бити " -#~ "пронађен тако да је покренут процес за извештавање о грешци." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Надоградња Убунтуа на издање 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s ажурирање је изабрано." -#~ msgstr[1] "%(count)s ажурирања су изабрана." -#~ msgstr[2] "%(count)s ажурирања је изабрано." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Добродошли у Убунту" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Ова ажурирања софтвера су објављена од када је издато ово издање Убунтуа." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Доступна су ажурирања софтвера за овај рачунар." - -#~ msgid "Update Manager" -#~ msgstr "Управник ажурирања" - -#~ msgid "Starting Update Manager" -#~ msgstr "Покрећем Управника ажурирања" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Повезани сте бежичним модемом." - -#~ msgid "_Install Updates" -#~ msgstr "И_нсталирај ажурирања" +#~ "Након ажурирања података о пакетима основни пакет „%s“ више не може бити " +#~ "пронађен тако да је покренут процес за извештавање о грешци." #~ msgid "Software updates are available for this computer" #~ msgstr "Доступна су ажурирања за овај рачунар" @@ -2721,6 +2772,9 @@ #~ "Будите љубазни и пријавите ово као грешку користећи наредбу „ubuntu-bug " #~ "update-manager“ у терминалу." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Надоградња Убунтуа на издање 11.10" + #~ msgid "%.0f kB" #~ msgstr "%.0f kB" diff -Nru update-manager-17.10.11/po/sv.po update-manager-0.156.14.15/po/sv.po --- update-manager-17.10.11/po/sv.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/sv.po 2017-12-23 05:00:38.000000000 +0000 @@ -5,11 +5,12 @@ # # $Id: sv.po,v 1.5 2005/04/04 08:49:52 mvogt Exp $ # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-23 17:17+0000\n" "Last-Translator: Arve Eriksson \n" "Language-Team: Swedish \n" @@ -22,7 +23,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -30,13 +31,13 @@ msgstr[1] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Server för %s" @@ -44,20 +45,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Huvudserver" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Anpassade servrar" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Kunde inte beräkna post för sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -65,11 +66,11 @@ "Kunde inte hitta några paketfiler. Kanske är detta inte en Ubuntu-skiva " "eller felaktig arkitektur?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Misslyckades med att lägga till cd-skivan" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -84,13 +85,13 @@ "Felmeddelandet var:\n" "\"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Ta bort paket i dåligt tillstånd" msgstr[1] "Ta bort paket i dåligt tillstånd" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -111,15 +112,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Servern kan vara överbelastad" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Trasiga paket" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -129,7 +130,7 @@ "fortsätter." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -150,11 +151,11 @@ " * Inofficiella programpaket som inte kommer från Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Det här är antagligen ett temporärt problem. Försök igen senare." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -162,16 +163,16 @@ "Rapportera felet via kommandot \"ubuntu-bug update-manager\" i terminalen om " "ingenting av detta gäller." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Kunde inte beräkna uppgraderingen" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Det gick inte att autentisera vissa paket" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -181,7 +182,7 @@ "nätverksfel. Det kan hjälpa med att försöka senare. Se nedan för en lista " "med icke-autentisierade paket." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -189,22 +190,22 @@ "Paketet \"%s\" är markerat för borttagning men det är svartlistat för att " "förhindra borttagning." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Det systemkritiska paketet \"%s\" har markerats för borttagning." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Försöker att installera svartlistade versionen \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Kan inte installera \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -213,11 +214,11 @@ "fel via \"ubuntu-bug update-manager\" i en terminal." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Kan inte gissa metapaket" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -231,15 +232,15 @@ " Installera först ett av paketen ovan med Synaptic eller apt-get innan du " "fortsätter." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Läser cache" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Kunde inte få exklusivt lås" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -247,11 +248,11 @@ "Det betyder oftast att en annan pakethanterare (som apt-get eller aptitude) " "redan kör. Stäng det programmet först." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Uppgradering över fjärranslutning stöds inte" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -265,11 +266,11 @@ "\n" "Uppgraderingen kommer att avbrytas nu. Prova utan ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Fortsätt köra under SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -287,11 +288,11 @@ "\".\n" "Vill du fortsätta?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Startar ytterligare sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -302,7 +303,7 @@ "på port \"%s\". Om någonting går fel med den körande ssh-sessionen kan du " "fortfarande ansluta till den nya.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -315,30 +316,30 @@ "kan öppna porten med t.ex.:\n" "\"%s\"" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Kan inte uppgradera" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" "En uppgradering från \"%s\" till \"%s\" stöds inte med det här verktyget." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Konfiguration av sandlåda misslyckades" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Det var inte möjligt att skapa sandlådsmiljön." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Sandlådsläge" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -353,18 +354,18 @@ "*Inga* ändringar som skrivs till en systemkatalog från och med nu tills " "nästa omstart kommer att sparas." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Din python-installation är skadad. Rätta till den symboliska länken \"/usr/" "bin/python\"." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Paketet \"debsig-verify\" är installerat" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -374,12 +375,12 @@ "Ta bort det med Synaptic eller \"apt-get remove debsig-verify\" först och " "kör uppgraderingen igen." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Kan inte skriva till \"%s\"" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -390,11 +391,11 @@ "Uppgraderingen kan inte fortsätta.\n" "Försäkra dig om att det går att skriva till systemkatalogen." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Inkludera de senaste uppdateringarna från Internet?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -415,16 +416,16 @@ "uppgraderingen.\n" "Om du svarar nej här kommer nätverket inte att användas alls." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "inaktiverad vid uppgradering till %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Hittade ingen giltig serverspegel" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -444,11 +445,11 @@ "Om du väljer \"Nej\" så kommer uppgraderingen att avbrytas." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Generera standardkällor?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -462,11 +463,11 @@ "Ska standardposter för \"%s\" läggas till? Om du väljer \"Nej\" så kommer " "uppgraderingen att avbrytas." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Förrådsinformationen är ogiltig" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -474,11 +475,11 @@ "Uppgradering av förrådsinformationen resulterade i en ogiltig fil, därför " "startas en felrapporteringsprocess." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Tredjepartskällor inaktiverade" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -488,13 +489,13 @@ "återaktivera dem efter uppgraderingen med verktyget \"software-properties\" " "eller med din pakethanterare." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Paket i inkonsekvent tillstånd" msgstr[1] "Paket i inkonsekvent tillstånd" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -513,11 +514,11 @@ "men inga arkiv kan hittas för dem. Installera om paketen manuellt eller ta " "bort dem från systemet." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Fel under uppdatering" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -526,13 +527,13 @@ "av nätverksproblem, var god kontrollera din nätverksanslutning och försök " "igen." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Inte tillräckligt med ledigt diskutrymme" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -547,21 +548,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Beräknar ändringarna" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Vill du starta uppgraderingen?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Uppgraderingen avbröts" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -570,12 +571,12 @@ "kommer att återställas. Du kan återuppta uppgraderingen vid en senare " "tidpunkt." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Det gick inte att hämta uppgraderingarna" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -586,27 +587,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Fel inträffade vid verkställandet" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Återställer ursprungligt systemtillstånd" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Det gick inte att installera uppgraderingarna" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -614,7 +615,7 @@ "Uppgraderingen har avbrutits. Ditt system kan befinna sig i ett oanvändbart " "tillstånd. En återställning kommer nu att köras (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -631,7 +632,7 @@ "i felrapporten.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -639,20 +640,20 @@ "Uppgraderingen har avbrutits. Kontrollera din internetanslutning eller " "installationsmedia och försök igen. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Ta bort föråldrade paket?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Behåll" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Ta bort" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -662,27 +663,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Nödvändiga beroenden är inte installerade" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Det nödvändiga beroendet \"%s\" är inte installerat. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Kontrollerar pakethanterare" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Förberedelse av uppgradering misslyckades" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -690,11 +691,11 @@ "Förberedelse av systemet för uppgradering misslyckades, därför startas en " "felrapporteringsprocess." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Hämtning av uppgraderingsförutsättningar misslyckades" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -707,70 +708,70 @@ "\n" "Dessutom startas en felrapporteringsprocess." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Uppdaterar förrådsinformation" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Misslyckades med att lägga till cd-rom-skivan" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Tyvärr, misslyckades med att lägga till cd-rom-skivan." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Ogiltig paketinformation" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Hämtar" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Uppgraderar" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Uppgraderingen är färdig" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "Uppgraderingen har färdigställts men det inträffade några fel under " "uppgraderingsprocessen." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Söker efter föråldrad programvara" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Systemuppdateringen är klar." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Den delvisa uppgraderingen färdigställdes." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms används" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -779,11 +780,11 @@ "Ditt system använder volymhanteraren \"evms\" i /proc/mounts. Programvaran " "\"evms\" stöds inte längre. Stäng av den och kör uppgraderingen igen." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "Ditt grafikkort kanske inte stöds fullt ut i Ubuntu 12.04 LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -795,9 +796,9 @@ "UpdateManagerWarningForI8xx för mer information. Vill du fortsätta med " "uppgraderingen?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -805,8 +806,8 @@ "Uppgradering kan minska skrivbordseffekter och prestandan i spel och andra " "grafikintensiva program." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -820,7 +821,7 @@ "\n" "Vill du fortsätta?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -834,11 +835,11 @@ "\n" "Vill du fortsätta?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Ingen i686-processor" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -850,11 +851,11 @@ "arkitektur. Det är inte möjligt att uppgradera ditt system till en ny Ubuntu-" "utgåva med denna maskinvara." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Ingen ARMv6-processor" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -866,11 +867,11 @@ "arkitektur. Det är inte möjligt att uppgradera ditt system till en ny Ubuntu-" "utgåva med denna hårdvara." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Ingen init finns tillgänglig" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -885,16 +886,16 @@ "\n" "Är du säker på att du vill fortsätta?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Sandlådsuppgradering med aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Använd angiven sökväg för att söka efter en cd-rom med uppgraderingspaket" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -902,58 +903,58 @@ "Använd gränssnitt: Tillgängliga för närvarande: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*FÖRÅLDRAD* denna flagga kommer att ignoreras" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Genomför endast en delvis uppgradering (ingen omskrivning av sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Inaktivera stöd för GNU screen" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Ange datakatalog" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Mata in \"%s\" i enheten \"%s\"" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Hämtningen är färdig" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Hämtar fil %li av %li med %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Ungefär %s återstår" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Hämtar fil %li av %li" @@ -963,27 +964,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Verkställer ändringar" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "beroendeproblem - lämnar okonfigurerad" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Kunde inte installera \"%s\"" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -995,7 +996,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1006,7 +1007,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1014,20 +1015,20 @@ "Du kommer att förlora de ändringar du har gjort i den här " "konfigurationsfilen om du väljer att ersätta den med en senare version." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Kommandot \"diff\" hittades inte" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Ett ödesdigert fel uppstod" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1039,13 +1040,13 @@ "din rapport. Uppgraderingen har avbrutits.\n" "Din ursprungliga sources.list sparades i /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c trycktes" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1054,135 +1055,135 @@ "sig i ett trasigt tillstånd. Är du säker på att du vill göra det?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "Stäng alla öppna program och dokument för att förhindra dataförlust." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Stöds inte längre av Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Nedgradera (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Ta bort (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Inte längre nödvändiga (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Installera (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Uppgradera (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Mediabyte" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Visa skillnader >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Dölj skillnader" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Fel" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Avbryt" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "S&täng" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Visa terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Dölj terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Information" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Mer information" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Stöds inte längre %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Ta bort %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Ta bort (var automatiskt installerad) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Installera %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Uppgradera %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Omstart krävs" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" "Starta om systemet för att färdigställa uppgraderingen" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Starta om nu" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1194,32 +1195,32 @@ "Systemet kan hamna i ett oanvändbart tillstånd om du avbryter " "uppgraderingen. Det rekommenderas starkt att du återupptar uppgraderingen." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Avbryt uppgradering?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li dag" msgstr[1] "%li dagar" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li timme" msgstr[1] "%li timmar" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minut" msgstr[1] "%li minuter" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1235,7 +1236,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1249,14 +1250,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1266,34 +1267,32 @@ "ungefär %s med ett 56k-modem." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Den här hämtningen kommer att ta ungefär %s med din anslutning. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Förbereder uppgradering" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Hämtar nya programvarukanaler" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Hämtar nya paket" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Installerar uppgraderingarna" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Rensar upp" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1310,28 +1309,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d paket kommer att tas bort." msgstr[1] "%d paket kommer att tas bort." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d nytt paket kommer att installeras." msgstr[1] "%d nya paket kommer att installeras." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d paket kommer att uppgraderas." msgstr[1] "%d paket kommer att uppgraderas." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1342,7 +1341,7 @@ "\n" "Du måste hämta totalt %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1350,7 +1349,7 @@ "Det kan ta flera timmar att installera uppgraderingen. När hämtningen har " "slutförts så kan processen inte avbrytas." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1358,16 +1357,16 @@ "Hämta och installera uppgraderingen kan ta flera timmar. När hämtningen har " "slutförts så kan processen inte avbrytas." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Borttagning av paketen kan ta flera timmar. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Programvaran på datorn är uppdaterad." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1375,37 +1374,37 @@ "Det finns inga tillgängliga uppgraderingar för ditt system. Uppgraderingen " "kommer nu att avbrytas." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Omstart krävs" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Uppgraderingen är klar och datorn behöver startas om. Vill du göra det nu?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "autentisera \"%(file)s\" mot \"%(signature)s\" " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "extraherar \"%s\"" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Det gick inte att köra uppgraderingsverktyget" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1413,35 +1412,35 @@ "Detta är sannolikt ett fel i uppgraderingsverktyget. Rapportera det som ett " "fel med hjälp av kommandot \"ubuntu-bug update-manager\"." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Uppgraderingsverktygets signatur" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Uppgraderingsverktyg" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Misslyckades med att hämta" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "Hämtningen av uppgraderingen misslyckades. Det kan vara ett problem med " "nätverket. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Autentisering misslyckades" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1449,13 +1448,13 @@ "Autentisering av uppgraderingen misslyckades. Det kan vara ett problem med " "nätverket eller med servern. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Misslyckades med att extrahera" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1463,13 +1462,13 @@ "Extraheringen av uppgraderingen misslyckades. Det kan vara ett problem med " "nätverket eller med servern. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Verifieringen misslyckades" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1477,15 +1476,15 @@ "Validering av uppgraderingen misslyckades. Det kan finnas ett problem i " "nätverket eller med servern. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Kan inte köra uppgraderingen" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1493,13 +1492,13 @@ "Detta inträffar oftast av ett system där /tmp är monterad som noexec. " "Montera om utan noexec och kör uppgraderingen igen." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Felmeddelandet är \"%s\"." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1511,73 +1510,73 @@ "har avbrutits.\n" "Din ursprungliga sources.list sparades i /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Avbryter" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Nedprioriterad:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Tryck på [ENTER] för att fortsätta" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Fortsätt [jN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Detaljer [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "j" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Stöds inte längre: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Ta bort: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Installera: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Uppgradera: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Fortsätt [Jn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1644,9 +1643,8 @@ msgstr "Uppgradering av distribution" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Uppgradering av Ubuntu till version 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Uppgraderar Ubuntu till version 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1664,84 +1662,85 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Vänta. Det här kan ta lite tid." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Uppdateringen är färdig" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Det gick inte att hitta versionsfaktan" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Servern kan vara överbelastad. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Det gick inte att hämta versionsfaktan" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Kontrollera din Internetanslutning." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Uppgradera" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Versionsfakta" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Hämtar ytterligare paketfiler..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Fil %s av %s i %s B/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Fil %s av %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Öppna länk i webbläsare" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Kopiera länk till urklipp" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Hämtar fil %(current)li av %(total)li med %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Hämtar fil %(current)li av %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Din Ubuntu-utgåva stöds inte längre." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1749,51 +1748,57 @@ "Du kommer inte att få några ytterligare säkerhetsuppdateringar eller " "kritiska uppdateringar. Uppgradera till en senare version av Ubuntu." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Uppgraderingsinformation" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Installera" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Namn" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "Ingen nätverksanslutning hittades. Du kan inte hämta ändringsloggen." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Hämtar lista över ändringar..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Avmarkera allt" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Markera _alla" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s uppdatering har markerats." +msgstr[1] "%(count)s uppdateringar har markerats." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s kommer att hämtas." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "Uppdateringen har redan hämtats men har inte installerats." msgstr[1] "Uppdateringarna har redan hämtats men har inte installerats." @@ -1801,11 +1806,18 @@ msgid "There are no updates to install." msgstr "Det finns inga uppdateringar att installera." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Okänd hämtningsstorlek." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1813,7 +1825,7 @@ "Det är inte känt när paketinformationen uppdaterades senast. Klicka på " "\"Kontrollera\"-knappen för att uppdatera informationen." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1823,14 +1835,14 @@ "Tryck på \"Kontrollera\"-knappen nedan för att leta efter nya " "programuppdateringar." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "Paketinformationen uppdaterades för %(days_ago)s dag sedan." msgstr[1] "Paketinformationen uppdaterades för %(days_ago)s dagar sedan." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1839,34 +1851,46 @@ msgstr[1] "Paketinformationen uppdaterades för %(hours_ago)s timmar sedan." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Paketinformationen uppdaterades senast för ungefär %s minuter sedan." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Paketinformationen har precis uppdaterats." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Programvaruuppdateringar rättar till fel, eliminerar säkerhetsproblem och " +"ger dig nya funktioner." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Programuppdateringar kan finnas tillgängliga för din dator." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Välkommen till Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Dessa programuppdateringar har kommit ut sedan denna version av Ubuntu " +"lanserades." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Programuppdateringar finns tillgängliga för denna dator." + +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1878,7 +1902,7 @@ "bort temporära paket från tidigare installationer med kommandot \"sudo apt-" "get clean\"." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1886,24 +1910,24 @@ "Datorn behöver startas om för att färdigställa installationen av " "uppdateringarna. Spara ditt arbete innan du fortsätter." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Läser paketinformation" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Ansluter..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Du kanske inte kan leta efter uppdateringar eller hämta nya uppdateringar." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Kunde inte initiera paketinformationen" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1916,7 +1940,7 @@ "Rapportera det här felet mot paketet \"update-manager\" och inkludera " "följande felmeddelande:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1928,31 +1952,31 @@ "Rapportera det här felet mot paketet \"update-manager\" och inkludera " "följande felmeddelande:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Ny installation)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Storlek: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Från version %(old_version)s till %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Version %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Uppgradering av utgåva är inte möjlig just nu" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1961,21 +1985,21 @@ "Uppgradering av utgåvan kan inte genomföras för närvarande. Försök igen " "senare. Servern rapporterade: \"%s\"" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Hämtar uppgraderingsverktyget för utgåvan" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Nya Ubuntu-utgåvan \"%s\" finns tillgänglig" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Programindexet är trasigt" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1985,6 +2009,17 @@ "pakethanteraren \"Synaptic\" eller kör \"sudo apt-get install -f\" i en " "terminal för att rätta till det här problemet först." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Nya utgåvan \"%s\" finns tillgänglig." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Avbryt" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Leta efter uppdateringar" @@ -1994,22 +2029,18 @@ msgstr "Installera alla tillgängliga uppdateringar" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Avbryt" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Ändringslogg" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Uppdaterar" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Bygger uppdateringslista" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2033,21 +2064,21 @@ " * Inofficiella programpaket som inte tillhandahållts av Ubuntu\n" " * Vanliga ändringar för en förutgåva av Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Hämtar ändringslogg" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Övriga uppdateringar (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" "Denna uppdatering kommer inte från en källa som har stöd för ändringsloggar." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2055,7 +2086,7 @@ "Misslyckades med att hämta listan över ändringar. \n" "Kontrollera din Internetanslutning." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2068,7 +2099,7 @@ "Tillgänglig version: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2081,7 +2112,7 @@ "Använd http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "tills ändringarna blir tillgängliga eller försök igen senare." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2094,52 +2125,43 @@ "Använd http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "tills ändringarna blir tillgängliga eller försök igen senare." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Misslyckades med att detektera distribution" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Ett fel \"%s\" inträffade vid kontroll av vilket system du använder." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Viktiga säkerhetsuppdateringar" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Rekommenderade uppdateringar" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Föreslagna uppdateringar" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Bakåtporteringar" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Uppdateringar för distribution" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Övriga uppdateringar" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Startar uppdateringshanteraren" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Programvaruuppdateringar rättar till fel, eliminerar säkerhetsproblem och " -"ger dig nya funktioner." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Delvis uppgradering" @@ -2212,37 +2234,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Programvaruuppdateringar" +msgid "Update Manager" +msgstr "Uppdateringshanterare" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Programvaruuppdateringar" +msgid "Starting Update Manager" +msgstr "Startar Uppdateringshanterare" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "U_ppgradera" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "uppdaterar" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Installera" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Ändringar" +msgid "updates" +msgstr "uppdaterar" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Beskrivning" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Beskrivning av uppdatering" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2250,25 +2262,35 @@ "Du är ansluten via roaming och kan få betala för det data som måste hämtas " "för denna uppdatering." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Du är ansluten via ett trådlöst modem." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Det är säkrare att ansluta datorn till en extern strömkälla innan " "uppdateringen påbörjas." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Installera uppdateringar" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Ändringar" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Inställningar..." +msgid "Description" +msgstr "Beskrivning" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Installera" +msgid "Description of update" +msgstr "Beskrivning av uppdatering" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Inställningar..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2293,9 +2315,8 @@ msgstr "Du valde att inte uppgradera till nya Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Du kan uppgradera vid en senare tidpunkt genom att öppna " @@ -2309,59 +2330,59 @@ msgid "Show and install available updates" msgstr "Visa och installera tillgängliga uppdateringar" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Visa version och avsluta" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Katalog som innehåller datafilerna" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Kontrollera om en ny Ubuntu-utgåva finns tillgänglig" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "Kontrollera om uppgradering till den senaste utvecklingsutgåvan är möjlig" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "Uppgradera med den senaste föreslagna versionen av utgåveuppgraderaren" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Fokusera inte på karta vid uppstart" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Prova att köra en dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Leta inte efter uppdateringar vid uppstart" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Testa uppgraderingen i en sandlåda" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Kör delvis uppgradering" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Visa paketets beskrivning istället för ändringsloggen" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Prova att uppgradera till senaste utgåvan med hjälp av uppgraderingen från " "$distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2371,11 +2392,11 @@ "För närvarande stöds endast \"desktop\" för vanliga uppgraderingar av ett " "skrivbordssystem samt \"server\" för serversystem." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Kör den angivna pakethanteraren" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2383,11 +2404,11 @@ "Kontrollera endast om en ny distributionsutgåva finns tillgänglig och " "rapportera resultatet via avslutningskoden" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Letar efter en ny Ubuntu-utgåva" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2395,68 +2416,68 @@ "För uppgraderingsinformation så kan du besöka:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Ingen ny utgåva hittades" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Nya utgåvan \"%s\" finns tillgänglig." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Kör \"do-release-upgrade\" för att uppgradera till den." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Uppgradering till Ubuntu %(version)s finns tillgänglig" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Du valde att inte uppgradera till Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Lägg till felsökningsutdata" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Visa installerade paket som saknar stöd" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Visa installerade paket som har stöd" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Visa alla paket med deras tillstånd" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Visa alla paket i en lista" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Sammandrag av supportstatus för \"%s\":" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "Du har %(num)s paket (%(percent).1f%%) som stöds till %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "Du har %(num)s paket (%(percent).1f%%) som inte (längre) kan hämtas" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "Du har %(num)s paket (%(percent).1f%%) som inte stöds" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2464,124 +2485,154 @@ "Kör med --show-unsupported, --show-supported eller --show-all för att se " "fler detaljer" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Inte längre möjliga att hämta:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Stöds inte: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Stöds till %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Stöds inte" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Oimplementerad metod: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "En fil på disken" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb-paket" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Installera saknat paket." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Paketet %s bör installeras." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb-paket" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s behöver markeras som manuellt installerat." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"Vid uppgradering, om kdelibs4-dev är installerat, så måste kdelibs5-dev " -"installeras. Se bugs.launchpad.net, felrapport 279621 för information." - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i föråldrade poster i statusfilen" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Föråldrade poster i dpkg-status" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Föråldrade dpkg-statusposter" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"Vid uppgradering, om kdelibs4-dev är installerat, så måste kdelibs5-dev " +"installeras. Se bugs.launchpad.net, felrapport 279621 för information." + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s behöver markeras som manuellt installerat." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Ta bort lilo eftersom grub även är installerat.(Se felrapport 314004 för " "information.)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Efter att din paketinformation uppdaterades så kan det systemkritiska " -#~ "paketet \"%s\" inte längre hittas, därför startas en " -#~ "felrapporteringsprocess." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Uppgraderar Ubuntu till version 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s uppdatering har markerats." -#~ msgstr[1] "%(count)s uppdateringar har markerats." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Välkommen till Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Dessa programuppdateringar har kommit ut sedan denna version av Ubuntu " -#~ "lanserades." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Programuppdateringar finns tillgängliga för denna dator." - -#~ msgid "Update Manager" -#~ msgstr "Uppdateringshanterare" - -#~ msgid "Starting Update Manager" -#~ msgstr "Startar Uppdateringshanterare" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Du är ansluten via ett trådlöst modem." - -#~ msgid "_Install Updates" -#~ msgstr "_Installera uppdateringar" +#~ "Efter att din paketinformation uppdaterades så kan det systemkritiska " +#~ "paketet \"%s\" inte längre hittas, därför startas en " +#~ "felrapporteringsprocess." #~ msgid "Checking for a new ubuntu release" #~ msgstr "Letar efter ny Ubuntu-utgåva" @@ -2653,6 +2704,9 @@ #~ "kan uppleva problem efter uppgraderingen. Vill du fortsätta med " #~ "uppgraderingen?" +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Uppgradering av Ubuntu till version 11.10" + #~ msgid "%.0f kB" #~ msgstr "%.0f kB" diff -Nru update-manager-17.10.11/po/ta_LK.po update-manager-0.156.14.15/po/ta_LK.po --- update-manager-17.10.11/po/ta_LK.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/ta_LK.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2011. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-10-18 00:27+0000\n" "Last-Translator: Ramesh \n" "Language-Team: Tamil (Sri-Lanka) \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "மெயின் சர்வர்" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Sources.list நுழைவு கணக்கிட முடியவில்லை" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "எந்த தொகுப்பு கோப்புகளையும் கண்டுபிடிக்க முடியவில்லை, ஒருவேளை இந்த ஒரு உபுண்டு டிஸ்க் " "அல்ல அல்லது தவறான கட்டமைப்பு" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "குறுவட்டு சேர்க்க தோல்வி" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -77,12 +78,12 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "மோசமான நிலையில் உள்ள தொகுப்பை நீக்கவும்" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -97,15 +98,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "சர்வர் ஓவர்லோட் இருக்கலாம்" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "சிதைந்த தொகுப்புகள்" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -115,7 +116,7 @@ "சரி செய்யவும்." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -128,65 +129,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "இது பெரும்பாலும் ஒரு நிலையற்ற பிரச்சனை, பின்னர் மீண்டும் முயற்சி செய்யுங்கள்." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "'%s' நிறுவமுடியவில்லை" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -195,25 +196,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -222,11 +223,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -237,11 +238,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -249,7 +250,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -258,29 +259,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -290,28 +291,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -319,11 +320,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -335,16 +336,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -357,11 +358,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -370,34 +371,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -410,23 +411,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "புதுப்பிக்கும் பொழுது பிழை ஏற்பட்டுள்ளது" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "வட்டில் போதுமான காலி இடம் இல்லை" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -437,32 +438,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -470,33 +471,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -507,26 +508,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -534,37 +535,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -572,79 +573,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "மேம்படுத்துகிறது" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "கணிணி மேம்பாடு முடிந்தது." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -652,16 +653,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -670,7 +671,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -679,11 +680,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -691,11 +692,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -703,11 +704,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -717,71 +718,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -791,27 +792,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "'%s' நிறுவ முடியவில்லை" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -821,7 +822,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -830,26 +831,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "'diff' என்ற கட்டளை இல்லை" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -857,147 +858,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "%s நிறுவு" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "%s மேம்படுத்து" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1005,32 +1006,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1046,7 +1047,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1060,14 +1061,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1075,34 +1076,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1115,28 +1114,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1144,145 +1143,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "மறு தொடக்கம் தேவைப்படுகிறது" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1290,73 +1289,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1414,7 +1413,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1433,133 +1432,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1567,31 +1574,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1600,34 +1614,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1635,29 +1657,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1666,7 +1688,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1674,58 +1696,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1735,22 +1767,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1764,26 +1792,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1792,7 +1820,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1801,7 +1829,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1810,47 +1838,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1911,56 +1933,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "%s நிறுவு" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "%s நிறுவு" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -1984,7 +2009,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1996,216 +2021,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/ta.po update-manager-0.156.14.15/po/ta.po --- update-manager-17.10.11/po/ta.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/ta.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-10-18 00:07+0000\n" "Last-Translator: mano-மனோ \n" "Language-Team: Tamil \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f மெபை" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s விற்கான சேவையகம்" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "மெயின் சர்வர்" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "தனிபயன் சேவையகங்கள்" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Sources.list நுழைவு கணக்கிட முடியவில்லை" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "எந்த தொகுப்பு கோப்புகளையும் கண்டுபிடிக்க முடியவில்லை, ஒருவேளை இந்த ஒரு உபுண்டு டிஸ்க் " "அல்ல அல்லது தவறான கட்டமைப்பு" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "குறுவட்டு சேர்க்க தோல்வி" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -77,13 +78,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "மோசமான நிலையில் இருக்கும் தொகுப்பை நீக்கவும்" msgstr[1] "மோசமான நிலையில் இருக்கும் தொகுப்புகளை நீக்கவும்" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -98,15 +99,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "சர்வர் ஓவர்லோட் இருக்கலாம்" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "சிதைந்த தொகுப்புகள்" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -116,7 +117,7 @@ "சரி செய்யவும்." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -129,65 +130,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "இது பெரும்பாலும் ஒரு நிலையற்ற பிரச்சனை, பின்னர் மீண்டும் முயற்சி செய்யுங்கள்." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "சிலத் தொகுப்புகளை அங்கீகரிப்பதில் பிழை" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "'%s' நிறுவமுடியவில்லை" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -196,25 +197,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -223,11 +224,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -238,11 +239,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -250,7 +251,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -259,29 +260,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "மேம்படுத்த முடியவில்லை" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -291,28 +292,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -320,11 +321,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -336,16 +337,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -358,11 +359,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -371,34 +372,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -411,23 +412,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "புதுப்பிக்கும் பொழுது பிழை ஏற்பட்டுள்ளது" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "வட்டில் போதுமான காலி இடம் இல்லை" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -438,32 +439,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "மேம்பாடு ரத்து செய்யப்பட்டுள்ளது" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "மேம்பாடுகளைப் பதிவிறக்க முடியவில்லை" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -471,33 +472,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "மேம்பாடுகளை நிறுவ முடியவில்லை" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -508,26 +509,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "வைத்துக்கொள்க (_K)" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "நீக்குக (_R)" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -535,37 +536,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -573,79 +574,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "களஞ்சியத்தின் தகவல் புதுப்பிக்கப்படுகிறது" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "தவறான தொகுப்பு தகவல்" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "மேம்படுத்துகிறது" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "மேம்படுத்துதல் முடிவடைந்தது" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "கணிணி மேம்பாடு முடிந்தது." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -653,16 +654,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -671,7 +672,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -680,11 +681,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -692,11 +693,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -704,11 +705,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -718,71 +719,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -792,27 +793,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "'%s' நிறுவ முடியவில்லை" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -822,7 +823,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -831,26 +832,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "'diff' என்ற கட்டளை இல்லை" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -858,147 +859,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "%s நிறுவு" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "%s மேம்படுத்து" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1006,32 +1007,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1047,7 +1048,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1061,14 +1062,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1076,34 +1077,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1116,28 +1115,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1145,145 +1144,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "மறு தொடக்கம் தேவைப்படுகிறது" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1291,73 +1290,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1415,7 +1414,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1434,133 +1433,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1568,31 +1575,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1601,34 +1615,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1636,29 +1658,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1667,7 +1689,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1675,58 +1697,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1736,22 +1768,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1765,26 +1793,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1793,7 +1821,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1802,7 +1830,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1811,47 +1839,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1912,56 +1934,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "%s நிறுவு" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "%s நிறுவு" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -1985,7 +2010,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1997,218 +2022,284 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" #~ msgid "%.0f kB" diff -Nru update-manager-17.10.11/po/te.po update-manager-0.156.14.15/po/te.po --- update-manager-17.10.11/po/te.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/te.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2007. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-04-16 09:21+0000\n" "Last-Translator: Praveen Illa \n" "Language-Team: Telugu \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "%(size).0f కిబై" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f మెబై" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s కొరకు సేవిక" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "ప్రధాన సేవిక" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "అనురూపిత సేవికలు" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "sources.list పద్దును గణించలేకపోతుంది" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "ఏ ప్యాకేజీ ఫైళ్ళను కనుగొనలేకపోతుంది, బహుశా ఇది ఉబుంటు డిస్కు కాకపోవడమో లేక వేరే నిర్మానానికి చెందినదై " "ఉండొచ్చు?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "CDని జతచేయుటలో విఫలమైంది" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -81,13 +82,13 @@ "దోష సందేశం ఏమిటంటే:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "పనికిరాని స్థితిలో ఉన్న ప్యాకేజీని తొలగించండి" msgstr[1] "పనికిరాని స్థితిలో ఉన్న ప్యాకేజీలను తొలగించండి" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -106,15 +107,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "సర్వర్ పై భారం ఎక్కువగా ఉన్నట్టుంది" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "విరిగిన ప్యాకేజీలు" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -123,7 +124,7 @@ "synaptic లేదా apt-get ను ఉపయోగించి వీటిని సరిచేయండి." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -143,26 +144,26 @@ "* ఉబుంటూ అందించని అనధికారిక సాఫ్టువేరు\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "ఇది బహుశః ఒక అశాశ్వత సమస్య, దయచేసి మళ్ళీ ప్రయత్నించండి." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "ఉన్నతీకరణను గణించడం వీలుకాదు" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "కొన్ని ప్యాకేజీలను ధృవీకరించుటలో దోషము" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -171,39 +172,39 @@ "కొన్ని ప్యాకేజీలను ధృవీకరించటం సాధ్యపడదు. ఇది ఒక అశాశ్వత నెట్వర్కు సమస్య కావచ్చు. మీరు తర్వాత మళ్ళీ " "ప్రయత్నించవచ్చు. ధృవీకరించని ప్యాకేజీల కోసం క్రింద జాబితా చూడండి." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "'%s' ప్యాకేజీ తొలగించడానికి గుర్తుపెట్టబడింది కాని ఇది తొలగింపు బ్లాక్ లిస్టులో ఉంది." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "ముఖ్యమైన ప్యాకేజి '%s' తొలగించుటకు గుర్తుపెట్టబడింది." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "బ్లాక్ లిస్ట్ చేయబడిన వెర్షను '%s'ను స్థాపించుటకు ప్రయత్నిస్తున్నారు" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "'%s'ను స్థాపించడం కుదరదు" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "meta-package ను నిదానించలేదు" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -216,15 +217,15 @@ " ముందుకు కొనసాగే ముందు, దయచేసి synaptic లేదా apt-get సహాయంతో, పై వాటిలో ఏదో ఒక ప్యాకేజీని " "ప్రతిష్టించండి." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "క్యాచీను చదువుతోంది" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "ప్రత్యేకమైన తాళాన్ని పొందలేకపోతుంది" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -232,11 +233,11 @@ "సాధారణంగా ఇది అంటే ముందే నడుస్తున్న మరో ప్యాకేజీ నిర్వహణ అనువర్తనము (apt-get లేదా aptitude " "లాగా). దయచేసి మొదట ఆ అనువర్తనమును మూసివేయండి." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "దూరస్థ అనుసంధానం మీదుగా ఉన్నతీకరించుటకు మద్ధతులేదు" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -249,11 +250,11 @@ "\n" "ఉన్నతీకరణ ఇక్కడితో ఆగిపోతుంది. దయచేసి ssh లేకుండా ప్రయత్నించండి." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "SSH క్రింద ఇంకా నడవాలా?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -269,11 +270,11 @@ "మీరు కొనసాగినట్టైతే, అదనపు ssh డీమన్ ను \"%s\" పోర్టు వద్ద పురిగొల్పుతాము.\n" "మీరు కొనసాగాలనుకుంటున్నారా?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "అదనపు sshd ని ప్రారంభిస్తోంది" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -283,7 +284,7 @@ "ఒక వేళ విఫలమైతే చేసే రికవరీని సులభం చేయడానికి, '%s' పోర్టుపై ఒక అదనపు sshd ప్రారంభమౌతుంది. ఒక వేళ " "నడుస్తున్నssh తో ఏదైనా తప్పు జరిగినప్పటికీ మీరు మరోదానితో అనుసంధానం చేయవచ్చు.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -292,29 +293,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "ఉన్నతీకరణ సాధ్యపడదు" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "ఈ సాధనంతో '%s' నుండి '%s' కి ఉన్నతీకరణ సాధ్యపడదు." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Sandbox అమరిక విఫలమైంది" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "స్యాండ్ బాక్ను ఆవరణను సృష్టించడం సాధ్యపడలేదు." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "సాండ్ బాక్స్ విధం" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -324,16 +325,16 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "మీ python స్థాపన చెడిపోయింది. దయచేసి '/usr/bin/python' లింకును సరిచేయండి." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "'debsig-verify' ప్యాకేజీ స్థాపించబడింది" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -343,12 +344,12 @@ "దయచేసి మొదట synaptic లేదా 'apt-get remove debsig-verify' సహాయంతో తొలగించి, ఉన్నతీకరణను " "మళ్ళీ నడపండి." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "'%s' కు వ్రాయుట వీలుకాదు" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -356,11 +357,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "ఇంటర్నెట్ నుండి సరిక్రొత్త నవీకరణలను కలపమందురా?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -372,16 +373,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "%s కి ఉన్నతీకరణ అచేతనమైంది" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "సరియైన మిర్రర్ కనపడలేదు" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -394,11 +395,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "అప్రమేయ మూలాధారాలను ఉత్పత్తిచేయమంటారా?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -407,34 +408,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "భండాగార సమాచారం చెల్లనిది" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "థర్డ్ పార్టీ మూలాధారాలు అచేతనంచేయబడినవి" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "అస్థిర స్థితిలో ప్యాకేజీ" msgstr[1] "అస్థిర స్థితిలో ప్యాకేజీలు" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -447,11 +448,11 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "నవీకరణ జరుగుతున్నపుడు దోషం" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -459,13 +460,13 @@ "నవీకరణ చేసేటప్పుడు ఒక సమస్య వచ్చింది. ఇది సాధారణంగా నెట్వర్క్ లాంటి సమస్య, దయచేసి మీ నెట్వర్క్ " "అనుసంధానాన్ని పరిశీలించి తిరిగి ప్రయత్నించండి." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "సరిపడినంత ఖాళీ డిస్కు స్థలము లేదు" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -476,32 +477,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "మార్పులను గణిస్తోంది" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "ఉన్నతీకరణను ప్రారంభించాలనుకుంటున్నారా?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "ఉన్నతీకరణ రద్దు చేయబడింది" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "ఉన్నతీకరణలను డౌన్‌లోడ్ చేయడం సాధ్యపడదు" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -509,27 +510,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "యదా విధంగా అసలు వ్యవస్థ స్థితికి వస్తోంది" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "ఉన్నతీకరణలు స్థాపించుటకు వీలుకాదు" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -537,7 +538,7 @@ "ఉన్నతీకరణ మధ్యలో రద్దుచేయబడింది. మీ వ్యవస్థ వాడటానికి వీలుకాని స్థితిలో ఉండవచ్చు. ఇపుడు ఒక రికవరీ " "నడుపబడుతుంది (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -548,7 +549,7 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -556,20 +557,20 @@ "ఉన్నతీకరణ మధ్యలో రద్దుచేయబడింది. దయచేసి మీ అంతర్జాల అనుసంధానాన్ని లేదా స్థాపక మాధ్యమాన్ని పరీక్షించి మరలా " "ప్రయత్నించండి. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "కాలంచెల్లిన ప్యాకేజీలను తొలగించాలా?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "ఉంచు(_K)" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "తొలగించు(_R)" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -577,37 +578,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "అవసరమైన అశ్రితాలు స్థాపించబడలేదు" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "కావలసిన అశ్రితం '%s' స్థాపించబడలేదు. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "ప్యాకేజీ నిర్వాహకి పరీక్షిస్తోంది" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "ఉన్నతీకరణకు సిద్ధంచేయుటలో విఫలమైంది" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -615,79 +616,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "భాండాగార సమాచారాన్ని నవీకరిస్తోంది" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "cdrom ని జతచేయుటలో విఫలమైంది" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "క్షమించండి, cdromని జతచేయుటలో విఫలమైనది." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "చెల్లని ప్యాకేజీ సమాచారం" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "సాధిస్తోంది" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "ఉన్నతీకరిస్తోంది" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "ఉన్నతీకరణ పూర్తియింది" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "ఉన్నతీకరణ పూర్తయింది కాని ఉన్నతీకరణ ప్రక్రియ జరుగుతుండగా కొన్ని దోషాలు సంభవించాయి." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "కాలంచెల్లిన సాఫ్ట్‍వేర్ కోసం వెతుకుతోంది" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "వ్యవస్థ ఉన్నతీకరణ పూర్తయింది." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "పాక్షిక ఉన్నతీకరణ పూర్తయింది." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms వాడుకలో ఉన్నాయి" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -695,9 +696,9 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -705,8 +706,8 @@ "ఉన్నతీకరించడం వలన డెస్క్ టాప్ ప్రభావాలు, మరియు ఆటలలో ప్రదర్శనను మరియు ఇతర గ్రాఫిక్స్ తో కూడిన పెద్ద " "ప్రోగాంల మీద ప్రభావం చూపి వాటి ప్రదర్శనను తగ్గించవచ్చు." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -719,7 +720,7 @@ "\n" "మీరు కొనసాగాలనుకుంటున్నారా?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -728,11 +729,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "i686 CPU లేదు" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -740,11 +741,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "ARMv6 CPU లేదు" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -752,11 +753,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "ఎటువంటి init లభ్యతలో లేదు" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -766,71 +767,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "aufs వాడి సాండ్‌బాక్స్ ఉన్నతీకరించు" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "కేవలం పాక్షిక ఉన్నతీకరణ మాత్రమే చేయి (no sources.list rewriting)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "GNU తెర మద్ధతును అచేతనంచేయి" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "datadir అమర్చు" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "తెచ్చుట పూర్తయింది" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "ఇంకా %s మిగిలిఉంది" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -840,27 +841,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "మార్పులను అనువర్తిస్తోంది" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "డిపెండెన్సి సమస్యలు - కాన్ఫిగర్ చేయకుండా వదిలివేస్తుంది" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "'%s' స్థాపించుట సాధ్యం కాదు" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -870,7 +871,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -879,26 +880,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "ఒక ఫెటల్ దోషం సంభవించింది" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -906,147 +907,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c నొక్కబడింది" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "డౌన్‌గ్రేడ్ (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "(%s) తొలగించు" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "ఇక ఏమాత్రం అవసరంలేనివి (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "(%s) స్థాపించు" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "(%s) ఉన్నతీకరించు" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "మీడియా మార్పు" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "తేడాను చూపించు >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< తేడాను దాచిపెట్టు" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "దోషం" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "రద్దుచేయి(&C)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "మూసివేయి(&C)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "టెర్మినల్ చూపించు >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< టెర్మినల్ దాచిపెట్టు" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "సమాచారం" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "వివరాలు" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "ఇక ఏమాత్రం తోట్పాటు లభించనివి %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "%s ని తొలగించు" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "%s తొలగించు (స్వ యంగా స్థాపించబడినది)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "%s స్థాపించు" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "%s ని నవీకరించు" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "పునఃప్రారంభం అవసరం" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "ఉన్నతీకరణ పూర్తిచేయుటకు వ్యవస్థను పునఃప్రారంభించు" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "ఇప్పుడు పున:ప్రారంభించు(_R)" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1058,32 +1059,32 @@ "ఒకవేళ మీరు ఉన్నతీకరణను రద్దుచేసినట్టయితే వ్యవస్థ వాడటానికి వీలులేని స్థితిలో ఉండొచ్చు. ఉన్నతీకరణ " "తిరిగికొనసాగించాలని మేము సలహాఇస్తున్నాం." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "ఉన్నతీకరణను రద్దుచేయాలా?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li రోజు" msgstr[1] "%li రోజులు" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li గంట" msgstr[1] "%li గంటలు" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li నిముషం" msgstr[1] "%li నిముషాలు" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1099,7 +1100,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1113,14 +1114,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1128,34 +1129,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "మీ అనుసంధానముతో దీనిని డౌన్‌లోడ్ చేయటానికి సుమారు %s తీసుకుంటుంది. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "ఉన్నతీకరణకు సిద్ధమవుతోంది" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "కొత్త సాఫ్ట్‍వేర్ ఛానళ్ళను పొందుతోంది" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "కొత్త ప్యాకేజీలను పొందుతోంది" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "ఉన్నతీకరణలు స్థాపించబడుతున్నాయి" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "శుభ్రపరుస్తోంది" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1168,28 +1167,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1197,145 +1196,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "మీ వ్యవస్థకు ఎటువంటి ఉన్నతీకరణలు అందుబాటులో లేవు. ఉన్నతీకరణ ఇపుడు రద్దుచేయబడుతుంది." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "రీబూట్ అవసరం" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "ఉన్నతీకరణ సాధనాన్ని నడుపుట వీలుకాదు" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "ఉన్నతీకరణ సాధనం సంతకం" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "ఉన్నతీకరణ సాధనం" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "తెచ్చుటలో విఫలమైంది" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "ధృవీకరణ విఫలమైంది" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "సంగ్రహించుటలో విఫలమైంది" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "ప్రమాణీకరణ విఫలమైంది" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "ఉన్నతీకరణని నడుపుట సాధ్యంకాదు" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "దోష సందేశమేమిటంటే '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1343,73 +1342,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "మధ్యలోరద్దుచేయబడుతోంది" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "కొనసాగు [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "వివరాలు [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "తొలగించు: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "స్థాపించు: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "ఉన్నతీకరించు: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "కొనసాగు [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1476,7 +1475,7 @@ msgstr "పంపిణీ ఉన్నతీకరణ" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1495,133 +1494,141 @@ msgid "Terminal" msgstr "టెర్మినల్" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "దయచేసి వేచియుండండి, కొంత సమయం పట్టవచ్చు." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "నవీకరణ పూర్తయింది" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "విడుదల నివేదికని కనుగొనలేకపోయింది" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "విడుదల నివేదికని డౌన్‌లోడ్ చేయుట సాధ్యపడదు" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "దయచేసి మీ అంతర్జాల అనుసంధానాన్ని సరిచూడండి." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "ఉన్నతీకరించు" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "విడుదల నివేదిక" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "అదనపు ప్యాకేజీ ఫైళ్ళను డౌన్‌లోడ్ చేస్తోంది..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "లింకును విహారిణిలో తెరువు" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "లింకును క్లిప్‌బోర్డునకు నకలుతీయి" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "మీ ఉబుంటు విడుదలకు ఇక ఏమాత్రంమద్ధతు ఉండదు." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "ఉన్నతీకరణ సమాచారం" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "స్థాపించు" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "వెర్షన్ %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "జాబితాలో మార్పులను డౌన్‌లోడ్ చేస్తోంది..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "అన్నిటిని ఎంపికచేయి (_A)" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s డౌన్‌లోడ్ చేయబడుతుంది." #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1629,31 +1636,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "డౌన్‌లోడ్ పరిమాణం తెలియదు." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "ప్యాకేజీ సమాచారం చివరిగా %(days_ago)s రోజుల క్రితం నవీకరించబడింది." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "ప్యాకేజీ సమాచారం చివరిగా %(days_ago)s రోజు క్రితం నవీకరించబడింది." msgstr[1] "ప్యాకేజీ సమాచారం చివరిగా %(days_ago)s రోజుల క్రితం నవీకరించబడింది." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1662,34 +1676,42 @@ msgstr[1] "ప్యాకేజీ సమాచారం చివరిగా %(hours_ago)s గంటల క్రితం నవీకరించబడింది." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "మీ కంప్యూటర్‌కు సాప్ట్‍వేర్ నవీకరణలు అందుబాటులో ఉండవచ్చు." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "ఉబుంటుకి స్వాగతం" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1697,7 +1719,7 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1705,23 +1727,23 @@ "నవీకరణలను పూర్తిచేయుటకు కంప్యూటర్ పునఃప్రారంభించవలసి ఉంటుంది. దయచేసి కొనసాగేముందు మీ పనిని " "భద్రపరుచుకోండి." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "ప్యాకేజీ సమాచారాన్ని చదువుతోంది" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "అనుసంధానించబడుతోంది..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "ప్యాకేజీ సమాచారాన్ని ప్రారంభించలేకపోతోంది" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1730,7 +1752,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1738,52 +1760,52 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (కొత్త స్థాపన)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(పరిమాణం: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "వెర్షన్ %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "విడుదల ఉన్నతీకరణ ఇపుడు సాధ్యపడదు" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "విడుదల ఉన్నతీకరణ సాధనాన్ని డౌన్‌లోడ్ చేస్తోంది" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "కొత్త ఉబుంటు విడుదల '%s' అందుబాటులో ఉంది" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "సాప్ట్‍వేర్ సూచిక విరిగినది" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1792,6 +1814,16 @@ "ఏ సాఫ్ట్‍వేర్‌నైనా స్థాపించుట లేదా తొలగించుట అసాధ్యం. దయచేసి ప్యాకేజీ నిర్వాహకి \"Synaptic\" వాడు లేదా మొదట " "ఈ విషయాన్ని పరిష్కరించుటకు టెర్మినల్‌లో ఈ ఆదేశాన్ని నడుపు\"sudo apt-get install -f\"" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "రద్దుచేయి" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1801,22 +1833,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "రద్దుచేయి" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "మార్పుచిట్టా" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "నవీకరణలు" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "నవీకరణల జాబితాను నిర్మిస్తోంది" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1830,26 +1858,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "ఇతర నవీకరణలు (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1858,7 +1886,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1867,7 +1895,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1876,50 +1904,43 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "ఏ పంపకమో కనిపెట్టుటలో విఫలమైంది" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "ముఖ్యమైన భద్రతా నవీకరణలు" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "సిఫారసుచేయబడిన నవీకరణలు" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "ప్రతిపాదిత నవీకరణలు" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "బ్యాక్‌పోర్టులు" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "పంపకము నవీకరణలు" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "ఇతర నవీకరణలు" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "నవీకరణ నిర్వాహకి ప్రారంభించబడుతోంది" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "పాక్షిక ఉన్నతీకరణ(_P)" @@ -1978,59 +1999,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "సాప్ట్‍వేర్ నవీకరణలు" +msgid "Update Manager" +msgstr "నవీకరణ నిర్వాహకం" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "సాప్ట్‍వేర్ నవీకరణలు" +msgid "Starting Update Manager" +msgstr "నవీకరణ నిర్వాహకం ప్రారంభించబడుతోంది" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "ఉన్నతీకరించు(_p)" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "నవీకరణలు" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "స్థాపించు" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "మార్పులు" +msgid "updates" +msgstr "నవీకరణలు" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "వివరణ" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "నవీకరణ యొక్క వివరణ" +msgid "You are connected via a wireless modem." +msgstr "మీరు వైరులేని మోడెమ్ ద్వారా అనుసంధానమయ్యారు." #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +msgid "_Install Updates" +msgstr "నవీకరణలను స్థాపించు(_I)" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." -msgstr "" +msgid "Changes" +msgstr "మార్పులు" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "అమరికలు... (_S)" +msgid "Description" +msgstr "వివరణ" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "స్థాపించు" +msgid "Description of update" +msgstr "నవీకరణ యొక్క వివరణ" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "అమరికలు... (_S)" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2054,7 +2075,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -2066,234 +2087,285 @@ msgid "Show and install available updates" msgstr "లభ్యతలో ఉన్న నవీకరణలను చూపించి స్థాపించు" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "కొత్త విడుదలలేమీ లేవు" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "డిస్కు మీద ఒక ఫైలు" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb ప్యాకేజీ" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "తప్పిపోయిన ప్యాకేజీని స్థాపించు." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "%s ప్యాకేజీ స్థాపించాల్సిఉంది." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb ప్యాకేజీ" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." +msgid "%i obsolete entries in the status file" +msgstr "" + +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "ఉబుంటుకి స్వాగతం" - -#~ msgid "Update Manager" -#~ msgstr "నవీకరణ నిర్వాహకం" - -#~ msgid "Starting Update Manager" -#~ msgstr "నవీకరణ నిర్వాహకం ప్రారంభించబడుతోంది" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "You are connected via a wireless modem." -#~ msgstr "మీరు వైరులేని మోడెమ్ ద్వారా అనుసంధానమయ్యారు." +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "నవీకరణలను స్థాపించు(_I)" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" #~ "This upgrade is running in sandbox (test) mode. All changes are written " diff -Nru update-manager-17.10.11/po/th.po update-manager-0.156.14.15/po/th.po --- update-manager-17.10.11/po/th.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/th.po 2017-12-23 05:00:38.000000000 +0000 @@ -4,11 +4,12 @@ # Roys Hengwatanakul , 2006. # Theppitak Karoonboonyanan , 2009. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-02-23 19:54+0000\n" "Last-Translator: Manop Pornpeanvichanon(มานพ พรเพียรวิชานนท์) \n" "Language-Team: Thai \n" @@ -21,7 +22,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -29,13 +30,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "เซิร์ฟเวอร์สำหรับ %s" @@ -43,30 +44,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "เซิร์ฟเวอร์หลัก" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "เซิร์ฟเวอร์กำหนดเอง" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "ไม่สามารถคำนวนรายการใน sources.list ได้" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "ไม่พบแพคเกจใดเลย บางทีนี่อาจไม่ใช่แผ่น Ubuntu หรือแผ่นอาจเสียหาย?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "ไม่สามารถเพิ่มซีดีได้" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -80,12 +81,12 @@ "ปัญหาคือ : \n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "ลบแพกเกจส่วนที่ใช้การไม่ได้" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -101,15 +102,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "เซิร์ฟเวอร์อาจทำงานหนักเกินไป" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "แพกเกจมีปัญหา" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -118,7 +119,7 @@ "หรือ apt-get ก่อนดำเนินการต่อไป" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -139,11 +140,11 @@ " * ไม่ใช่ซอฟต์แวร์แพคเกจที่มาจาก Ubuntu อย่างเป็นทางการ\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "ปัญหานี้ดูเหมือนว่าจะเป็นปัญหาชั่วคราว, กรุณาลองใหม่อีกครั้งภายหลัง" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -151,16 +152,16 @@ "หากไม่สามารถใช้ได้เลย กรุณารายงานข้อผิดพลาดนี้โดยใช้คำสั่ง 'ubuntu-bug update-manager' " "ในเทอร์มินัล" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "ไม่สามารถคำนวนการปรับปรุงได้" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "ผิดพลาดในการยืนยันของจริงในบางแพกเกจ" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -169,28 +170,28 @@ "ไม่สามารถยืนยันความถูกต้องของบางแพกเกจได้ นี่อาจเกี่ยวกับปัญหาด้านเครือข่าย " "คุณอาจลองอีกครั้งได้ในภายหลัง กรุณาตรวจดูรายการของแพกเกจที่ไม่ผ่านการยืนยัน" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "แพกเกจ '%s' ถูกกาไว้เพื่อถอดถอนแต่แพกเกจนี้อยู่ในรายชื่อที่ไม่ให้ลบออก" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "แพกเกจที่จำเป็น '%s' ถูกกำหนดไว้เพื่อลบออก" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "พยายามติดตั้งรุ่นที่ถูกขึ้นบัญชีดำ '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "ไม่สามารถติดตั้ง '%s' ได้" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -199,11 +200,11 @@ "ในเทอร์มินัล" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "ไม่สามารถเดาเมตาแพกเกจได้" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -216,15 +217,15 @@ " กรุณาติดตั้งแพกเกจด้านบนอย่างใดอย่างหนึ่งก่อนโดยใช้โปรแกรม Synaptic หรือ apt-get " "ก่อนจะดำเนินการต่อไป" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "กำลังอ่านแคช" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "ไม่สามารถเอาล็อคแต่ผู้เดียวได้" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -232,11 +233,11 @@ "ปกติแล้วหมายความว่ามีโปรแกรมจัดการแพ็กเกจอื่นๆ(เช่น apt-get หรือ aptitude) กำลังทำงานอยู่ " "กรุณาออกจากโปรแกรมนั้นก่อน" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "ไม่สนับสนุนการปรับรุ่นผ่านการติดต่อระยะไกล" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -249,11 +250,11 @@ "\n" "การปรับปรุ่นจะยกเลิกเดี๋ยวนี้ โปรดลองโดยไม่ใช้ SSH" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "ใช้งานภายใต้ SSH ต่อไปหรือไม่?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -269,11 +270,11 @@ "ถ้าคุณต้องการทำต่อ ให้เพิ่มที่ดีมอน ssh ด้วยพอร์ต '%s'\n" "คุณต้องการที่จะต่อหรือไม่" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "กำลังเพิ่ม sshd อีก" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -283,7 +284,7 @@ "เพื่อให้การกู้ระบบคืนสู่สภาพเดิมง่ายขึ้นในกรณีที่มีปัญหา โปรแกรมจะเริ่ม sshd อีกอันหนึ่งที่พอร์ต '%s' " "ถ้ามีปัญหาเกิดขึ้นกับโปรแกรม ssh ที่ใช้อยู่คุณยังสามารถติดต่อผ่านอีกอันหนึ่งได้\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -295,29 +296,29 @@ "เนื่องจากเป็นสิ่งที่ไม่ปลอดภัยถ้าทำการเปิดพอร์ตทำโดยอัตโนมัติ คุณสามารถเปิดพอร์ตด้วย\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "ไม่สามารถปรับปรุงรุ่น" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "เครื่องมือนี้ไม่รองรับการปรับปรุงรุ่นจาก '%s' ไปเป็น '%s'" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "การเตรียมกล่องทรายสำหรับทดลองมีปัญหา" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "ไม่สามารถสร้างสภาพแวดล้อมของกล่องทรายได้" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "แบบกล่องทรายสำหรับทดลอง" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -327,17 +328,17 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "โปรแกรม python ที่คุณติดตั้งไว้ไม่สามารถใช้ได้ กรุณาแก้ไข้ symlink '/usr/bin/python'" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "แพคเกจ 'debsig-verify' ถูกติดตั้งไว้แล้ว" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -346,12 +347,12 @@ "ไม่สามารถอัปเกรดต่อไปได้ถ้ามีแพคเกจนั้นติดตั้งอยู่.\n" "โปรดลบมันด้วย synaptic หรือ apt-get remove debsig-verify เสียก่อนแล้วอัปเกรดอีกครั้ง" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -359,11 +360,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "รวมการปรับปรุงล่าสุดจากอินเตอร์เน็ตด้วยหรือไม่?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -383,16 +384,16 @@ "แต่คุณควรจะทำการติดตั้งรุ่นล่าสุดโดยเร็วหลังจากเสร็จการปรับปรุงแล้ว\n" "ถ้าคุณเลือก 'ไม่' ระบบเครือข่ายอินเทอร์เน็ตจะไม่ถูกใช้เลย" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "หยุดใช้งานเมื่อปรับปรุงเป็น %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "ไม่เจอเซิรฟ์เวอร์เสริม(mirror)" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -411,11 +412,11 @@ "หากคุณเลือก 'ไม่' การปรับรุ่นที่จะยกเลิก" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "สร้าง default sources?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -427,21 +428,21 @@ "\n" "ควรเพิ่มรายการ '%s' หรือไม่? ถ้าคุณเลือก 'ไม่' กระบวนการปรับรุ่นจะถูกยกเลิก" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "ข้อมูลเกี่ยวกับแหล่งเก็บข้อมูลใช้ไม่ได้" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "แหล่งอื่นๆใช้ไม่ได้" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -451,12 +452,12 @@ "คุณสามารถเปลี่ยนให้ใช้ได้หลังการปรับปรุงด้วยเครื่องมือ 'software-properties' " "หรือด้วยโปรแกรมจัดการแพ็กเกจ" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "แพคเกจเกิดความขัดแย้ง" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -470,11 +471,11 @@ "แพคเกจ '%s' อยู่ในสถานะที่ไม่แน่นอนและต้องทำการติดตั้งใหม่ แต่ไม่สามารถหาข้อมูลเก่าได้ " "กรุณาติดตั้งใหม่อีกครั้งหรือลบออกจากระบบ" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "เกิดข้อผิดพลาดขณะปรับปรุง" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -482,13 +483,13 @@ "มีปัญหาเกิดขึ้นขณะทำการปรับปรุง โดยปกติจะเป็นปัญหาในระบบเครือข่าย " "กรุณาตรวจสอบการทำงานของระบบเครือข่ายแล้วลองใหม่อีกครั้ง" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "ไม่มีพื้นที่ว่างในดิสก์เพียงพอ" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -499,32 +500,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "กำลังคำนวนปริมาณการเปลี่ยนแปลง" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "คุณต้องการที่จะเริ่มการปรับปรุงหรือไม่?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "การปรับรุ่นถูกยกเลิก" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "การปรับรุ่นจะถูกยกเลิกเดี๋ยวนี้ และระบบดังเดิมจะถูกกู้คืน คุณสามารถปรับรุ่นต่อได้ในภายหลัง" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "ไม่สามารถดาวน์โหลดข้อมูลปรับปรุงรุ่น" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -534,33 +535,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "เกิดข้อผิดพลาดขณะแก้ไขปรับปรุง" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "คืนระบบสู่สถานะแรกเริ่ม" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "ไม่สามารถปรับปรุงได้" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -571,26 +572,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "การปรับรุ่นถูกเพิกเฉย โปรดตรวจสอบการเชื่อมต่ออินเทอร์เน็ต หรือสื่อที่ใช้ติดตั้งและลองใหม่ " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "ลบแพจเกจที่ล้าสมัยทิ้งหรือไม่?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "คงไว้" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "เอาออก" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -598,37 +599,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "โปรแกรมที่ต้องการไม่ได้ถูกติดตั้ง" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "โปรแกรม '%s' ที่ต้องการไม่ได้ถูกติดตั้ง " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "กำลังตรวจสอบโปรแกรมจัดการแพกเกจ" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "การเตรียมการปรับปรุงรุ่นมีปัญหา" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "เอาแพคเกจที่จำเป็นก่อนการปรับปรุงมาไม่ได้" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -636,68 +637,68 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "ปรับปรุงข้อมูลของแหล่งข้อมูล" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "เพิ่มแผ่นซีดีล้มเหลว" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "ขออภัยด้วย, ทำการเพิ่มแผ่นซีดีไม่สำเร็จ" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "ข้อมูลของแพกเกจไม่ถูกต้อง" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "กำลังดึงข้อมูล" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "กำลังปรับปรุง" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "ปรับปรุงเสร็จแล้ว" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "การปรับรุ่นสมบูรณ์ แต่เกิดข้อผิดพลาดในระหว่างขั้นตอนการปรับรุ่น" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "ค้นหาซอฟแวร์ที่ล้าสมัย" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "ปรับปรุงระบบเสร็จแล้ว" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "การปรับปรุงรุ่นบางส่วนเสร็จสมบูรณ์" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms ใช้งานอยู่" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -706,11 +707,11 @@ "ระบบของคุณใช้โปรแกรมจัดการโวลุ่ม 'evms' ใน /proc/mounts ซอฟต์แวร์ 'evms' " "ไม่มีการสนับสนุนแล้ว กรุณาหยุดใช้และทำการปรับปรุงใหม่อีกครั้ง" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -718,17 +719,17 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" "การปรับปรุงอาจจะลดลูกเล่นของพื้นโต๊ะ และประสิทธิภาพในเกมและโปรแกมอื่นๆ ที่ต้องใช้กราฟิกมาก" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -741,7 +742,7 @@ "\n" "คุณต้องการทำต่อ?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -754,11 +755,11 @@ "\n" "คุณต้องการทำต่อ?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "ไม่มี CPU i686" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -769,11 +770,11 @@ "แพคเกจทั้งหมดถูกสร้างขึ้นด้วยการเพิ่มประสิทธิภาพต้องเป็นสถาปัตยกรรม i686 น้อยที่สุด " "มันเป็นไปไม่ได้ที่จะปรุบรุ่นระบบ Ubuntu ของคุณกับฮาร์ดแวร์ใหม่นี้" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "ไม่พบ CPU ARMv6" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -781,11 +782,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "ไม่พบ init" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -795,15 +796,15 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "กล่องทรายทดลองปรับปรุงโดยใช้ aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "ใช้พาธ(path)ที่ให้ในการค้นหาซีดีรอมที่มีแพ็กเกจที่สามารถปรับปรุงได้" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -811,57 +812,57 @@ "ใช้ส่วนหน้า(frontend) ปัจจุบันมี่ให้เลือก: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*ไม่สนับสนุนให้ใช้* ตัวเลือกนี้จะไม่ถูกสนใจ" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "ทำการปรับปรุงบางส่วนเท่านั้น (sources.list จะไม่ถูกบันทึก)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "ปิดการทำงานหน้าจอ GNU" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "ตั้งค่า datadir" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "โปรดใส่ '%s' ลงใน '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "ดึงข้อมูลเสร็จสิ้นแล้ว" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "กำลังเอาไฟล์ที่ %li จากทั้งหมด %li ด้วยความเร็ว %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "เหลือประมาณ %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "กำลังดึงข้อมูลแฟ้ม %li จาก %li" @@ -871,27 +872,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "กำลังเปลี่ยนแปลง" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ - จะทิ้งไว้โดยไม่ตั้งค่า" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "ไม่สามารถติดตั้ง '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -903,7 +904,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -914,26 +915,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "คุณจะสูญเสียข้อมูลปรับแต่งที่ได้ทำไว้ในไฟล์ปรับแต่งถ้าคุณเลือกที่จะเปลี่ยนไปใช้ไฟล์รุ่นใหม่กว่านี้" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "ไม่เจอคำสั่ง 'diff'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "เกิดข้อผิดพลาดอย่างร้ายแรง" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -941,13 +942,13 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c ถูกกดแล้ว" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -956,134 +957,134 @@ "คุณแน่ใจหรือไม่ว่าจะหยุด?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "เพื่อป้องกันข้อมูลสูญหายกรุณาออกจากทุกโปรแกรมและเอกสารที่เปิดอยู่" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "เลิกให้การสนับสนุนโดย Canonical แล้ว (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "ปรับรุ่นลง (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "ถอดถอน (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "ไม่ต้องการอีกต่อไป (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "ติดตั้ง (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "ปรับรุ่น (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "เปลี่ยนสื่อ" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "แสดงความแตกต่าง >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< ซ่อนความแตกต่าง" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "ผิดพลาด" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&ยกเลิก" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&ปิด" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "แสดงเทอร์มินัล >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< ซ่อนเทอร์มินัล" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "รายละเอียด" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "รายละเอียด" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "เลิกให้การสนับสนุนแล้ว %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "ลบ %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "ถอดถอน %s (ที่ถูกติดตั้งโดยอัตโนมัติ)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "ติดตั้ง %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "ปรับปรุงรุ่น %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "ต้องการเริ่มระบบใหม่" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "เริ่มระบบใหม่เพื่อที่จะให้การปรับปรุงเสร็จสิ้น" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "เริ่มระบบใหม่เดี๋ยวนี้" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1094,29 +1095,29 @@ "\n" "ระบบของคุณจะอยู่ในสภาพที่ใช้การไม่ได้ถ้าคุณยกเลิกการปรับปรุง. ขอแนะนำให้ดำเนินการต่อไป" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "ยกเลิกการปรับปรุงรุ่นหรือไม่?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li วัน" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li ชั่วโมง" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li นาที" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1131,7 +1132,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1145,14 +1146,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1161,34 +1162,32 @@ "ดาวน์โหลดนี้จะใช้เวลาประมาณ %s ถ้าใช้สาย 1Mbit DSL หรือประมาณ %s ถ้าใช้ 56k โมเด็ม." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "การดาวน์โหลดนี้จะใช้เวลาประมาณ %s จากการเชื่อมต่อของคุณ " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "กำลังเตรียมการปรับปรุง" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "ตรวจหาช่องซอฟต์แวร์ใหม่" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "กำลังรับแพคเกจใหม่" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "กำลังทำการปรับปรุงรุ่น" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "กำลังเก็บกวาด" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1202,25 +1201,25 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d แพกเกจจะถูกลบออก" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d แพกเกจใหม่จะถูกติดตั้ง" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d แพกเกจจะถูกปรับปรุงรุ่น" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1231,133 +1230,133 @@ "\n" "คุณจะต้องดาวน์โหลดทั้งหมด %s " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "ไม่มีข้อมูลปรับปรุงรุ่นสำหรับระบบของคุณ การปรับปรุงรุ่นจึงถูกยกเลิก" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "ต้องเริ่มระบบใหม่" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "การปรับปรุงเสร็จสิ้นแล้วและต้องการที่จะเริ่มระบบใหม่ คุณต้องการที่จะทำเดี๋ยวนี้หรือเปล่า?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "ไม่สามารถเรียกใช้เครื่องมือปรับปรุง" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "รายเซ็นของเครื่องมือปรับปรุง" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "เครื่องมือปรับปรุงรุ่น" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "ไม่สามารถเอามาได้" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "ไม่สามารถดาวน์โหลดข้อมูลปรับปรุงได้ อาจจะเป็นปัญหาในเครือข่าย " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "ไม่สามารถยืนยันว่าเป็นของจริงได้" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "ยืนยันการปรับปรุงไม่สำเร็จ อาจจะมีปัญหาในเครือข่ายหรือที่เซิรฟ์เวอร์ " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "ไม่สามารถเอาออกมาได้" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "ไม่สามารถแกะข้อมูลปรับปรุงออกมาได้ อาจจะเป็นปัญหาในเครือข่ายหรือที่เซิรฟ์เวอร์ " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "การตรวจสอบล้มเหลว" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "ตรวจทานการปรับปรุงไม่สำเร็จ อาจจะมีปัญหาในเครือข่ายหรือที่เซิร์ฟเวอร์ " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "ไม่สามารถเริ่มโปรแกรมปรับปรุงได้" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1365,13 +1364,13 @@ "นี้มักจะเกิดโดยที่ระบบ /tmp เชื่อมต่อด้วย noexec โปรดเชื่อมต่อใหม่โดยไม่ต้องใช้ noexec " "และเรียกใช้ปรับรุ่นอีกครั้ง" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "ข้อผิดพลาดคือ '%s'" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1379,73 +1378,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "กำลังยกเลิก" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "ปรับลง:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "ทำต่อโปรดกด [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "ดำเนินการต่อไป[ชม] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "รายละเอียด[ร]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "ช" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "ม" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "ร" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "เลิกให้การสนับสนุนแล้ว: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "ลบออก: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "ติดตั้ง: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "ปรับปรุง: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "ทำต่อไป [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1510,9 +1509,8 @@ msgstr "ปรับปรุงชุดเผยแพร่" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "กำลังปรับรุ่น Ubuntu ไปเป็นรุ่น 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1530,165 +1528,179 @@ msgid "Terminal" msgstr "เทอร์มินัล" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "กรุณารอสักครู่ นี่อาจจะใช้เวลาสักหน่อย" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "ปรับปรุงเสร็จสิ้นแล้ว" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "ไม่สามารถหาบันทึกการปล่อย" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "เซิรฟ์เวอร์อาจจะทำงานเกินพิกัด " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "ไม่สามารถดาวน์โหลดบันทึกการปล่อย" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณ" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "ปรับปรุง" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "บันทึกรายการปรับปรุง" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "กำลังดาวน์โหลดไฟล์ของแพคเกจเพิ่มเติม..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "ไฟล์ที่ %s จากทั้งหมด %s ด้วยความเร็ว %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "ไฟล์ที่ %s จากทั้งหมด %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "เปิดลิงก์ในเบราว์เซอร์" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "คัดลอกลิงก์ไปที่คลิปบอร์ด" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" "กำลังดาวน์โหลดไฟล์ที่ %(current)li จากทั้งหมด %(total)li ด้วยความเร็ว %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "กำลังดาวน์โหลดไฟล์ที่ %(current)li จากทั้งหมด %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Ubuntu รุ่นที่คุณใช้ไม่ให้การสนับสนุนอีกต่อไป" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "ข้อมูลการปรับรุ่น" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "ติดตั้ง" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "รุ่น %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "ไม่พบการเชื่อมต่อเครือข่าย คุณจะไม่สามารถดาวน์โหลดข่าวสารการเปลี่ยนแปลง" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "กำลังดาวน์โหลดรายการของการเปลี่ยนแปลง..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "ไ_ม่เลือกทั้งหมด" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "เลือก_ทั้งหมด" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s การปรับปรุ่งถูกเลือกแล้ว" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s จะถูกดาวน์โหลด" #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "การปรับปรุงได้ดาวน์โหลดแล้ว แต่ยังไม่ได้ติดตั้ง" +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "ไม่ทราบขนาดดาวน์โหลด" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "ข่าวสารของแพกเกจถูกปรับปรุงล่าสุด %(days_ago)s วันมาแล้ว" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1696,34 +1708,42 @@ msgstr[0] "ข่าวสารของแพกเกจถูกปรับปรุงล่าสุด %(hours_ago)s ชัวโมงมาแล้ว" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "ข่าวสารของแพกเกจนี้ถูกปรับปรุงแล้ว" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "ซอฟแวร์ปรับปรุงแก้ปัญหา,กำจัดจุดอ่อนด้านความปลอดภัยและเพิ่มความสามารถใหม่" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "คอมพิวเตอร์ของคุณสามารถปรับรุ่นซอฟต์แวร์ได้แล้ว" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "ยินดีต้อนรับสู่อูบุนตู" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1733,30 +1753,30 @@ "การปรับปรุงต้องการเนื้อที่ว่างทั้งหมด %s ในดิสก์ '%s'. กรุณาหาพื้นที่ว่างเพิ่มอีก %s ในดิสก์ '%s'. " "เทถังขยะทิ้งและลบแพคเกจเก่าๆจากการติดตั้งครั้งก่อนโดยใช้คำสั่ง 'sudo apt-get clean'." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" "ต้องการเริ่มระบบใหม่หลังการติดตั้งส่วนปรับปรุงเสร็จสิ้น กรุณาบันทึกงานของท่านก่อนดำเนินการต่อไป" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "กำลังอ่านข้อมูลของแพคเกจ" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "กำลังเชื่อมต่อ..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "คุณอาจจะตรวจสอบการปรับปรุงหรือดึงการปรับปรุงใหม่ลงมาไม่ได้" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "ไม่สามารถอ่านข้อมูลเริ่มต้นของแพ็กเกจ" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1768,7 +1788,7 @@ "\n" "กรุณารายงานปัญหานี้สำหรับแพคเกจ 'update-manager' และแนบข้อผิดพลาดต่อไปนี้มาด้วย:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1779,52 +1799,52 @@ "\n" "กรุณารายงานปัญหานี้สำหรับแพคเกจ 'update-manager' และแนบข้อผิดพลาดต่อไปนี้มาด้วย:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (ติดตั้งใหม่)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(ขนาด: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "จากรุ่น %(old_version)s ไปเป็น %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "รุ่น %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "ยังไม่พร้อมที่จะปรับรุ่นในตอนนี้" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "กำลังดาวน์โหลดเครื่องมือปรับรุ่น" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Ubuntu รุ่นใหม่ '%s' ออกแล้ว" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "ดัชนีของซอฟแวร์เสียหาย" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1833,6 +1853,17 @@ "ไม่สามารถที่จะติดตั้งหรือลบออกซอฟแวร์ใดๆ กรุณาใช้โปรแกรมจัดการแพกเกจ \"Synaptic\" หรือ " "คำสั่ง \"sudo apt-get install -f\" ในเทอร์มินัลเพื่อที่จะแก้ปัญหานี้ก่อน" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "มี '%s' รุ่นใหม่ที่ใช้ได้" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "ยกเลิก" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "ตรวจการปรับปรุง" @@ -1842,22 +1873,18 @@ msgstr "ติดตั้งการปรับปรุงที่มีทั้งหมด" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "ยกเลิก" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "กำลังสร้างรายการที่ต้องปรับปรุง" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1881,20 +1908,20 @@ " * ซอฟต์แวร์แพคเกจที่ไม่ได้มาจากอูบุนตูอย่างเป็นทางการ\n" " * การปรับปรุงแบบปกติของรุ่นก่อนออกใช้ของอูบุนตู" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "กำลังดาวน์โหลดบันทึกของการปรับเปลี่ยน" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "การปรับปรุงอื่นๆ (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -1902,7 +1929,7 @@ "ไม่สามารถดาวน์โหลดรายการของการเปลี่ยนแปลง \n" "กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณ" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1915,7 +1942,7 @@ "รุ่นที่มีให้: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1928,7 +1955,7 @@ "กรุณาดูที่ http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "จนกว่าจะมีข้อมูลใหม่หรือลองอีกครั้งหลังจากนี้สักพัก" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1941,50 +1968,43 @@ "กรุณาดูที่ http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "จนกว่ารายการเปลี่ยนแปลงจะมีให้ดูได้หรือลองใหม่อีกครั้งหลังในภายหลัง" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "ไม่สามารถตรวจพบชุดแจกจ่าย" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "มีปัญหา '%s' เกิดขึ้นขณะตรวจสอบว่าคุณใช้ระบบอะไร" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "ปรับปรุงด้านความปลอดภัยที่สำคัญ" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "การปรับปรุงที่แนะนำให้ทำ" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "การปรับปรุงที่เสนอให้ทำ" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "พอร์ตย้อนหลัง" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "ปรับปรุงชุดเผยแพร่" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "_ปรับปรุงอื่นๆ" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "เริ่มโปรแกรมจัดการปรับปรุง" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "ซอฟแวร์ปรับปรุงแก้ปัญหา,กำจัดจุดอ่อนด้านความปลอดภัยและเพิ่มความสามารถใหม่" - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "ปรับปรุงรุ่นบางส่วน" @@ -2047,59 +2067,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "ซอฟต์แวร์ปรับปรุง" +msgid "Update Manager" +msgstr "โปรแกรมจัดการปรับปรุง" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "ซอฟต์แวร์ปรับปรุง" +msgid "Starting Update Manager" +msgstr "กำลังเริ่มโปรแกรมจัดการการปรับปรุง" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "ปรับปรุง" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "ปรับปรุง" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "ติดตั้ง" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "เปลี่ยนแปลง" +msgid "updates" +msgstr "ปรับปรุง" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "คำบรรยาย" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "รายละเอียดของการปรับปรุง" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "คุณเชื่อมต่อผ่านโรมมิงและอาจจะมีค่าใช้จ่ายสำหรับการส่งผ่านข้อมูลการปรับรุ่น" -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "คุณกำลังเชื่อมต่อผ่านโมเดมไร้สาย" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "จะเป็นการปลอดภัยกว่าถ้าต่อคอมพิวเตอร์ของคุณเข้ากับแหล่งจ่ายไฟก่อนเริ่มทำการปรับปรุง" +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "ติดตั้งปรับปรุง" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "เปลี่ยนแปลง" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_ตั้งค่า..." +msgid "Description" +msgstr "คำบรรยาย" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "ติดตั้ง" +msgid "Description of update" +msgstr "รายละเอียดของการปรับปรุง" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_ตั้งค่า..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2122,9 +2142,8 @@ msgstr "คุณได้ตัดสินใจไม่ปรับรุ่น Ubuntu เป็นรุ่นใหม่" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "คุณสามารถปรับรุ่นได้ในภายหลังโดยการเปิดตัวจัดการการปรับรุ่นและคลิกที่\"ปรับรุ่น\"" @@ -2136,56 +2155,56 @@ msgid "Show and install available updates" msgstr "แสดงและปรับปรุงทั้งหมดที่มี" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "แสดงรุ่นและออกจากโปรแกรม" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "ไดเรกทอรีมีแฟ้มข้อมูล" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "ตรวจสอบหารุ่นใหม่ของ Ubuntu" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "ตรวจสอบว่าสามารถปรับปรุงไปสู่รุ่นพัฒนาล่าสุด(latest devel release)ได้หรือไม่" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "ปรับปรุงโดยใช้รุ่นล่าสุด ที่เสนอโดยตัวปรับรุ่น" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "ไม่ต้องโฟกัสบนแผนที่เมื่อกำลังเริ่มขึ้น" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "พยายามเริ่ม dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "ไม่ต้องตรวจสอบการปรับปรุงเมื่อเริ่มเครื่อง" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "ทดลองการปรับปรุงด้วย sandbox aufs overlay" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "เริ่มการปรับปรุงรุ่นบางส่วน" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "ทดลองอัพเกรดเป็นรุ่นล่าสุดด้วยตัวอัปเกรดจาก $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2195,21 +2214,21 @@ "ขณะนี้สามารถใช้ 'desktop' สำหรับการอัปเกรดปกติของระบบ Desktop และ 'server' " "สำหรับระบบแม่ขาย" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "เริ่มส่วนหน้า(frontend)ที่กำหนดไว้" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "ตรวจสอบเฉพาะตอนมีรุ่นใหม่ออกและรายงานผลผ่านทางรหัสออก" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2217,167 +2236,211 @@ "สำหรับข้อมูลการปรับรุ่น โปรดดู:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "ไม่เจอรุ่นล่าสุด" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "มี '%s' รุ่นใหม่ที่ใช้ได้" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "เรียก 'do-release-upgrade' เพื่อที่จะทำการปรับปรุง" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Ubuntu %(version)s สามารถปรับรุ่นได้แล้ว" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "คุณได้ตัดสินใจไม่ปรับเป็นรุ่น Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "วิธีที่ยังไม่ได้พัฒนา: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "ไฟล์ในดิสก์" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb แพคเกจ" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "ติดตั้งแพคเกจที่หายไป" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "ควรติดตั้งแพคเกจ %s" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb แพคเกจ" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s ต้องถูกกำหนดไว้ให้ติดตั้งด้วยตนเอง" - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"เมื่อทำการปรับรุ่น, ถ้า kdelibs4-dev ได้ถูกติดตั้งอยู่แล้ว, kdelibs5-dev จะถูกติดตั้งด้วย. ดูที่ " -"bugs.launchpad.net, ข้อผิดพลาดที่ #279621 สำหรับรายละเอียด" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i รายการที่ล้าสมัยในไฟล์สถานะ" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "รายการที่ล้าสมัยใน dpkg สถานะ" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "รายการของ dpkg สถานะที่ล้าสมัย" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" -msgstr "เอา lilo ออกเพราะ grub ถูกติดตั้งด้วย (กรุณาดูรายละเอียด bug #314004)" +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"เมื่อทำการปรับรุ่น, ถ้า kdelibs4-dev ได้ถูกติดตั้งอยู่แล้ว, kdelibs5-dev จะถูกติดตั้งด้วย. ดูที่ " +"bugs.launchpad.net, ข้อผิดพลาดที่ #279621 สำหรับรายละเอียด" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s การปรับปรุ่งถูกเลือกแล้ว" +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s ต้องถูกกำหนดไว้ให้ติดตั้งด้วยตนเอง" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +msgstr "เอา lilo ออกเพราะ grub ถูกติดตั้งด้วย (กรุณาดูรายละเอียด bug #314004)" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "ยินดีต้อนรับสู่อูบุนตู" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Update Manager" -#~ msgstr "โปรแกรมจัดการปรับปรุง" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "Starting Update Manager" -#~ msgstr "กำลังเริ่มโปรแกรมจัดการการปรับปรุง" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "You are connected via a wireless modem." -#~ msgstr "คุณกำลังเชื่อมต่อผ่านโมเดมไร้สาย" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "ติดตั้งปรับปรุง" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" #~ "This upgrade is running in sandbox (test) mode. All changes are written " @@ -2415,9 +2478,16 @@ #~ msgid "There are no updates to install" #~ msgstr "ไม่มีการปรับปรุงที่จะติดตั้ง" +#~ msgid "The update has already been downloaded, but not installed" +#~ msgid_plural "The updates have already been downloaded, but not installed" +#~ msgstr[0] "การปรับปรุงได้ดาวน์โหลดแล้ว แต่ยังไม่ได้ติดตั้ง" + #~ msgid "Your graphics hardware may not be fully supported in Ubuntu 11.04." #~ msgstr "อุปกรณ์แสดงผลของคุณอาจจะสนับสนุน Ubuntu 11.04 ได้ไม่เต็มที่" +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "กำลังปรับรุ่น Ubuntu ไปเป็นรุ่น 11.10" + #~ msgid "" #~ "The support in Ubuntu 11.04 for your intel graphics hardware is limited " #~ "and you may encounter problems after the upgrade. Do you want to continue " diff -Nru update-manager-17.10.11/po/tl.po update-manager-0.156.14.15/po/tl.po --- update-manager-17.10.11/po/tl.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/tl.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2011-05-11 19:04+0000\n" "Last-Translator: Ariel S. Betan \n" "Language-Team: Tagalog \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Server para sa %s" @@ -42,20 +43,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Pangunahing server" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Custom servers" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Hindi makalkula ang sources.list entry" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -63,11 +64,11 @@ "Hindi makita ang lokasyon ng alin mang files ng pakete, malamang na hindi " "ito isang Disc pang-Ubuntu o mali ang arkitektura?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Hindi naidagdag ang CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,13 +83,13 @@ "Ang error message ay:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Tanggalin ang paketeng nasa di-mabuting katayuan" msgstr[1] "Tanggalin ang mga paketeng nasa di-mabuting katayuan" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -103,15 +104,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Maaaring overloaded ang server" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Sirang mga pakete" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -121,7 +122,7 @@ "pamamagitan ng synaptic o apt-get bago magpatuloy." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -134,13 +135,13 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Malaki ang posibilidad na ito ay pansamantalang problema lamang, Mangyaring " "subukan sa muling pagkakataon." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -148,16 +149,16 @@ "Kung wala rito ang maaaring gamitin, mangyaring iulat ito bilang isang bug " "gamit ang command na 'ubuntu-bug update-manager' sa isang terminal." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Hindi matantiya ang laki ng upgrade" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Error sa pagtiyak na tama ang ilang mga pakete" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -167,7 +168,7 @@ "pansamantalang problema sa network. Maari mong subukang muli mamaya. Tingnan " "sa ibaba ang listahan ng hindi matiyak na mga pakete." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -175,22 +176,22 @@ "Ang paketeng '%s' ay minarkahan upang tanggalin ngunit ito'y nasa blacklist " "ng mga tatanggalin." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Ang kailangang paketeng '%s' ay minarkahang tatanggalin." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Tinatangkang i-install ang blacklisted na bersyong '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Hindi ma-install '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -199,11 +200,11 @@ "bilang isang bug gamit ang 'ubuntu-bug update-manager' sa isang terminal." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Hindi malaman ang meta-pakete" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -217,15 +218,15 @@ " Pinakikiusap na mag-install muna ng isa sa mga nabanggit na pakete sa " "pamamagitan ng synaptic o apt-get bago magpatuloy." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Nagbabasa ng cache" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Hindi makuha ang exclusive lock" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -234,11 +235,11 @@ "application (tulad ng apt-get o aptitude) ang tumatakbo na. Paki-sara muna " "ang application na iyon." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Ang pag-upgrade para sa remote na koneksyon ay hindi suportado" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -247,11 +248,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Ituloy ang pagpapatakbo sa ilalim ng SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -262,11 +263,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Nagbubukas ng karagdagang sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -274,7 +275,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -283,31 +284,31 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Hindi ma-upgrade" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" "Ang pag-upgrade mula '%s' tungong '%s' ay hindi sinusuportahan ng tool na " "ito." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Bigo ang pag-setup ng Sandbox" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Hindi posible ang pag-likha ng sandbox environment" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Nasa modang Sandbox" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -317,18 +318,18 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Ang python install ay nasira. Mangyari lamang na ayusin ang '/usr/bin/" "python' symlink." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Ang paketeng 'debsig-verify' ay naka-install" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -338,12 +339,12 @@ "Mangyari lamang na tanggalin muna ito sa pamamagitan ng synaptic o 'apt-get " "remove debsig-verify' at patakbuhin muli." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -351,11 +352,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Isama ang pinakabagong mga updates mula sa Internet?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -367,16 +368,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "disabled ang upgrade sa %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Walang makitang tamang mirror" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -389,11 +390,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Lilikha ng default sources?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -402,21 +403,21 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Hindi balido ang impormasyon sa sisidlan" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Hindi muna pinagana ang third party sources" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -426,13 +427,13 @@ "mong i-re-enable sila pagkatapos ng upgrade sa: 'software-properties' tool o " "sa package manager." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Paketeng wala sa maayos na kalagayan" msgstr[1] "Mga paketeng wala sa maayos na kalagayan" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -445,11 +446,11 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Error habang nag-a-update" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -458,13 +459,13 @@ "sa network, pinakikiusap na suriin ang inyong network connection at subukang " "muli." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Hindi sapat ang libreng disk space" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -475,32 +476,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Tinatantya ang mga pagbabago" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Gusto mo na bang simulan ang upgrade?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Kinansela ang upgrade" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Hindi ma-download ang mga upgrades" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -508,33 +509,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Error sa pagtakda" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Ibinabalik sa orihinal na kalagayang sistema" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Hindi ma-install ang mga upgrades" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -545,26 +546,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Tanggalin ang mga luma at hindi na kailangang pakete?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Itira" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Tanggalin" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -574,37 +575,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Kailangang depends ay hindi na install" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Ang kinakailangang dependency '%s' ay hindi naka-intall. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Sinusuri ang manager ng pakete" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Nabigo sa paghahanda ng upgrade" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Nabigo sa pagkuha ng mga pre-requisite pangupgrade" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -612,79 +613,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Ina-update ang impormasyon ng sisidlan" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Hindi balidong impormasyon ng pakete" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Kinukuha" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Nag-a-upgrade" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Kumpleto na ang pag-upgrade" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Naghahanap ng luma at hindi na kailangang software" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Kumpleto na ang pagupgrade sa sistema" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Natapos na ang partial upgrade" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms na gamit" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -692,9 +693,9 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -702,8 +703,8 @@ "Maaaring mabawasan ang desktop effects, at performance ng mga games at iba " "pang graphically intensive programs." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -712,7 +713,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -721,11 +722,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -733,11 +734,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Walang ARMv6 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -745,11 +746,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Walang init na available" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -759,17 +760,17 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Upgrade ng Sandbox gamit ang aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Gamitin ang binigay na path para hanapin ang cdrom na may mga babaguhing " "pakete" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -777,58 +778,58 @@ "Gamitin ang frontend. Kasalukuyang maaaring gamitin: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Magsagawa ng partial upgrade lamang (walang muling pagsulat sa sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Itakda ang datadir" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Mangyari na ipasok ang '%s' sa drive '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Ang pagkuha ay tapos na" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Kinukuha ang file %li ng %li sa %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Mga %s ang nalalabi" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Kinukuha file %li of %li" @@ -838,27 +839,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Ina-aplay ang mga pagbabago" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "problema sa dependensiya - iniwanang hindi nakaayos" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Hindi ma-install ang '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -870,7 +871,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -881,7 +882,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -889,20 +890,20 @@ "Mawawala ang mga pagbabagong ginawa mo sa configuration file na ito kapag " "pinili mong palitan ito ng bagong bersyon." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Hindi makita ang 'diff' command" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "isang matinding error ang naganap" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -910,13 +911,13 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c napindot" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -925,137 +926,137 @@ "maayos na estado. Talaga bang nais mong isagawa ito?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Upang maiwasan ang pagkawala ng data isara muna ang mga nakabukas na " "applications at dokumento." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Binagong Media" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Ipakita ang Kaibahan >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Itago Kaibahan" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Mali" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Kanselahin" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Isara" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Ipakita Terminal >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Itago Terminal" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Impormasyon" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Mga Detalye" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Tanggalin %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Tinanggal (dating auto installed) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "I-install ang %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "I-upgrade ang %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Nangangailangan ng pag-restart" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" "I-restart ang sistema upang makumpleto ang pag-upgrade" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_I-restart Ngayon" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1063,32 +1064,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Itigil ang Upgrade" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li araw" msgstr[1] "%li mga araw" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li oras" msgstr[1] "%li mga oras" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li minuto" msgstr[1] "%li mga minuto" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1104,7 +1105,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1118,14 +1119,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1133,34 +1134,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Ang download na ito ay tatagal ng mga %s sa inyong connection. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Naghahanda para sa upgrade" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Kumkuha ng mga bagong software channels" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Kumukuha ng mga bagong pakete" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Nag-i-install ng mga upgrades" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Naglilinis" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1173,28 +1172,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d pakete ay tatanggalin." msgstr[1] "%d mga pakete ay tatanggalin." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d bagong pakete ang i-install." msgstr[1] "%d bagong mga pakete ang i-install." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d pakete ang i-upgrade." msgstr[1] "%d mga pakete ang i-upgrade." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1205,109 +1204,109 @@ "\n" "Kailangang mag-download ng total na %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "Wala pang upgrade na para sa inyong sistema. Ititigil na ang upgrade." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Nangangailangan ng pag reboot" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Natapos na ang pag-upgrade at nangangailangan ng pag-reboot. Gusto mo bang " "gawin na ito ngayon?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Hindi mapatakbo ang upgrade tool" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Signature ng upgrade tool" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Upgrade tool" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Bigo sa pag-fetch" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Bigo sa pag-fetch ng upgrade. Maaaring may problema sa network. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Bigo sa awtentikasyon." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "Bigo sa awtentikasyon. Maaaring may problema sa network o server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Bigo sa pag-extract" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1315,13 +1314,13 @@ "Bigo sa pag-extract ng upgrade. Maaaring may problema sa network o sa " "server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Bigo ang pag-beripika" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1329,27 +1328,27 @@ "Tinitiyak na bigo ang upgrade. Maaaring may suliranin sa network o sa " "server. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Hindi mapatakbo ang proseso ng pagbabago" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Ang mensahe ng pagkakamali ay '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1357,73 +1356,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Hihinto" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Ibinaba:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Itutuloy [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Mga Detalye [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Tanggalin: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Install ang: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "I-upgrade ang: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Ipagpatuloy muli? [Oh] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1487,7 +1486,7 @@ msgstr "PagUpgrade ng Distribution" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1506,166 +1505,180 @@ msgid "Terminal" msgstr "Terminal" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Mangyaring maghintay, matatagalan pa." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Kumpleto na ang pag-update" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Hindi makita ang mga release notes" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Maaaring overloaded ang server. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Hindi ma-download ang mga release notes" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Mangyaring suriin ang inyong internet connection" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "I-Upgrade" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Release Notes" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Kinukuha ang mga karagdagang files ng pakete" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "File %s ng %s sa %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "File %s ng %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Buksan ang link sa Browser" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Kopyahin ang Link sa Clipboard" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Nagda-Download ng file %(current)li ng %(total)li ng may %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Nagda-Download ng file %(current)li ng %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Impormasyon sa upgrade" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "I-install" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Bersyon %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Kinukuha ang listahan ng mga pagbabago" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "Maaaring overloaded ang server. " -msgstr[1] "Maaaring overloaded ang server. " +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1674,34 +1687,44 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Itinatama ng software updates ang mga error, tinatanggal ang mga kahinaang " +"pangseguridad at nagbibigay ng mga bagong features." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Tuloy kayo sa Ubuntu" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1709,7 +1732,7 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1717,23 +1740,23 @@ "Kailangang i-restart ang kompyuter upang ituloy at tapusin ang pag-install " "ng mga updates. Manyari lamang na i-save ang inyong ginagawa bago magpatuloy." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Binabasa ang impormasyon ng pakete" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Hindi ma-initialize ang impromasyon ng pakete" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1742,7 +1765,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1750,52 +1773,52 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Bagong install)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Laki: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Mula sa bersyon %(old_version)s papuntang %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Bersyon %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Dina-download ang release upgrade tool" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Bagong Ubuntu release '%s' ay meron na" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Sira ang software index" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1805,6 +1828,17 @@ "gamitin ang manedyer pang-paketeng \"Synaptic\" o patakbuhin ang \"sudo apt-" "get install -f\" sa isang terminal upang maisaayos muna." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Mayroon ng bagong release '%s'." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Huwag ituloy" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1814,22 +1848,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Huwag ituloy" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Binubuo ang listahan ng mga Updates" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1843,20 +1873,20 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Dina-download ang changelog" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Iba pang mga updates (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -1864,7 +1894,7 @@ "Bigo sa pag-download ng talaan ng mga pagbabago. \n" "Pinakikiusap na suriin ang inyong internet connection." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1873,7 +1903,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1882,7 +1912,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1891,53 +1921,44 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Bigo sa pag-alam ng distribusyon" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" "Isang error '%s' ang naganap habang sinusuri ang ginagamit mong sistema." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Mahalagang updates pangseguridad" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Mga inirerekomendang update" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Mga iminumungkahing update" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Mga backport" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Mga update para sa distribution" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Iba pang mga update" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Sinisimulan ang Update Manager" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Itinatama ng software updates ang mga error, tinatanggal ang mga kahinaang " -"pangseguridad at nagbibigay ng mga bagong features." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Partial na Upgrade" @@ -2002,59 +2023,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Software Updates" +msgid "Update Manager" +msgstr "Manedyer pang Update" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Software Updates" +msgid "Starting Update Manager" +msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "U_pgrade" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "mga update" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "I-install" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Mga pagbabago" +msgid "updates" +msgstr "mga update" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Deskripsiyon" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Deskripsiyon ng update" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Install ang mga Updates" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Mga pagbabago" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "" +msgid "Description" +msgstr "Deskripsiyon" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "I-install" +msgid "Description of update" +msgstr "Deskripsiyon ng update" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2077,9 +2098,8 @@ msgstr "Hindi mo tinanggap ang alok na na mag-upgrade sa bagong Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Maaari kang mag-upgrade sa ibang pagkakataon sa pamamagitan ng pagbukas ng " @@ -2093,58 +2113,58 @@ msgid "Show and install available updates" msgstr "Ipakita at i-install ang mga available na updates" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Ipakita ang bersyon at tapusin na" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Direktoryo na naglalaman ng mga data files" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Tingnan kung mayroong bagong release ng Ubuntu" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Tignan kung ang pag-upgrade sa pinakabagong devel release ay maaari" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Huwag mag-focus sa mapa habang nag-sisimula" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Subukang magpatakbo ng dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Tumatakbong bahagiang upgrade" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Subukang mag-upgrade sa pinakabagong release gamit ang upgrader mula $distro-" "proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2154,174 +2174,231 @@ "Kasalukuyang 'desktop' para sa mga regular na upgrades ng isang sistemang " "desktop at 'server' para sa sistemang server na suportado." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Patakbuhin ang piniling frontend" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Walang nakitang bagong release" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Mayroon ng bagong release '%s'." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Patakbuhin ang 'do-release-upgrade' upang mag-upgrade patungo sa dito." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Mayroong Ubuntu %(version)s Upgrade" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Isang file sa disk" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "paketeng .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Dapat -install ang Paketeng %s." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "paketeng .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "Kailangang markahan na manually installed ang %s" - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i mga lumang entries ang nasa status file" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Mga lumang entries sa dpkg status" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Mga lumang dpkg status entries" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "Kailangang markahan na manually installed ang %s" + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Tanggalin ang lilo dahil naka-install din ang grub.(Basahin ang bug #314004 " "para sa mga detalye.)" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Tuloy kayo sa Ubuntu" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Update Manager" -#~ msgstr "Manedyer pang Update" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "_Install ang mga Updates" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "Checking for a new ubuntu release" #~ msgstr "Tinitiyak kung may bagong release na ubuntu" diff -Nru update-manager-17.10.11/po/tr.po update-manager-0.156.14.15/po/tr.po --- update-manager-17.10.11/po/tr.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/tr.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-04-09 21:39+0000\n" "Last-Translator: Hasan Yılmaz \n" "Language-Team: Turkish \n" @@ -20,20 +21,20 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" msgstr[0] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s sunucusu" @@ -41,20 +42,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Ana sunucu" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Özel sunucular" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "'sources.list' girdisi hesaplanamadı" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -62,11 +63,11 @@ "Hiçbir paket dosyası bulunamadı, bu bir Ubuntu Diski olmayabilir ya da " "işlemci mimarisi yanlış seçilmiş olabilir mi?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "CD ekleme başarısız oldu" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -81,12 +82,12 @@ "Hata iletisi:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Hatalı durumdaki paketi kaldır" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -103,15 +104,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Sunucu aşırı yüklenmiş olabilir" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Bozuk paketler" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -120,7 +121,7 @@ "etmeden önce lütfen bunları Synaptic veya apt-get kullanarak düzeltin." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -140,12 +141,12 @@ "* Ubuntu tarafından sağlanmamış resmi olmayan yazılım paketleri\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" "Bu geçici bir sorun gibi gözüküyor, lütfen daha sonra tekrar deneyiniz." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -153,16 +154,16 @@ "Eğer bunlardan hiçbiri uygulanamazsa, lütfen bu hatayı 'ubuntu-bug update-" "manager' kodunu bir uçbirim içerisinde çalıştırarak bildirin." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Yükseltme hesaplanamadı" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Bazı paketlerin doğrulanmasında hata oluştu" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -172,7 +173,7 @@ "tekrar deneyebilirsiniz. Doğrulanamamış paketlerin listesi için aşağıya " "bakınız." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -180,22 +181,22 @@ "'%s' paketi kaldırılması için işaretlenmiş ancak paket kaldırma kara listesi " "içinde." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Temel '%s' paketi kaldırılma için işaretlenmiş." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Kara listede olan '%s' sürümü yüklenmeye çalışılıyor" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Yüklenemiyor: '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -204,11 +205,11 @@ "bug update-manager' komutunu kullanarak hata olarak raporlayınız." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Üstveri-paketi tahmin edilemiyor" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -221,15 +222,15 @@ " Lütfen devam etmeden önce, synaptic veya apt-get kullanarak yukarıdaki " "paketlerden birini kurun." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Önbellek okunuyor" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Özel kilide erişilemiyor" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -237,11 +238,11 @@ "Bu, genelde başka bir paket yönetimi uygulamasının (apt-get ya da aptitude " "gibi) zaten çalıştığı anlamına gelir. Lütfen öncelikle bu uygulamayı kapatın." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Uzaktan bağlantı ile yükseltme desteklenmiyor" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -254,11 +255,11 @@ "beraber metin tabanlı bir yükseltme deneyin.\n" "Yükseltme işlemi iptal edilecek. Lütfen ssh kullanmadan tekrar deneyin." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "SSH altında çalışmaya devam edilsin mi?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -276,11 +277,11 @@ "başlatılacak.\n" "Devam etmek istiyor musunuz?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Yeni bir sshd başlatılıyor" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -291,7 +292,7 @@ "başlatılacak. Eğer çalışmakta olan ssh ile ilgili herhangi bir sorun " "oluşursa ek birine bağlanabilirsiniz.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -304,29 +305,29 @@ "açılmaz. Bağlantı noktasını bu şekilde açabilirsiniz:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Yükseltilemiyor" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Bu araçla, '%s' sürümünden '%s' sürümüne bir yükseltme desteklenmiyor." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Çalışma dizini kurulumu başarısız" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Çalışma dizini ortamı oluşturmak mümkün değil." -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Çalışma dizini kipi" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -341,18 +342,18 @@ "Bir sonraki yeniden başlatmaya kadar şu andan itibaren sistem dizinlerinde " "yapılacak *hiçbir* değişiklik kalıcı olmayacak." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Python kurulumunuzda hata var. Lütfen '/usr/bin/python' sembolik bağını " "onarın." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "'debsig-verify' paketi kuruldu" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -362,12 +363,12 @@ "Lütfen önce synaptic veya 'apt-get remove debsig-verify' ile paketi kaldırın " "ve yükseltmeyi tekrar çalıştırın." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Üzerine yazılamıyor: '%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -377,11 +378,11 @@ "'%s' sistem hedef dizini yazılamıyor. Güncelleme devam edemeyecek.\n" "Lütfen dosyanın yazılabilir olduğuna emin olun." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "İnternetteki en son güncelleştirmeler de eklensin mi?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -402,16 +403,16 @@ "edilir.\n" "Eğer cevabınız 'hayır' ise, ağ bağlantısı kullanılmadan devam edilecek." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "%s yükseltmesi iptal edildi." -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Geçerli yansı bulunamadı" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -430,11 +431,11 @@ "Eğer 'Hayır' seçerseniz yükseltme iptal edilecek." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Öntanımlı depolar oluşturulsun mu?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -447,11 +448,11 @@ "'%s' için öntanımlı kayıtlar eklensin mi? Eğer 'Hayır' seçerseniz, yükseltme " "iptal edilecek." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Depo bilgisi geçersiz" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -459,11 +460,11 @@ "Depo bilgisinin yükseltilmesi geçersiz bir dosya ile sonuçlandı bu yüzden " "bir hata raporu oluşturuluyor." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Üçüncü taraf kaynaklar devre dışı bırakıldı" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -473,12 +474,12 @@ "getirildi. Yükseltmenin ardından bu girdileri 'Yazılım Kaynakları' aracını " "ya da paket yöneticinizi kullanarak yeniden etkinleştirebilirsiniz." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Paket tutarsız durumda" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -493,11 +494,11 @@ "bir arşiv bulunamadı. Lütfen paketi elle tekrar kurun ya da sistemden " "kaldırın." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Güncelleştirme sırasında hata" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -505,13 +506,13 @@ "Güncelleştirme sırasında bir hata oluştu. Bu genellikle bir ağ sorunudur, " "lütfen ağ bağlantınızı denetleyin ve tekrar deneyin." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Yeterince boş disk alanı yok" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -526,21 +527,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Değişiklikler hesaplanıyor" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Yükseltmeyi başlatmak istiyor musunuz?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Yükseltmeden vazgeçildi" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -548,12 +549,12 @@ "Güncelleme iptal edilecek ve sistem eski haline döndürülecek. Sonraki bir " "zamanda güncellemeye devam edebilirsiniz." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Yükseltmeler indirilemedi" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -564,27 +565,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "İşlem sırasında hata oluştu" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Özgün sistem durumuna geri dönülüyor" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Yükseltmeler kurulamadı" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -592,7 +593,7 @@ "Yükseltme iptal edildi. Sisteminiz kullanılmaz bir durumda olabilir. Şimdi " "bir kurtarma işlemi çalıştırılacak (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -609,7 +610,7 @@ "in /var/log/dist-upgrade/ adresine gidin.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -617,20 +618,20 @@ "Yükseltme iptal edildi. İnternet bağlantınızı veya kurulum ortamınızı " "denetleyip tekrar deneyin. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Kullanılmayan paketler kaldırılsın mı?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Koru" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Kaldır" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -640,27 +641,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Gerekli bağımlılıklar kurulu değil" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Gerekli bağımlılık '%s' kurulu değil. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Paket yöneticisi denetleniyor" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Yükseltme işlemine hazırlanma başarısız oldu" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -668,11 +669,11 @@ "Sistemi yükseltme girişimi başarısız oldu bu yüzden bir hata raporu " "oluşturuluyor." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Güncelleme önkoşullarının alınması başarısız" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -684,68 +685,68 @@ "\n" "Buna ek olarak, hata raporu oluşturuluyor." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Depo bilgisi güncelleştiriliyor" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Cdrom eklenmesi başarısız" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Üzgünüz, cdrom ekleme işlemi başarılı değil." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Geçersiz paket bilgisi" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Getiriliyor" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Yükseltiliyor" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Yükseltme tamamlandı" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "Yükseltme tamamlandı fakat yükseltme esnasında bazı hatalar oluştu." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Kullanılmayan yazılımlar aranıyor" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Sistem yükseltmesi tamamlandı." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Kısmi yükseltme tamamlandı." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms kullanımda" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -755,12 +756,12 @@ "'evms' yazılımı artık desteklenmiyor, lütfen 'evms'yi kapattıktan sonra, bu " "bittiğinde yükseltmeyi yeniden çalıştırın." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "Ekran kartınız Ubuntu 12.04 sürümünde tam olarak desteklenmiyor olabilir." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -773,9 +774,9 @@ "UpdateManagerWarningForI8xx bağlantısına göz atınız. Yükseltmeye devam etmek " "istiyor musunuz?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -783,8 +784,8 @@ "Yükseltme, masaüstü efektlerini, oyunların ve diğer yoğun grafik kullanan " "uygulamaların başarımını düşürebilir." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -797,7 +798,7 @@ "\n" "Devam etmek istiyor musunuz?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -810,11 +811,11 @@ "\n" "Devam etmek istiyor musunuz?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "i686 işlemci bulunamadı" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -826,11 +827,11 @@ "iyileştirilerek inşa edilmiştir. Bu donanımla yeni bir Ubuntu sürümüne " "yükseltme yapmanız mümkün değildir." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "ARMv6 İşlemci Yok" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -842,11 +843,11 @@ "ile oluşturulmuştur. Bu donanım ile, sisteminizi yeni bir Ubuntu sürümüne " "yükseltmek mümkün değil." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Başlatıcı mevcut değil" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -860,16 +861,16 @@ "öncelikle sanal makinenizin ayarlarını güncelleştirmeniz gerekiyor.\n" "Devam etmek istediğinizden emin misiniz?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Çalışma dizini yükseltmesi 'aufs' kullanıyor" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "Yükseltilebilir paketler içeren bir cdrom'u aramak için verilen yolu kullan" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -877,58 +878,58 @@ "Önyüzü kullan. Şu anda kullanılabilir olanlar: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*DEPRECATED* bu seçenek gözardı edilebilir" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" "Yalnızca kısmi bir yükseltme gerçekleştir (sources.list yeniden yazılmaz)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "GNU ekran desteğini devre dışı bırak" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Veri dizinini ayarla" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Lütfen \"%2s\" sürücüsüne \"%1s\" takın" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Getirme tamamlandı" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Getirilen dosya: %li / %li Hız: %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Yaklaşık %s kaldı" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Getirilen dosya: %li / %li" @@ -938,27 +939,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Değişiklikler uygulanıyor" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "bağımlılık sorunları - yapılandırılmadan çıkılıyor" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Kurulamadı: '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -970,7 +971,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -981,7 +982,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -989,20 +990,20 @@ "Eğer bu yapılandırma dosyasını yeni sürümüyle değiştirecekseniz bu dosyaya " "yapmış olduğunuz değişiklikleri kaybedeceksiniz." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "\"diff\" komutu bulunamadı" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Ölümcül bir hata oluştu" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1015,13 +1016,13 @@ "Özgün sources.list dosyanız /etc/apt/sources.list.distUpgrade konumuna " "kaydedildi." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c basıldı" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1030,135 +1031,135 @@ "yapmak istediğinizden emin misiniz ?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "Veri kaybını önlemek için açık olan tüm uygulamaları ve belgeleri kapatın." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Canonical tarafından artık desteklenmiyor (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Sürüm Düşürme (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Kaldır (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Artık gereksinim duyulmuyor (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Kur (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Yükselt (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Ortam Değişimi" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Farkı Göster >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Farkı Gizle" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Hata" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Vazgeç" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Kapat" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Uçbirimi Göster >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Uçbirimi Gizle" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Bilgi" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Ayrıntılar" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Artık desteklenmiyor: %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "_Kaldır %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Kaldır (otomatik olarak kurulmuş): %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Yükle: %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Yükselt: %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Yeniden başlatma gerekiyor" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Yükseltmeyi tamamlamak için sistemi yeniden başlatın" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "Şimdi _Yeniden Başlat" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1169,29 +1170,29 @@ "Yükseltmeden vazgeçerseniz sistem kulanılamaz duruma gelebilir. Yükseltmeye " "devam etmenizi öneriyoruz." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Yükseltmeden Vazgeç?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li gün" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li saat" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li dakika" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1206,7 +1207,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1220,14 +1221,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1237,35 +1238,33 @@ "yaklaşık %s sürecektir." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" "Bu indirme işlemi sizin bağlantınızla yaklaşık olarak %s kadar sürecektir. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Yükseltmeye hazırlanıyor" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Yeni yazılım kanalları alınıyor" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Yeni paketler alınıyor" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Yükseltmeler yükleniyor" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Temizleniyor" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1279,25 +1278,25 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d paket kaldırılacak." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d yeni paket kurulacak." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d paket yükseltilecek." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1308,7 +1307,7 @@ "\n" "Toplam %s indirmeniz gerekmektedir. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1316,7 +1315,7 @@ "Yükseltme kurulumu birkaç saat alabilir. İndirme tamamlandıktan sonra işlem " "iptal edilemez." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1324,16 +1323,16 @@ "Yükseltmeyi indirme ve yükleme işlemi birkaç saat sürebilir. İndirme " "tamamlandıktan sonra işlem iptal edilemez." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Paketleri kaldırmak birkaç saat alabilir. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Bu bilgisayardaki yazılımlar günceldir." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1341,38 +1340,38 @@ "Sisteminiz için olası herhangi bir yükseltme yok. Yükseltme işlemi şimdi " "iptal edilecek." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Sistemi yeniden başlatmanız gerekiyor" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Yükseltme tamamlandı. Sistemi yeniden başlatmanız gerekiyor. Bunu şimdi " "yapmak ister misiniz?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "'%(file)s' dosyasını '%(signature)s' karşı yetkilendir " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "çıkartılıyor: '%s'" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Yükseltme aracı çalıştırılamadı." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1380,33 +1379,33 @@ "Bu büyük olasılıkla yükseltme aracında bir hata. Lütfen 'ubuntu-bug update-" "manager' komutunu kullanarak bunu bir hata olarak raporlayınız." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Yükseltme aracı imzası" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Yükseltme aracı" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "İndirme başarısız" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Yükseltme indirilemedi. Ağda bir sorun olabilir. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Kimlik denetimi başarısız oldu" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1414,40 +1413,40 @@ "Yükseltme için kimlik doğrulama başarısız oldu. Ağda veya sunucuda bir sorun " "olabilir. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Çıkarılamadı" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" "Yükseltme çıkartılamadı. Ağ veya sunucu ile ilgili bir sorun olabilir. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Doğrulama başarısız oldu" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "Yükseltme onaylanamadı. Ağda ya da sunucuda bir sorun olabilir. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Yükseltme çalıştırılamıyor" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1456,13 +1455,13 @@ "kaynaklanır. Lütfen noexec olmadan yeniden bağlayınız ve yükseltmeyi tekrar " "çalıştırınız." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Hata iletisi '%s'" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1475,73 +1474,73 @@ "Özgün sources.list dosyanız /etc/apt/sources.list.distUpgrade konumuna " "kaydedildi." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "İptal Ediliyor" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Kaldırıldı:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Devam etmek için lütfen [ENTER] tuşuna basın" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Devam [eH] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Ayrıntılar [a]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "e" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "h" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "a" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Artık desteklenmiyor: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Kaldır: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Kur: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Yükselt: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Devam [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1608,9 +1607,8 @@ msgstr "Dağıtım Yükseltimi" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Ubuntu 11.10 sürümüne yükseltme yapılıyor" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Ubuntu 12.04 sürümüne yükseltiliyor" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1628,84 +1626,85 @@ msgid "Terminal" msgstr "Uçbirim" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Lütfen bekleyin, bu işlem biraz zaman alabilir." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Güncelleştirme tamamlandı" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Yayım notları bulunamadı" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Sunucu aşırı yüklenmiş olabilir. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Sürüm notları indirilemedi" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Lütfen internet bağlantınızı denetleyin." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Yükselt" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Sürüm Notları" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Ek paket dosyaları indiriliyor..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Dosya: %s / %s, Hız: %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Dosya: %s / %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Bağlantıyı Tarayıcıda Aç" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Bağlantıyı Panoya Kopyala" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "İndirilen dosya: %(current)li / %(total)li Hız: %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "İndirilen dosya: %(current)li / %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Ubuntu sürümünüz artık desteklenmiyor." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1713,63 +1712,75 @@ "Kritik güncelleme ya da yeni güvenlik açığı duyursu almayacaksınız. Lütfen " "Ubuntu'yu daha yeni bir sürüme yükseltin." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Yükseltme bilgisi" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Kur" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Ad" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Sürüm %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Ağ bağlantısı tespit edilemedi, değişiklik listesi bilgisi indirilemiyor." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Değişiklik listesi indiriliyor..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "Tüm Seçimleri _Kaldır" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "_Tümünü Seç" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s güncelleştirme seçildi." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s indirilecek." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "Güncelleme indirildi fakat yüklenmedi." #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "Yüklenecek güncelleme yok." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Bilinmeyen indirme boyutu." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1777,7 +1788,7 @@ "Paket bilgisi uzun zamandır güncellenmemiş. Lütfen 'Kontrol et' tuşuna " "basarak güncelleyiniz." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1787,13 +1798,13 @@ "Yeni yazılım güncellemelerini kontrol etmek için aşağıdaki 'Kontrol Et' " "düğmesine basınız." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "Paket bilgisi en son %(days_ago)s gün önce güncelleştirildi." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1801,34 +1812,45 @@ msgstr[0] "Paket bilgisi en son %(hours_ago)s saat önce güncelleştirildi." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Paket bilgileri en son yaklaşık %s dakika önce güncellendi." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Paket bilgisi az önce güncellendi." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Yazılım güncelleştirmeleri hataları düzeltir, güvenlik açıklarını giderir ve " +"yeni özellikler sunar." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Bilgisayarınız için yazılım güncellemeleri mevcut olabilir." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Ubuntu'ya Hoşgeldiniz" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Bu yazılım güncellemeleri Ubuntu'nun bu sürümü yayımlandığından beri var." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Bu bilgisayar için yazılım güncellemesi bulunuyor." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1839,7 +1861,7 @@ "olarak %s boş alanı '%s' üzerinde oluşturun. Çöpünüzü boşaltın ve 'sudo apt-" "get clean' kullanarak önceki yüklemelerin geçici paketlerini kaldırın." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1848,25 +1870,25 @@ "başlatılmaya ihtiyacı var. Lütfen çalışmalarınızı devam etmeden önce " "kaydedin." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Paket bilgisi okunuyor" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Bağlanıyor..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "Güncelleştirmeleri denetleyemeyebilir veya yeni güncelleştirmeleri " "indiremeyebilirsiniz." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Paket bilgisi başlangıç durumuna getirilemedi" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1879,7 +1901,7 @@ "Lütfen bu yanlışı 'update-manager' paketi hatası olarak izleyen hata " "iletisiyle beraber gönderin:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1891,31 +1913,31 @@ "Lütfen bu yanlışı 'update-manager' paketi hatası olarak izleyen hata " "iletisiyle beraber gönderin:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Yeni kurulum)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Boyut:%s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "%(old_version)s sürümünden %(new_version)s sürümüne" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Sürüm %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Sürüm yükseltme şu anda olası değil" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1924,21 +1946,21 @@ "Sürüm yükseltmesi şu an yapılamıyor, lütfen daha sonra yeniden deneyin. " "Sunucu raporu: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Sürüm yükseltme aracı indiriliyor" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Yeni Ubuntu sürümü '%s' kurulabilir" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Yazılım dizini bozulmuş" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1948,6 +1970,17 @@ "durumu düzeltmek için öncelikle \"Synaptic\" paket yöneticisini kullanın ya " "da uçbirim penceresine \"sudo apt-get install -f\" komutunu yazıp çalıştırın." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Yeni sürüm çıktı ('%s')." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Vazgeç" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Güncellemeleri Denetle" @@ -1957,22 +1990,18 @@ msgstr "Mevcut Tüm Güncellemeleri Kur" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Vazgeç" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Sürüm notları" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Güncelleştirmeler" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Güncelleştirme Listesi Oluşturuluyor" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1996,21 +2025,21 @@ " * Ubuntu tarafından sağlanmamış resmi olmayan yazılım paketleri\n" " * Bir Ubuntu önsürümünün normal değişiklikleri" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Değişim günlüğü indiriliyor" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Diğer güncelleştirmeler (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" "Bu güncelleme değişim listesinin desteklediği bir kaynaktan gelmemektedir." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2018,7 +2047,7 @@ "Değişiklik listesini indirme başarısız oldu. \n" "Lütfen İnternet bağlantınızı denetleyin." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2031,7 +2060,7 @@ "Kullanılabilir sürüm: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2045,7 +2074,7 @@ "önce\n" "http://launchpad.net/ubuntu/+source/%s/%s/+changelog adresini kullanın." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2059,52 +2088,43 @@ "+source/%s/%s/+changelog \n" "adresini kullanın ya da daha sonra yeniden deneyin." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Dağıtım belirleme başarısız oldu" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Hangi sistemi kullandığınız belirlenirken '%s' hatası oluştu" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Önemli güvenlik güncelleştirmeleri" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Önerilen güncelleştirmeler" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Teklif edilen güncelleştirmeler" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Geri Taşınmış Yazılımlar" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Dağıtım güncelleştirmeleri" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Diğer güncelleştirmeler" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Güncelleştirme Yöneticisi Başlatılıyor" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Yazılım güncelleştirmeleri hataları düzeltir, güvenlik açıklarını giderir ve " -"yeni özellikler sunar." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Kısmi Yükseltme" @@ -2176,37 +2196,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Yazılım Güncelleştirmeleri" +msgid "Update Manager" +msgstr "Güncelleştirme Yöneticisi" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Yazılım Güncelleştirmeleri" +msgid "Starting Update Manager" +msgstr "Güncelleştirme Yöneticisi Başlatılıyor" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Yükselt" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "güncelleştirmeler" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Kur" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Değişiklikler" +msgid "updates" +msgstr "güncelleştirmeler" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Tanım" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Güncelleştirme tanımı" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2214,24 +2224,34 @@ "Uluslar arası dolaşım üzerinden bağlısınız ve bu güncelleme için alınan veri " "miktarı kadar ücretlendirilebilirsiniz." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Kablosuz modem ile bağlıısınız." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Güncellemeden önce bilgisayarınızı AC güce bağlamanız daha güvenli olacaktır." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "Güncelleştirmeleri _Yükle" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Değişiklikler" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Ayarlar..." +msgid "Description" +msgstr "Tanım" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Kur" +msgid "Description of update" +msgstr "Güncelleştirme tanımı" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Ayarlar..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2255,9 +2275,8 @@ msgstr "Yeni Ubuntu'ya yükseltmeyi reddettiniz" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Daha sonra Güncelleştirme Yöneticisi'ni açıp \"Yükselt\" tuşuna tıklayarak " @@ -2271,58 +2290,58 @@ msgid "Show and install available updates" msgstr "Mevcut güncelleştirmeleri göster ve kur" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Sürümü göster ve çık" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Veri dosyalarını içeren dizin" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Yeni bir Ubuntu sürümü olup olmadığını denetle" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "En son geliştirme sürümüne yükseltme olasılığını denetle" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "Sürüm yükselticisinde en son önerilen sürümü kullanarak yükselt" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Başlatılırken haritaya odaklanma" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Dağıtım yükseltmeyi dene" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Başlatılırken güncelleştirmeleri denetleme" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Yükseltmeyi, bir çalışma dizini 'aufs' yer paylaşımıyla sına" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "_Yükseltmeye başla" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Değişim günlüğü yerine paket açıklamasını göster" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "$distro-proposed 'daki yükselticiyi kullanarak en son sürüme yükseltmeyi " "deneyin" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2333,11 +2352,11 @@ "ve sunucu sistemlerinin düzenli güncelleştirmeleri için 'sunucu' " "desteklenmektedir." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Belirlenmiş önyüzü çalıştır" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2345,11 +2364,11 @@ "Sadece yeni bir dağıtım sürümü mevcut olduğunda denetle ve sonucu çıkış " "koduyla bildir." -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Yeni Ubuntu sürümü denetleniyor" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2357,72 +2376,72 @@ "Güncelleme bilgisi için, lütfen ziyaret ediniz:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Yeni sürüm bulunamadı" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Yeni sürüm çıktı ('%s')." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Yükseltmek için 'do-release-upgrade' çalıştırın." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Ubuntu %(version)s Yükseltmesi Mevcut" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Ubuntu %s sürümüne yükseltmeyi reddettiniz" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Böcek düzeltme çıktısını ekle" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Bu makinedeki desteklenmeyen paketleri göster" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Bu makinedeki desteklenen paketleri göster" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Bütün paketleri durumları ile birlikte göster" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Tüm paketleri bir listede göster" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "'%s' durum özetini destekle:" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" "%(time)s'e kadar desteklenen %(num)s tane (%(percent).1f%%) paket dosyasına " "sahipsiniz" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" "Şu anda/bundan sonra indirilemeyen %(num)s paketiniz var.(%(percent).1f%%)" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" "Desteklenmeyen %(num)s tane (%(percent).1f%%) paket dosyasına sahipsiniz" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2430,54 +2449,71 @@ "Daha ayrıntılı görmek istiyorsanız \"--show-unsupported\", \"--show-supported" "\" ya da \"--show-all\" ile çalıştırın" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "İndirilemez:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Desteklenmeyen: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "%s'e kadar desteklenen:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Desteklenmeyen" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Gerçekleştirilmemiş yöntem: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Sürücüdeki bir dosya" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb paketi" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Eksik paketi yükle." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "%s paketi yüklenmeli." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb paketi" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s paketi, elle yüklendi şeklinde imlenmesi gerekiyor." +msgid "%i obsolete entries in the status file" +msgstr "Durum dosyasında %i eski girdisi" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "dpks durumunda eski girdiler mevcut" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "Eski dpkg durum girdileri" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2486,66 +2522,81 @@ "paketinin de kurulması gerekir. Daha fazla bilgi için bugs.launchpad.net " "adresindeki #279621 numaralı hata kaydına bakın." -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "Durum dosyasında %i eski girdisi" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "dpks durumunda eski girdiler mevcut" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "Eski dpkg durum girdileri" +msgid "%s needs to be marked as manually installed." +msgstr "%s paketi, elle yüklendi şeklinde imlenmesi gerekiyor." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Ayrıca grub yüklendikten sonra 'lilo'yu kaldır.(Ayrıntılar için #314004 " "yanlışına bakın.)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Paket bilginizin güncellenmesinin ardından gerekli '%s' paketi artık " -#~ "bulunamıyor bu yüzden bir hata raporlama süreci başlatıldı." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Ubuntu 12.04 sürümüne yükseltiliyor" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s güncelleştirme seçildi." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Ubuntu'ya Hoşgeldiniz" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Bu yazılım güncellemeleri Ubuntu'nun bu sürümü yayımlandığından beri var." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Bu bilgisayar için yazılım güncellemesi bulunuyor." - -#~ msgid "Update Manager" -#~ msgstr "Güncelleştirme Yöneticisi" - -#~ msgid "Starting Update Manager" -#~ msgstr "Güncelleştirme Yöneticisi Başlatılıyor" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Kablosuz modem ile bağlıısınız." - -#~ msgid "_Install Updates" -#~ msgstr "Güncelleştirmeleri _Yükle" +#~ "Paket bilginizin güncellenmesinin ardından gerekli '%s' paketi artık " +#~ "bulunamıyor bu yüzden bir hata raporlama süreci başlatıldı." #~ msgid "Checking for a new ubuntu release" #~ msgstr "Yeni Ubuntu sürümleri denetleniyor" @@ -2606,6 +2657,9 @@ #~ "Eğer onları şimdi kurmak istemiyorsanız, daha sonra Uygulamalar'dan " #~ "\"Güncelleme Yöneticisi\"ni seçin." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Ubuntu 11.10 sürümüne yükseltme yapılıyor" + #~ msgid "Your graphics hardware may not be fully supported in Ubuntu 11.04." #~ msgstr "" #~ "Grafik donanımınız Ubuntu 11.04 taradından tam olarak desteklenmiyor " diff -Nru update-manager-17.10.11/po/ug.po update-manager-0.156.14.15/po/ug.po --- update-manager-17.10.11/po/ug.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/ug.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # Gheyret T.Kenji , 2008. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-04-09 23:01+0000\n" "Last-Translator: Gheyret T.Kenji \n" "Language-Team: Uyghur Computer Science Association \n" @@ -20,20 +21,20 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" msgstr[0] "%(size).0f ك ب" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s نىڭ مۇلازىمېتىرى" @@ -41,20 +42,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "ئاساسى مۇلازىمېتىر" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "ئىختىيارى مۇلازىمېتىرلار" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "sources.list دىكى مەزمۇنلارنى ھېسابلىغىلى بولمىدى" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -62,11 +63,11 @@ "بوغچا ھۆججىتى يوقكەن. قارىغاندا بۇ Ubuntu دىسكىسى ئەمەس ئوخشايدۇ، ياكى نەشرى " "خاتا ئوخشايدۇ." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "CDنى قوشۇش مەغلۇپ بولدى" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -82,12 +83,12 @@ "\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "بۇزۇلغان بوغچىلارنى ئۆچۈر" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -104,15 +105,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "مۇلازىمېتىرنىڭ يۈكى ئېشىپ كەتكەندەك قىلىدۇ." -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "بۇزۇلغان بوغچىلار" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -122,7 +123,7 @@ "ئىشلىتىپ تۈزىتىڭ." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -143,11 +144,11 @@ " * ئۇبۇنتۇ تەمىنلىمىگەن يۇمشاق دېتال بوغچىسىنى ئىشلىتىش\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "بۇ ۋاقىتلىق مەسىلىدەك قىلىدۇ، كېيىن يەنە قايتا سىناپ كۆرۈڭ." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -155,16 +156,16 @@ "ھېچقايسى ئىشلىمىسە، تېرمىنالدا تۇرۇپ ‹ubuntu-bug update-manager› بۇيرۇقىنى " "ئىشلىتىپ كەمتۈك مەلۇم قىلىڭ." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "يۈكسەلدۈرۈشنى ھېسابلاش مەغلۇپ بولدى" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "بەزى بوغچىلارنى دەلىللەشتە خاتالىق كۆرۈلدى." -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -173,7 +174,7 @@ "بىر قىسىم بوغچىلارنى دەلىللىگىلى بولمىدى. بۇ ۋاقىتلىق مەسىلە. كېيىن يەنە " "سىناپ كۆرسىڭىز بولىدۇ. دەلىللەش مۇمكىن بولمىغان بوغچىلار تۆۋەندىكىچە:" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -181,22 +182,22 @@ "بوغچا '%s' غا ئۆچۈرۈش بەلگىسى قويۇلۇپتۇ، بىراق ئۇ ئۆچۈرۈش قارا تىزىملىكىدە " "بار ئىكەن." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "زۆرۈر بولغان '%s' بوغچىغا ئۆچۈرۈش بەلگىسى قويۇلۇپتۇ." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "قارا تىزىملىكتىكى نەشرى '%s' نى ئورناتماقچى بولۇۋاتىدۇ" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "'%s' نى قاچىلىيالمىدى" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -205,11 +206,11 @@ "manager» بۇيرۇقىنى ئىجرا قىلىپ، كەمتۈك مەلۇماتى يوللاڭ." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "meta بوغچىلارنى قىياس قىلغىلى بولمىدى" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -223,15 +224,15 @@ "synaptic ياكى apt-get نى ئىشلىتىپ يۇقىرىقىلارنىڭ بىرەرىنىڭ بوغچىلىرىنى " "ئورنىتىپ مەشغۇلاتنى داۋاملاشتۇرۇڭ." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "غەملەكنى ئوقۇۋاتىدۇ" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "باشقىلارنى چەتكە قاقىدىغان قۇلۇپقا ئېرىشەلمىدى" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -239,11 +240,11 @@ "بۇ باشقا بىر بوغچا باشقۇرۇش پروگراممىسى(apt-get ياكى aptitude)نىڭ ئىجرا " "بولۇۋاتقانلىقىدىن دېرەك بېرىدۇ. ئاۋۋال شۇنى ئاخىرلاشتۇرۇڭ." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "يىراقتىن باغلىنىپ يېڭىلاشنى قوللىمايدۇ" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -257,11 +258,11 @@ "\n" "يۈكسەلدۈرۈش ھازىر ئەمەلدىن قالدۇرىدۇ. ssh نى ئىشلەتمەي سىناپ كۆرۈڭ." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "SSH نى ئىشلىتىپ ئىجرا قىلىۋاتىدۇ، داۋاملاشتۇرامسىز؟" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -279,11 +280,11 @@ "قىلىنىدۇ.\n" "داۋاملاشتۇرامسىز؟" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "باشقا بىر ssh daemon نى قوزغىلىۋاتىدۇ." -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -295,7 +296,7 @@ "كۆرۈلسىمۇ بۇ يېڭى قوشۇلغان ssh غا باغلىنىپ مەشغۇلاتنى داۋاملاشتۇرغىلى " "بولىدۇ.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -308,29 +309,29 @@ "بولمايدۇ. تۆۋەندىكىدەك قىلسىڭىز بۇ ئېغىزنى ئېچىۋېتەلەيسىز:\n" "«%s»" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "يېڭىلىغىلى بولمايدۇ" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "بۇ قورال %s' دىن '%s' غا يۈكسەلدۈرۈشنى قوللىمايدۇ." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Sandbox مۇھىتىنى تەڭشەش مەغلۇپ بولدى" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Sandbox مۇھىتىنى قۇرۇش مۇمكىن بولمىدى" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Sandbox ھالىتى" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -345,18 +346,18 @@ "قايتا قوزغىتىلغۇچە بولغان ئارىلىقتا systemdir غا يېزىلغان نەرسىلەر ھەممىسى " "ۋاقىتلىقتۇر." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "ئورنىتىلغان python سىستېمىسى بۇزۇلۇپتۇ. '/usr/bin/python' دېگەن symlink نى " "تۈزىتىڭ." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "'debsig-verify' دېگەن بوغچا ئورنىتىلىپتۇ." -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -367,12 +368,12 @@ "ئاۋۋال ئۇنى synaptic ياكى 'apt-get remove debsig-verify' دېگەن بۇيرۇق " "ئارقىلىق ئۆچۈرۈۋېتىپ ئاندىن يۈكسەلدۈرۈشنى ئىجرا قىلىڭ." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "‹%s› يازغىلى بولمىدى." -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -383,11 +384,11 @@ "بولمايدۇ.\n" "سىستېما مۇندەرىجىسىگە يازغىلى بولىدىغان-بولمايدىغانلىقىنى تەكشۈرۈڭ." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "ئەڭ يېڭى يېڭىلانما ئۇچۇرلىرىنى ئىنتېرنېتتىن ئالامسىز؟" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -408,16 +409,16 @@ "ئورنىتىشىڭىز كېرەك.\n" "ئەگەر بۇ يەردە «ياق(no)» دەپ جاۋاب بەرسىڭىز، ئىنتېرنېت ئىشلىتىلمەيدۇ." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "%s غا يۈكسەلدۈرۈش چەكلەنگەن" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "ئىناۋەتلىك تەسۋىر تېپىلمىدى" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -437,11 +438,11 @@ "ئەگەر 'No' تاللانسا يۈكسەلدۈرۈش ئەمەلدىن قالدۇرۇلىدۇ." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "كۆڭۈلدىكى مەنبەلەرنى قۇرسۇنمۇ؟" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -455,11 +456,11 @@ "'%s' نىڭغا مۇناسىۋەتلىك كۆڭۈلدىكى مەزمۇننى قوشۇلسۇنمۇ؟ جاۋابىڭىز 'No'«ياق» " "بولسا، يۈكسەلدۈرۈش ئەمەلدىن قالدۇرۇلىدۇ." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "خەزىنە ئۇچۇرى ئىناۋەتسىز" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -467,11 +468,11 @@ "خەزىنە ئۇچۇرلىرىنى يېڭىلاۋاتقاندا بىر ئىناۋەتسىز ھۆججەت بايقالدى شۇڭا كەمتۈك " "مەلۇم قىلىش جەريانى باشلىنىۋاتىدۇ." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "ئۈچىنچى تەرەپ يۇمشاق دېتاللىرى تاقالغان" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -481,12 +482,12 @@ "يۈكسەلدۈرۈش تاماملانغاندا ئۇنى 'software-properties' قورالى ياكى بوغچا باشقۇ " "بىلەن قايتا ئىناۋەتلىك قىلغىلى بولىدۇ." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "بوغچىلار باغلاشمىغان ھالەتتە" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -501,11 +502,11 @@ "ئىدى. بىراق، ئۇنىڭ ئارخىپى تېپىلمىدى. ئۇنى قولدا قايتا ئورنىتىڭ ياكى " "سىستېمىدىن ئۆچۈرۈۋېتىڭ." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "يېڭىلاۋاتقاندا خاتالىق كۆرۈلدى" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -513,13 +514,13 @@ "يېڭىلاش جەريانىدا ئازراق مەسىلە كۆرۈلدى. بۇ كوپ ھاللاردا تورنىڭ سەۋەبىدىن " "كېلىپ چىقىدۇ. تور باغلىنىشىنى تەكشۈرۈپ قايتا قىلىڭ." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "دىسكىدىكى بىكار بوشلۇق يېتەرلىك ئەمەس" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -534,21 +535,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "ئۆزگىرىشلەرنى ئېنىقلاۋاتىدۇ" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "يۈكسەلدۈرۈشنى باشلامسىز؟" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "يۈكسەلدۈرۈشنى ئەمەلدىن قالدۇردى" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -556,12 +557,12 @@ "يۈكسەلدۈرۈش مەشغۇلاتى ئەمەلدىن قالدۇرۇلۇپ، ئەسلى سىستېما ئەسلىگە " "كەلتۈرۈلىدۇ. يۈكسەلدۈرۈش مەشغۇلاتىنى كېيىن يەنە قىلگىلى بولىدۇ." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "يۈكسەلدۈرمىلەرنى چۈشۈرگىلى بولمىدى" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -571,27 +572,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "commit قىلىۋاتقاندا خاتالىق كۆرۈلدى" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "ئەسلىدىكى سىستېما ھالىتىگە قايتۇرۇش" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "يېڭىلىنىش قاچىلانمىدى" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -600,7 +601,7 @@ "قالىدۇ. ئەسلىگە كەلتۈرۈش مەشغۇلاتى(dpkg --configure -a) ھازىرلا ئېلىپ " "بېرىلىدۇ." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -617,7 +618,7 @@ "مەلۇماتقا قوشۇپ ئەۋەتىڭ.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -625,20 +626,20 @@ "يۈكسەلدۈرۈش توختىتىلدى. ئىنتېرنېت باغلىنىشىنى ياكى ئورنىتىش دىسكىسىنى " "تەكشۈرۈڭ ۋە قايتا قىلىڭ. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "كېرەكسىز بوغچىلارنى ئۆچۈرسۇنمۇ؟" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "ساقلاپ قال(_K)" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "ئۆچۈر(_R)" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -647,27 +648,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "زۆرۈر بېقىنمىلار ئورنىتىلمىغان" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "زۆرۈر بېقىنما '%s' ئورنىتىلمىغان. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "بوغچا باشقۇرغۇچنى تەكشۈرۈۋاتىدۇ" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "يېڭىلاشقا تەييارلىنىش مەغلۇپ بولدى" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -675,11 +676,11 @@ "سىستېمىنى يۈكسەلدۈرۈش تەييارلىقى مەغلۇپ بولدى، شۇڭا كەمتۈك مەلۇم قىلىش " "مەشغۇلاتى باشلىنىدۇ." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "يۈكسەلدۈرۈشكە زۆرۈر بولغان مەزمۇنلارنى ئېلىش مەغلۇپ بولدى." -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -691,69 +692,69 @@ "\n" "يەنە كەمتۈك مەلۇم قىلىش جەريانى باشلىنىۋاتىدۇ." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "خەزىنە ئۇچۇرىنى يېڭىلاۋاتىدۇ" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "cdrom نى قوشۇش مەغلۇپ بولدى." -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "كەچۈرۈڭ، cdrom قوشۇش مۇۋەپپەقىيەتلىك بولمىدى." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "ئىناۋەتسىز بوغچا ئۇچۇرى" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "تۇتۇۋاتىدۇ" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "يۈكسەلدۈرۈۋاتىدۇ" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "يۈكسەلدۈرۈش تامام" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" "نەشرنى ئۆرلىتىش تاماملاندى، بىراق نەشرىنى ئۆرلىتىش جەريانىدا خاتالىق كۆرۈلدى." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "كېرەكسىز دېتاللارنى ئىزدەۋاتىدۇ" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "سىستېمىنى يۈكسەلدۈرۈش تاماملاندى." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "قىسمىي يۈكسەلدۈرۈش تاماملاندى." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms ئىشلىتىلىۋاتىدۇ" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -763,11 +764,11 @@ "يۇمشاق دېتالىنى بۇنىڭدىن ئىشلەتكىلى بولمايدۇ، ئۇنى ئېتىۋېتىپ، ئاندىن " "يۈكسەلدۈرۈشنى قايتا ئىجرا قىلىڭ." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "كومپيۇتېرىدىكى كۆرسىتىش كارتىسىنى ئۇبۇنتۇ 12.04 LTS تولۇق قوللىمايدۇ." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -779,9 +780,9 @@ "ئۇچۇرلارنى https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx دىن " "كۆرۈشكە بولىدۇ. يۈكسەلدۈرۈشنى داۋاملاشتۇرامسىز؟" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -789,8 +790,8 @@ "يۈكسەلدۈرۈلسە ئۈستەلئۈستى ئۈنۈمى، ئويۇنلار ۋە باشقا گرافىكىلىق " "پروگراممىلارنىڭ ئىقتىدارىدا ئاجىزلاش بولىدۇ." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -804,7 +805,7 @@ "\n" "داۋاملاشتۇرامسىز?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -817,11 +818,11 @@ "\n" "داۋاملاشتۇرامسىز?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "i686 تىپلىق CPU ئەمەس" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -833,11 +834,11 @@ "ئىشلىتىپ قۇرۇلغان. بۇ كومپيۇتېرىڭىزدا، سىستېمىڭىزنى Ubuntu نىڭ يېڭى نەشرىگە " "يۈكسەلدۈرەلەيسىز." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "ARMv6 تىپىدىكى CPU ئەمەس" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -848,11 +849,11 @@ "كونا. karmic تىكى بارلىق بوغچىلار ARMv6 غا ماسلاشتۇرۇلغان بولۇپ، " "كومپيۇتېرىڭىزدا ئىشلەتكىلى بولمايدۇ. شۇڭا سىستېمىنى يېڭىلىيالمايسىز." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "init يوقكەن" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -867,17 +868,17 @@ "\n" "داۋاملاشتۇرامسىز?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "aufs نى ئىشلىتىپ Sandbox يۈكسەلدۈرۈش" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" "يۈكسەلدۈرۈگىلى بولىدىغان بوغچا بار cdrom نى ئىزدەش ئۈچۈن بېرىلگەن يولنى " "ئىشلەتسۇن" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -885,57 +886,57 @@ "ئالدىئۇچ ئىشلىتىڭ. ھازىر ئىشلەتكىلى بولىدىغان پروگراممىلار: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*DEPRECATED* تاللانمىسىغا پەرۋا قىلمايدۇ" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "پەقەتلا قىسمىي يۈكسەلدۈرۈش(sources.list نى ئۆزگەرتمەيدۇ)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "GNU screen قوللىشىنى ئىناۋەتسىز قىل" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "datadir نى تەڭشەش" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "'%s' نى قوزغاتقۇچ '%s' غا سېلىڭ" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "ئېلىش تاماملاندى" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "ھۆججەت ئېلىۋاتىدۇ %li / %li(تېزلىك %sB/s)" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "تەخمىنەن %s قالدى" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "ھۆججەت ئېلىۋاتىدۇ %li / %li" @@ -945,27 +946,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "ئۆزگىرىشلەرنى قوللىنىۋاتىدۇ" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "بېقىنىش مەسىلىسى - سەپلەنمىدى" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "'%s' ئورناتقىلى بولمىدى" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -977,7 +978,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -988,7 +989,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -996,20 +997,20 @@ "سەپلىمە ھۆججەتنى يېڭى نەشرگە ئالماشتۇرۇشنى تاللىسىڭىز، كونىسىدىكى " "ئۆزگىرىشلەرنىڭ ھەممىسى يوق بولىدۇ." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "'diff' بۇيرۇقى تېپىلمىدى" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "ئېغىر خاتالىق يۈز بەردى" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1022,13 +1023,13 @@ "ئەسلىدىكى sources.list ھۆججىتى /etc/apt/sources.list.distUpgrade قىلىپ " "ساقلاندى." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Ctrl-c بېسىلدى" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1037,137 +1038,137 @@ "مۇمكىن. مەشغۇلاتىڭىزنى جەزملەشتۈرەمسىز؟" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" "سانلىق-مەلۇماتلارنىڭ يوقالماسلىقى ئۈچۈن بارلىق پروگرامما ۋە پۈتۈكلەرنى " "ئېتىۋېتىڭ" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Canonical (%s) ئەمدى تېخنىكىلىق ياردەم بەرمەيدۇ" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "نەشرىنى تۆۋەنلىتىش (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "ئۆچۈرۈش (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "ئەمدى زۆرۈر ئەمەس (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "ئورنىتىش (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "يۈكسەلدۈرۈش(%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "ۋاسىتە ئۆزگەرتىش" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "پەرقنى كۆرسىتىش" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< پەرقنى يوشۇرۇش" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "خاتالىق" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "ۋاز كەچ(&C)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "ياپ(&C)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "تېرمىنالنى كۆرسىتىش >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< تېرمىنالنى يوشۇرۇش" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "ئۇچۇر" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "تەپسىلاتى" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "ئەمدى تېخنىكىلىق ياردەم بېرىلمەيدۇ %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "%s نى ئۆچۈرۈش" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "(ئاپتوماتىك ئورنىتىلغان)%s نى ئۆچۈرۈش" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "%s نى ئورنىتىش" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "%s نى يۈكسەلدۈرۈش" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "قايتا قوزغىتىش زۆرۈر" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" "يۈكسەلدۈرۈشنى تاماملاش ئۈچۈن سىستېمىنى قايتا قوزغىتىش زۆرۈر" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "ھازىر قايتا قوزغات(_R)" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1177,29 +1178,29 @@ "سىستېمىڭىز ئىشلەتكىلى بولمايدىغان ھالەتكە چۈشۈپ قالىدۇ. يۈكسەلدۈرۈشنى " "داۋاملاشتۇرۇشىڭىزنى كۈچلۈك تەۋسىيە قىلىمىز." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "يۈكسەلدۈرۈشنى ئەمەلدىن قالدۇرامسىز؟" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li كۈن" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li سائەت" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li مىنۇت" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1214,7 +1215,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1228,14 +1229,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1245,34 +1246,32 @@ "تەخمىنەن %s" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "چۈشۈرۈشكە تەخمىنەن %s كېتىدۇ. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "يۈكسەلدۈرۈشكە تەييارلىنىۋاتىدۇ" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "يېڭى يۇمشاق دېتال قانىلىغا ئېرىشىش" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "يېڭى بوغچىغا ئېرىشىش" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "يۈكسەلدۈرمىلەرنى ئورنىتىش" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "تازىلاۋاتىدۇ" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1286,25 +1285,25 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d دانە بوغچا ئۆچۈرۈلمەكچى" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d دانە يېڭى بوغچا ئورنىتىلماقچى" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d دانە يېڭى بوغچا يۈكسەلدۈرۈلىدۇ." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1315,7 +1314,7 @@ "\n" "جەمئىي %s چۈشۈرۈش زۆرۈر " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1323,7 +1322,7 @@ "يېڭىلانمىلارنى ئورنىتىشقا بىر نەچچە سائەت كېتىدۇ. چۈشۈرۈش تاماملانغاندىن " "كېيىن، مەشغۇلاتنى ئەمەلدىن قالدۇرغىلى بولمايدۇ." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1331,51 +1330,51 @@ "يېڭىلانمىلارنى ئېلىپ كېلىش ۋە ئورنىتىشقا بىر نەچچە سائەت كېتىدۇ. چۈشۈرۈش " "تاماملانغاندىن كېيىن، مەشغۇلاتنى ئەمەلدىن قالدۇرغىلى بولمايدۇ." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "بوغچىلارنى چىقىرىۋېتىشكە بىر نەچچە سائەت كېتىدۇ. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "كومپيۇتېردىكى بارلىق يۇمشاق دېتاللار ئەڭ يېڭى ھالەتتە." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "سىستېمىڭىزنى يۈكسەلدۈرۈشنىڭ ھاجىتى يوق. يۈكسەلدۈرۈش توختىتىلىدۇ" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "قايتا قوزغىتىش زۆرۈر" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "قىلىش تاماملاندى، قايتا قوزغىتىش زۆرۈر. قايتا قوزغىتامسىز؟" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "'%(signature)s' غا قارتا '%(file)s' نى دەلىللەش " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "يېيىۋاتقىنى ‹%s›" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "يۈكسەلدۈرۈش قورالىنى ئىجرا قىلغىلى بولمىدى" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1383,33 +1382,33 @@ "يۈكسەلدۈرۈش قورالىدا كەمتۈك باردەك قىلىدۇ. بۇ كەمتۈكنى ‹ubuntu-bug update-" "manager› بۇيرۇقىنى ئىشلىتىپ مەلۇم قىلىڭ" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "يۈكسەلدۈرۈش قورالى ئىمزاسى" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "يۈكسەلدۈرۈش قورالى" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "ئېلىش مەغلۇپ بولدى" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "يۈكسەلدۈرمىنى ئېلىش مەغلۇپ بولدى. توردا مەسىلە باردەك قىلىدۇ. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "سالاھىيەت دەلىللەش مەغلۇپ بولدى" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1417,13 +1416,13 @@ "يۈكسەلدۈرمىنى دەلىللەش مەغلۇپ بولدى. تور ياكى مۇلازىمېتىردا مەسىلە باردەك " "قىلىدۇ. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "يېيىش مەغلۇپ بولدى" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1431,13 +1430,13 @@ "يۈكسەلدۈرمىنى يېيىش مەغلۇپ بولدى. توردا ياكى مۇلازىمېتىردا مەسىلە باردەك " "قىلىدۇ. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "ئىسپاتلاش مەغلۇپ بولدى" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1445,15 +1444,15 @@ "يۈكسەلدۈرمىنى تەكشۈرۈش مەغلۇپ بولدى. تور ياكى مۇلازىمېتىردا مەسىلە باردەك " "قىلىدۇ. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "يۈكسەلدۈرۈشنى ئىجرا قىلغىلى بولمىدى" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1462,13 +1461,13 @@ "كۆرۈلىدۇ./tmp نى noexec ئىشلەتمەي قايتا ئېگەرلەڭ ۋە يۈكسەلدۈرۈشنى قايتا " "ئىجرا قىلىڭ." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "خاتالىق ئۇچۇرى '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1481,73 +1480,73 @@ "ئەسلىدىكى sources.list ھۆججىتى /etc/apt/sources.list.distUpgrade قىلىپ " "ساقلاندى." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "توختىتىۋاتىدۇ" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "تۆۋەنلىتىلدى:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "داۋاملاشتۇرۇش ئۈچۈن [ENTER] نى بېسىڭ" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "داۋاملاشتۇرۇش[yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "تەپسىلاتلار[d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "بۇنىڭدىن كېيىن ئىشلەتكىلى بولمايدۇ: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "ئۆچۈرۈش: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "ئورنىتىش: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "يۈكسەلدۈرۈش: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "داۋاملاشتۇرۇش: [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1614,9 +1613,8 @@ msgstr "تارقىتىلمىنى يۈكسەلدۈرۈش" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "ئۇبۇنتۇ 11.10 نەشرىگە يۈكسەلدۈرۈش" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "ئۇبۇنتۇ 12.04 نەشرىگە يۈكسەلدۈرۈش" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1634,84 +1632,85 @@ msgid "Terminal" msgstr "تېرمىنال" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "ساقلاڭ، ئازراق ۋاقىت كېتىدۇ" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "يېڭىلاش تاماملاندى" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "نەشر ئۇچۇرلىرى تېپىلمىدى" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "مۇلازىمېتىرنىڭ يۈكى ئېشىپ كەتكەندەك قىلىدۇ. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "نەشر ئۇچۇرلىرى چۈشۈرەلمىدى" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "ئىنتېرنېت باغلىنىشىنى تەكشۈرۈڭ" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "يۈكسەلدۈر" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "تارقىتىش چۈشەندۈرۈشى" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "قوشۇمچە بوغچا ھۆججەتلىرىنى چۈشۈرۈۋاتىدۇ..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "ھۆججەت%s / %s (%sB/s)" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "ھۆججەت %s / %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "ئۇلانمىنى توركۆرگۈدە ئېچىش" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "ئۇلانمىنى چاپلاش تاختىسىغا كۆچۈرۈش" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "ھۆججەت چۈشۈرۈۋاتىدۇ %(current)li / %(total)li تېزلىكى %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "ھۆججەت چۈشۈرۈۋاتىدۇ %(current)li / %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "سىز ئىشلىتىۋاتقان ئۇبۇنتۇغا ئەمدى تېخنىكىلىق ياردەم تەمىنلەنمەيدۇ." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1719,62 +1718,74 @@ "بۇنىڭدىن كېيىن بىخەتەرلىك ياماقلىرىغا ياكى مۇھىم يېڭىلانمىلارغا " "ئېرىشەلمەيسىز. ئۇبۇنتۇنىڭ كېيىنكى نەشرىگە يۈكسەلدۈرۈڭ." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "يۈكسەلدۈرۈش ئۇچۇرى" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "ئورنات" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "ئاتى" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "نەشرى %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "تور باغلىنىشى تېپىلمىدى، ئۆزگىرىش خاتىرىسى ئۇچۇرنى چۈشۈرگىلى بولمايدۇ." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "ئۆزگىرىشلەرنىڭ تىزىملىكىنى چۈشۈرۈۋاتىدۇ..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "ھېچنېمىنى تاللىما(_D)" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "ھەممىنى تاللا(_A)" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s دانە يېڭىلانما تاللاندى." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s چۈشۈرۈلىدۇ." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "يېڭىلانمىلار ئاللىقاچان چۈشۈرۈلگەن، بىراق ئورنىتىلمىغان." #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "ئورنىتىدىغان يېڭىلانمىلار يوق." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "چۈشۈرۈش چوڭلۇقى نامەلۇم." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1782,7 +1793,7 @@ "بوغچا ئۇچۇرىنىڭ قاچان يېڭىلانغانلىقى نامەلۇم. ‹تەكشۈر› توپچىسىنى ئىشلىتىپ " "ئۇچۇرلارنى يېڭىلاڭ." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1791,13 +1802,13 @@ "بوغچا ئۇچۇرى ئەڭ ئاخىرقى قېتىملىق يېڭىلانغان ۋاقتى %(days_ago)s كۈن بۇرۇن.\n" "تۆۋەندىكى «تەكشۈر» توپچىسىنى بېسىپ يۇمشاق دېتاللارنىڭ يېڭىلانمىسىنى تەكشۈرۈڭ." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "بوغچا ئۇچۇرلىرى %(days_ago)s كۈن بۇرۇن يېڭىلانغان." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1805,35 +1816,47 @@ msgstr[0] "بوغچا ئۇچۇرلىرى %(hours_ago)s سائەت بۇرۇن يېڭىلانغان." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "بوغچا ئۇچۇرى %s مىنۇت ئىلگىرى يېڭىلانغان." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "بوغچا ئۇچۇرى ھازىرلا يېڭىلانغان." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"يۇمشاق دېتال يېڭىلانمىلىرى خاتالىقلارنى تۈزىتىدۇ، بىخەتەرلىكتىكى بوشلۇقلارنى " +"يوق قىلىدۇ، يېڭى ئىقتىدارلارنى تەمىنلەيدۇ." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" "سىزنىڭ كومپيۇتېرىڭىزدا ئىشلەتكىلى بولىدىغان يېڭىلانمىلار بار بولۇشى مۇمكىن." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "ئۇبۇنتۇغا مەرھابا" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"بۇ يۇمشاق دېتال يېڭىلانمىلىرى، ئۇبۇنتۇنىڭ مەزكۇر نەشرى ئېلان قىلىنغاندىن " +"كېيىن تارقىتىلدى." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "مەزكۇر كومپيۇتېر ئۈچۈن يۇمشاق دېتال يېڭىلانمىلىرى بار." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1845,7 +1868,7 @@ "ساندۇقنى تازىلاڭ، 'sudo apt-get clean' نى ئىشلىتىپ ۋاقىتلىق بوغچىلارنى " "ئۆچۈرۈڭ." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1853,25 +1876,25 @@ "يېڭىلاشنى تاماملاش ئۈچۈن كومپيۇتېرنى قايتا قوزغىتىش زۆرۈر. شۇڭا ھازىر " "قىلىۋاتقان ئىشلىرىڭىزنى ساقلىۋېلىڭ." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "بوغچا ئۇچۇرىنى ئوقۇۋاتىدۇ" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "باغلىنىۋاتىدۇ…" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" "يېڭىلانمىلارنى تەكشۈرەلمەسلىكىڭىز ياكى يېڭىلانمىلارنى چۈشۈرەلمەسلىكىڭىز " "مۇمكىن." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "بوغچا ئۇچۇرىنى دەسلەپلەشتۈرگىلى بولمىدى" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1884,7 +1907,7 @@ "«يېڭىلانما باشقۇرغۇ(Update Manager)» بوغچا ھەققىدە كەمتۈك مەلۇماتى يوللاڭ. " "ھەم مەلۇماتقا تۆۋەندىكى ئۇچۇرلارنى قوشۇپ ئەۋەتىڭ:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1896,31 +1919,31 @@ "«يېڭىلانما باشقۇرغۇ(Update Manager)» بوغچا ھەققىدە كەمتۈك مەلۇماتى يوللاڭ. " "ھەم مەلۇماتقا تۆۋەندىكى ئۇچۇرلارنى قوشۇپ ئەۋەتىڭ:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (يېڭىدىن ئورنىتىش)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(چوڭلۇقى: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "%(old_version)s نەشرىدىن %(new_version)s گە" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "نەشر %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "ھازىر يۈكسەلدۈرۈش مۇمكىن ئەمەس" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1929,21 +1952,21 @@ "نۆۋەتتە يۈكسەلدۈرۈش مەشغۇلاتىنى ئېلىپ بېرىشقا بولمىدى. كېيىن قايتا سىناپ " "كۆرۈڭ. مۇلازىمېتىر تۆۋەندىكىنى مەلۇم قىلدى: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "نەشر يۈكسەلدۈرۈش قورالىنى چۈشۈرۈۋاتىدۇ" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "يېڭى ئۇبۇنتۇ نەشرى ‹%s› بار ئىكەن" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "يۇمشاق دېتال ئىندېكسى بۇزۇلغان" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1953,6 +1976,17 @@ "بىلەن \"Synaptic\" ياكى تېرمىنالدا \"sudo apt-get install -f\" نى ئىجرا " "قىلىپ بۇ مەسىلىنى تۈزۈتۈڭ." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "يېڭى نەشرى '%s' بار ئىكەن." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "ۋاز كەچ" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "يېڭىلانمىنى تەكشۈرۈش" @@ -1962,22 +1996,18 @@ msgstr "بار بولغان بارلىق يېڭىلانمىلارنى ئورنىتىش" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "ۋاز كەچ" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "خاتىرە يېڭىلا" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "يېڭىلانمىلار" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "يېڭىلانمىلار تىزىملىكىنى قۇرۇۋاتىدۇ" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2001,20 +2031,20 @@ " * ئۇبۇنتۇ تەمىنلىمىگەن بىر قىسىم يۇمشاق دېتال بوغچىلىرى بار\n" " * ئۇبۇنتۇنىڭ pre-release نەشرىدىكى ئۆزگىرىشلەر" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "ئۆزگەرتىش خاتىرىسىنى چۈشۈرۈۋاتىدۇ" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "باشقا يېڭىلانمىلار (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "بۇ يېڭىلانما ئۆزگەرتىش خاتىرىسىنى قوللايدىغان مەنبەدىن كەلمىگەن." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2022,7 +2052,7 @@ "ئۆزگىرىش تىزىملىكىنى چۈشۈرۈش مەغلۇپ بولدى.\n" "ئىنتېرنېت باغلىنىشىڭىزنى تەكشۈرۈڭ." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2035,7 +2065,7 @@ "ئىشلەتكىلى بولىدىغان نەشرى:%s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2048,7 +2078,7 @@ "http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "ئۆزگەرتىش خاتىرىسى تەييار بولغۇچە ئىشلىتىڭ ياكى كېيىن يەنە سىناپ كۆرۈڭ." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2061,54 +2091,45 @@ "http://launchpad.net/ubuntu/+source/%s/%s/+changelog نىڭغا بېرىڭ\n" "ئۆزگەرتىش خاتىرىسى تەييار بولغۇچە ئىشلىتىڭ ياكى كېيىن يەنە سىناپ كۆرۈڭ." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "تارقىتىلمىنى بايقاش مەغلۇپ بولدى" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" "قايسى سىستېمىنى ئىشلىتىۋاتقانلىقىڭىزنى تەكشۈرۈۋاتقاندا '%s' دېگەن خاتالىق " "كۆرۈلدى" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "بىخەتەرلىككە مۇناسىۋەتلىك مۇھىم يېڭىلانمىلار" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "تەۋسىيىلىك يېڭىلانمىلار" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "تەكلىپلىك يېڭىلانمىلار" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backports" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "تارقىتىلمىنىڭ يېڭىلانمىلىرى" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "باشقا يېڭىلانمىلار" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "يېڭىلانما باشقۇرغۇ قوزغىلىۋاتىدۇ" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"يۇمشاق دېتال يېڭىلانمىلىرى خاتالىقلارنى تۈزىتىدۇ، بىخەتەرلىكتىكى بوشلۇقلارنى " -"يوق قىلىدۇ، يېڭى ئىقتىدارلارنى تەمىنلەيدۇ." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "قىسمىي يۈكسەلدۈر(_P)" @@ -2180,37 +2201,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "يۇمشاق دېتال يېڭىلانمىلىرى" +msgid "Update Manager" +msgstr "يېڭىلانما باشقۇرغۇ(Update Manager)" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "يۇمشاق دېتال يېڭىلانمىلىرى" +msgid "Starting Update Manager" +msgstr "«يېڭىلانما باشقۇرغۇ(Update Manager)» قوزغىلىۋاتىدۇ" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "يۈكسەلدۈرۈش(_P)" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "يېڭىلانمىلار" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "ئورنات" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "ئۆزگىرىشلەر" +msgid "updates" +msgstr "يېڭىلانمىلار" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "چۈشەندۈرۈش" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "يېڭىلانمىنىڭ چۈشەندۈرۈلۈشى" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2218,25 +2229,35 @@ "كەزمە مۇلازىمەت ئارقىلىق باغلىنىۋاتىسىز. يېڭىلاشتا سانلىق-مەلۇمات ئالاقىسى " "ئۈچۈن جىقراق پۇل كېتىشى مۇمكىن." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "سىمسىز مودېم ئارىلىق باغلاندىڭىز" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "يېڭىلاشتىن ئاۋۋال كومپيۇتېرنى AC(سىرتقى توك مەنبەسى) گە ئۇلاپ قويسىڭىز " "بىخەتەر بولىدۇ." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "يېڭىلانمىنى ئورنات(_I)" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "ئۆزگىرىشلەر" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "تەڭشەك(_S)…" +msgid "Description" +msgstr "چۈشەندۈرۈش" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "ئورنات" +msgid "Description of update" +msgstr "يېڭىلانمىنىڭ چۈشەندۈرۈلۈشى" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "تەڭشەك(_S)…" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2259,9 +2280,8 @@ msgstr "يېڭى ئۇبۇنتۇغا يۈكسەلدۈرۈشنى رەت قىلدىڭىز" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "يېڭىلانما باشقۇرغۇدىكى «يۈكسەلدۈر» نى چېكىش ئارقىلىق كېيىن يەنە " @@ -2275,58 +2295,58 @@ msgid "Show and install available updates" msgstr "بار بولغان يېڭىلانمىلارنى كۆرسىتىش ۋە ئورنىتىش" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "نەشرىنى كۆرسىتىپ چېكىنىش" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "سانلىق-مەلۇمات ھۆججەتلىرىنى ئوز ئىچىگە ئالغان مۇندەرىجە" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "ئۇبۇنتۇنىڭ يېڭى نەشرى بارمۇ-يوق تەكشۈرۈش" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "مۇمكىن ئىجادىيەت باسقۇچىدىكى نەشرنى تەكشۈرسۇن" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "ئەڭ يېڭى نەشرىدە تەۋسىيە قىلىنغان يۈكسەلدۈرگۈچنى ئىشلىتىپ يۈكسەلدۈرۈش" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "قوزغالغاندا كۆزنەك فوكۇسلانمىسۇن" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "«dist-upgrade» نى ئىجرا قىلىپ بېقىش" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "باشلانغاندا يېڭىلانمىلارنى تەكشۈرمە" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "sandbox aufs overlay بىلەن يۈكسەلدۈرۈشنى سىناپ بېقىش" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "قىسمى يۈكسەلدۈرۈشنى ئىجرا قىلىۋاتىدۇ" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "بوغچىنىڭ ئۆزگەرتىلىش خاتىرىسىنى ئەمەس چۈشەندۈرۈشلىرىنى كۆرسەتسۇن" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "$distro-proposed دىكى يۈكسەلدۈرگۈچنى ئىشلىتىپ ئەڭ يېڭى نەشرىگە يۈكسەلدۈرۈپ " "بېقىڭ." -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2336,11 +2356,11 @@ "نۆۋەتتە ئۈستەلئۈستى نەشرىدە 'desktop' دېگەن تاللانمىنى، مۇلازىمېتىر نەشرىدە " "'server' دېگەن تاللانمىنى قوللايدۇ." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "بەلگىلەنگەن ئالدىئۇچنى ئىجرا قىلىش" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2348,11 +2368,11 @@ "ئۇبۇنتۇنىڭ يېڭى نەشرىنىڭ بار-يوقلۇقىنىلا تەكشۈرۈپ، نەتىجىنى exit code مەلۇم " "قىلىش" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Ubuntu نىڭ يېڭى نەشرىنى تەكشۈرۈش" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2361,68 +2381,68 @@ "قىلىڭ:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "يېڭى نەشرى يوقكەن" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "يېڭى نەشرى '%s' بار ئىكەن." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "يۈكسەلدۈرۈش ئۈچۈن 'do-release-upgrade' نى ئىجرا قىلىڭ." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" -msgstr "ئۇبۇنتۇ %(version) نىڭ يۈكسەلدۈرمىسى بار ئىكەن" +msgstr "ئۇبۇنتۇ %(version)s نىڭ يۈكسەلدۈرمىسى بار ئىكەن" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "ئۇبۇنتۇ %s غا يۈكسەلدۈرۈشنى رەت قىلدىڭىز" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "سازلاش نەتىجىلىرىنى چىقىرىشنى قوشۇش" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "مەزكۇر كومپيۇتېردىكى قوللىمايدىغان بوغچىلارنى كۆرسىتىش" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "مەزكۇر كومپيۇتېردىكى قوللايدىغان بوغچىلارنى كۆرسىتىش" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "بارلىق بوغچا ۋە ئۇلارنىڭ ھالىتىنى كۆرسىتىش" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "ھەممە بوغچىلارنى بىر تىزىمدا كۆرسىتىش" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "‹%s› نىڭ قوللاش ھالىتى:" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "%(num)s دانە بوغچا (%(percent).1f%%) نى %(time)s غىچە قوللايدۇ" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "%(num)s دانە بوغچا (%(percent).1f%%) نى ئەمدى چۈشۈرگىلى بولمايدۇ" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "%(num)s دانە بوغچا (%(percent).1f%%) نى قوللىمايدۇ" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2430,54 +2450,71 @@ "تەپسىلىي ئۇچۇرلارنى كۆرۈش ئۈچۈن --show-unsupported، --show-supported ياكى --" "show-all نى قوشۇپ ئىجرا قىلىڭ" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "ئەمدى چۈشۈرگىلى بولمايدىغانلىرى:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "قوللىمايدىغانلىرى: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "%s غىچە قوللايدىغانلىرى:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "قوللىمايدۇ" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "ئەمەلىيلەشتۈرۈلمىگەن ئۇسۇل: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "دىسكىدىكى بىر ھۆججەت" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb بوغچىسى" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "يوقالغان بوغچىلارنى ئورنىتىش" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "%s دېگەن بوغچا چوقۇم ئورنىتىلىشى كېرەك." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb بوغچىسى" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s غا قولدا ئورنىتىلغان دېگەن بەلگە قويۇلۇشى زۆرۈر." +msgid "%i obsolete entries in the status file" +msgstr "ھالەت ھۆججىتىدە %i دانە تاشلىۋېتىلگەن مەزمۇن بار" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "dpkg ھالەت ھۆججىتىدىكى تاشلىۋېتىلگەن مەزمۇنلار" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "تاشلىۋېتىلگەن dpkg ھالەت مەزمۇنلىرى" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2486,67 +2523,81 @@ "نىمۇ ئورنىتىش زۆرۈردۇر. تەپسىلاتىنى bugs.launchpad.net دىكى كەمتۈك #279621 " "دىن كۆرۈڭ." -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "ھالەت ھۆججىتىدە %i دانە تاشلىۋېتىلگەن مەزمۇن بار" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "dpkg ھالەت ھۆججىتىدىكى تاشلىۋېتىلگەن مەزمۇنلار" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "تاشلىۋېتىلگەن dpkg ھالەت مەزمۇنلىرى" +msgid "%s needs to be marked as manually installed." +msgstr "%s غا قولدا ئورنىتىلغان دېگەن بەلگە قويۇلۇشى زۆرۈر." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "grub ئورنىتىلغانلىقى ئۈچۈن lilo نى ئۆچۈرۈڭ. (تەپسىلاتىنى bug #314004 دىن " "كۆرۈڭ)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "بوغچا ئۇچۇرى يېڭىلانغاندىن كېيىن، مۇھىم بوغچا ‹%s› تېپىلمىدى. شۇڭا كەمتۈك " -#~ "مەلۇم قىلىش جەريانى باشلىنىۋاتىدۇ." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "ئۇبۇنتۇ 12.04 نەشرىگە يۈكسەلدۈرۈش" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s دانە يېڭىلانما تاللاندى." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "ئۇبۇنتۇغا مەرھابا" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "بۇ يۇمشاق دېتال يېڭىلانمىلىرى، ئۇبۇنتۇنىڭ مەزكۇر نەشرى ئېلان قىلىنغاندىن " -#~ "كېيىن تارقىتىلدى." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "مەزكۇر كومپيۇتېر ئۈچۈن يۇمشاق دېتال يېڭىلانمىلىرى بار." - -#~ msgid "Update Manager" -#~ msgstr "يېڭىلانما باشقۇرغۇ(Update Manager)" - -#~ msgid "Starting Update Manager" -#~ msgstr "«يېڭىلانما باشقۇرغۇ(Update Manager)» قوزغىلىۋاتىدۇ" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "سىمسىز مودېم ئارىلىق باغلاندىڭىز" - -#~ msgid "_Install Updates" -#~ msgstr "يېڭىلانمىنى ئورنات(_I)" +#~ "بوغچا ئۇچۇرى يېڭىلانغاندىن كېيىن، مۇھىم بوغچا ‹%s› تېپىلمىدى. شۇڭا كەمتۈك " +#~ "مەلۇم قىلىش جەريانى باشلىنىۋاتىدۇ." #~ msgid "Your system is up-to-date" #~ msgstr "سىستېمىڭىز ئەڭ يېڭى ھالەتتە" @@ -2578,6 +2629,9 @@ #~ msgid "%.0f kB" #~ msgstr "%.0f kB" +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "ئۇبۇنتۇ 11.10 نەشرىگە يۈكسەلدۈرۈش" + #~ msgid "Your graphics hardware may not be fully supported in Ubuntu 11.04." #~ msgstr "" #~ "سىزنىڭ گرافىك قاتتىق دېتالىڭىزنى ئۇبۇنتۇ 11.04 تولۇق قوللىماسلىقى مۇمكىن." diff -Nru update-manager-17.10.11/po/uk.po update-manager-0.156.14.15/po/uk.po --- update-manager-17.10.11/po/uk.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/uk.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # Vadim Abramchuck , 2006. # Ukrainian translation of update-manager. # Copyright (C) 2005, 2006 Free Software Foundation, Inc. +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: uk(5)\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-04-13 01:02+0000\n" "Last-Translator: Leonid Yaitskiy \n" "Language-Team: Ukrainian \n" @@ -21,7 +22,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -30,13 +31,13 @@ msgstr[2] "%(size).0f кБ" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f Mб" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Сервер для %s" @@ -44,20 +45,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Основний сервер" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Сервери користувача" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Неможливо підрахувати запис sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -65,11 +66,11 @@ "Не вдалося знайти жодного файлу пакунків; можливо, це не диск Ubuntu або " "диск для іншої архітектури?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Не вдалося додати компакт-диск" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -83,14 +84,14 @@ "Повідомлення про помилку:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Вилучити пакунок, що знаходиться в поганому стані" msgstr[1] "Вилучити пакунки, що знаходяться в поганому стані" msgstr[2] "Вилучити пакунки, що знаходяться в поганому стані" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -115,15 +116,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Схоже, що сервер перенавантажений" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Пошкоджені пакунки" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -132,7 +133,7 @@ "цією програмою. Будь-ласка, виправіть їх програмами synaptic або apt-get." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -153,11 +154,11 @@ " * Неофіційні пакунки програм, що не підтримуються Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Перелік змін ще не готовий, спробуйте пізніше." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -165,16 +166,16 @@ "Якщо нічого з цього не спрацює, тоді повідомте, будь-ласка, про цю помилку, " "використовуючи в Терміналі команду 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Не вдалося розрахувати оновлення" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Помилка аутенфікації деяких пакетів" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -184,29 +185,29 @@ "мережі. Можливо, Ви захочете спробувати пізніше. Список не перевірених " "пакетів надано нижче." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" "Пакунок '%s' помічено для видалення, але він в чорному списку видалення." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Важливий пакунок '%s' помічено для видалення." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Спроба встановити версію '%s' чорного списку" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Не можливо встановити '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -215,11 +216,11 @@ "помилку, використовуючи в Терміналі команду 'ubuntu-bug update-manager'." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Не можливо підібрати meta-пакунок" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -233,15 +234,15 @@ " Будь ласка, спочатку встановіть один з цих пакунків, використовуючи " "synaptic або apt-get." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Зчитування кешу" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Не вдалося отримати ексклюзивне блокування" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -249,11 +250,11 @@ "Це зазвичай значить, що запущено інший менеджер пакунків (наприклад, apt-get " "або aptitude). Будь ласка, спочатку закрийте цю програму." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Віддалене оновлення системи більше не підтримується" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -266,11 +267,11 @@ "\n" "Оновлення зупинене. Спробуйте без ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Продовжити роботу через SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -287,11 +288,11 @@ "Якщо Ви продовжите, буде запущено додаткову службу ssh на порті '%s'.\n" "Чи бажаєте продовжити?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Запуск додаткового sshd" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -302,7 +303,7 @@ "додатковий sshd. Якщо щось піде не так із запуском ssh, Ви все ще зможете " "під'єднатись до другого.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -315,29 +316,29 @@ "наступним чином:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Оновлення неможливе" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Оновлення з '%s' до '%s' цією програмою не підтримується." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Помилка встановлення в пісочниці" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Не вдалося створити середовище для пісочниці" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Режим пісочниці" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -352,18 +353,18 @@ "*Ні* зміни записані до системної директорії з цього моменту до наступного " "перезапуску будуть постійні." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Ваше встановлення пакету python пошкоджене. Виправте посилання '/usr/bin/" "python'." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Пакунок 'debsig-verify' встановлено" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -373,12 +374,12 @@ "Будь ласка, спочатку вилучіть його за домогою synaptic або командою 'apt-get " "remove debsig-verify' та спробуйте запустити оновлення знову." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Неможливо виконати запис в '%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -389,11 +390,11 @@ "не може бути продовженим.\n" "Переконайтеся, що системний каталог доступний для запису." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Додати останні оновлення з Інтернету?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -413,16 +414,16 @@ "останні оновлення одразу після завершення процесу оновлення.\n" "Якщо Ви тут відповісте 'ні', мережа не буде використовуватись взагалі." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "відключено під час оновлення до %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Не знайдено правильного дзеркала" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -442,11 +443,11 @@ "Якщо ви оберете 'Ні' оновлення не відбудеться." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Створити типові джерела?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -460,11 +461,11 @@ "Додати типовий запис для '%s'? Якщо ви оберете 'Ні', оновлення буде " "скасовано." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Помилка в даних про сховище" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -472,11 +473,11 @@ "Оновлення інформації про репозиторій закінчилося невдачею (недійсний файл), " "тому запустився процес звітування про помилку." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Сторонні джерела відключені" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -486,14 +487,14 @@ "знову включити їх після оновлення за допомогою програми 'software-" "properties' чи менеджера пакунків." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Пакунок у незадовільному стані" msgstr[1] "Пакунки у незадовільному стані" msgstr[2] "Пакунків у незадовільному стані" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -516,11 +517,11 @@ "але не знайдено жодного архіву для них. Будь ласка, перевстановіть пакунки " "вручну чи вилучіть їх з системи." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Помилка під час оновлення" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -528,13 +529,13 @@ "Під час оновлення сталася помилка. Це зазвичай викликано проблемами у " "мережі, будь ласка, перевірте Ваше мережеве з’єднання та спробуйте знову." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Недостатньо місця на диску" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -549,21 +550,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Проводиться аналіз змін" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Бажаєте почати оновлення системи?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Оновлення скасовано" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -571,12 +572,12 @@ "Оновлення буде скасовано та систему буде відновлено до попереднього стану. " "Ви зможете продовжити оновлення пізніше." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Неможливо завантажити пакунки для оновлення системи" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -587,27 +588,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Помилка при фіксації" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Відновлення первісного стану системи" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Неможливо провести оновлення системи" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -615,7 +616,7 @@ "Оновлення було перервано. Ваша система може бути в нестабільному стані. " "Зараз буде запущено процес відновлення (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -632,7 +633,7 @@ "upgrade/ до звіту.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -640,20 +641,20 @@ "Оновлення було перервано. Будь ласка, перевірте Ваше з'єднання з Інтернетом " "чи носій для встановлення та спробуйте знову. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Видалити застарілі пакунки?" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Залишити" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "Видалити" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -663,27 +664,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Необхідний пакет (залежність) не встановлений" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Необхідний пакет (залежність) '%s' не встановлений. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Перевірка програми управління пакунками" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Підготовка до оновлення не вдалася" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -691,11 +692,11 @@ "Підготовка системи до оновлення закінчилася невдало. Почато процес " "звітування про помилку." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Помилка отримання необхідних файлів для оновлення" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -708,68 +709,68 @@ "\n" "Також почато процес звітування про помилку." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Оновлення інформації про сховище" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Помилка при підключенні CD-ROM" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "На жаль, не вдалося підключити CD-ROM" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Невірна інформація про пакунок" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Отримання" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Процес оновлення" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Оновлення завершено" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "Оновлення було завершено, але в його процесі виникли деякі помилки." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Пошук застарілих програм" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Оновлення системи завершено." -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Часткове оновлення завершене." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "використовується evms" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -779,11 +780,11 @@ "'evms' більше не підтримується, будь ласка, вимкніть її та запустіть " "оновлення знову." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "Ваш графічний пристрій підтримується Ubuntu 12.04 LTS не повністю." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -795,9 +796,9 @@ "інформації відвідайте https://wiki.ubuntu.com/X/Bugs/" "UpdateManagerWarningForI8xx Ви дійсно бажаєте продовжити оновлення?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -805,8 +806,8 @@ "Оновлення може уповільнити ефекти робочого столу, продуктивність роботи в " "іграх та інших графічно складних програмах." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -820,7 +821,7 @@ "\n" "Чи хочете ви продовжувати?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -834,11 +835,11 @@ "\n" "Чи хочете ви продовжувати?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Немає процесора i686" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -850,11 +851,11 @@ "архітектуру. Неможливо оновити систему до нової версії Ubuntu на цьому " "комп’ютері." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Немає ARMv6 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -866,11 +867,11 @@ "як мінімум. Оновлення вашої системи до нового випуску Ubuntu неможливе на " "даному обладнанні." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Служба init недоступна" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -886,15 +887,15 @@ "\n" "Ви впевнені, що хочете продовжити?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Оновлення Sandbox з використанням aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Вживати наступний шлях для пошуку компакт-диска з пакунками оновлення" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -902,57 +903,57 @@ "Використовувати інтерфейс. В наявності: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*ЗАСТАРІЛЕ* Цю опцію буде проігноровано" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "Виконати лише часткове оновлення (без перезапису sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Вимкнути підтримку GNU screen" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Вказати каталог з даними" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Вставте '%s' в привід '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Отримання завершено" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Отримання файлу %li з %li на швидкості %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Приблизно '%s' залишилось" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Отримання файлу %li з %li" @@ -962,27 +963,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Застосування змін" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "проблеми з залежностями - залишається неналаштованим" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Не вдалося встановити '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -994,7 +995,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -1005,7 +1006,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -1013,20 +1014,20 @@ "Ви втратите всі зроблені Вами у цьому конфігураційному файлі зміни якщо " "заміните його новою версією." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Команда 'diff' не знайдена" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Виникла невиправна помилка" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1039,13 +1040,13 @@ "Ваш оригінальний sources.list було збережено в /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Натиснено Ctrl-c" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1054,134 +1055,134 @@ "все ще хочете це зробити?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "Для запобігання втрати інформації закрийте усі програми та документи." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Більше не підтримується Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Встановлення старої версії (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Видалити (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Більш не потрібен (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Встановлення (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Оновлення (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Зміна носія" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Показати відмінності >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Сховати відмінності" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Помилка" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Скасувати" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Закрити" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Показати Термінал >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Сховати Термінал" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Інформація" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Деталі" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Більш не підтримується %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Видалити %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Видалити (був автоматично інстальований) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Встановити %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Оновити %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Необхідне перезавантаження" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Перезавантажте систему для завершення оновлення" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "Перезапустити зараз" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1193,11 +1194,11 @@ "Система може потрапити у непридатний стан, якщо скасувати оновлення. Вам " "наполегливо рекомендується продовжити оновлення." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Скасувати оновлення?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" @@ -1205,7 +1206,7 @@ msgstr[1] "%li дні" msgstr[2] "%li днів" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" @@ -1213,7 +1214,7 @@ msgstr[1] "%li години" msgstr[2] "%li годин" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" @@ -1221,7 +1222,7 @@ msgstr[1] "%li хвилини" msgstr[2] "%li хвилин" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1238,7 +1239,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1252,14 +1253,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1269,34 +1270,32 @@ "модемом." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Це завантаження триватиме приблизно %s. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Підготовка до оновлення" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Отримання нових каналів програм" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Отримання нових пакунків" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Встановлення оновлень" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Очищення" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1316,7 +1315,7 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." @@ -1326,7 +1325,7 @@ msgstr[1] "%d пакети буде видалено." msgstr[2] "%d пакетів буде видалено." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." @@ -1334,7 +1333,7 @@ msgstr[1] "Буде встановлено %d нових пекети." msgstr[2] "Буде встановлено %d нових пекетів." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." @@ -1342,7 +1341,7 @@ msgstr[1] "Буде оновлено %d пакунки." msgstr[2] "Буде оновлено %d пакунків." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1353,7 +1352,7 @@ "\n" "Вам треба завантажити всього %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1361,7 +1360,7 @@ "Встановлення оновлень може зайняти декілька годин. Після завершення " "завантаження процес неможливо скасувати." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1369,53 +1368,53 @@ "Отримання та встановлення оновлень може зайняти декілька годин. Після " "завершення завантаження процес неможливо скасувати." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Видалення пакунків може зайняти декілька годин. " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Програмне забезпечення на цьому комп'ютері актуальне." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "Немає оновлень для Вашої системи. Оновлення буде скасовано." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Необхідно перезавантажити систему" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Виконання оновлення завершено. Необхідно перезавантажити систему. " "Перезавантажити зара?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "автентифікувати '%(file)s' замість '%(signature)s' " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "видобування '%s'" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Неможливо провести апргрейд системи" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1423,34 +1422,34 @@ "Швидше за все, це помилка в засобі оновлення. Повідомте, будь-ласка, про цю " "помилку, використовуючи команду 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Підпис інструменту оновлення" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Інструмент оновлення" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Не вдалося отримати" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" "Не вдалося отримати оновлення. Це може бути викликано проблемою у мережі. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Помилка аутентифікації" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " @@ -1458,13 +1457,13 @@ "Автентифікація оновлення зазнала краху. Це може бути викликано проблемою з " "мережею або сервером. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Не вдалося розпакувати" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1472,13 +1471,13 @@ "Не вдалося розпакувати оновлення. Можливо, виникла проблема в мережі або на " "сервері. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Перевірка не вдала" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " @@ -1486,15 +1485,15 @@ "Не вдалося перевірити наявність оновлень. Можливо, виникла проблема в мережі " "або на сервері. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Не вдається почати оновлення" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1502,13 +1501,13 @@ "Це, зазвичай, виникає в системах з /tmp змонтованому з noexec. Перемонтуйте, " "будь-ласка, без noexec та виконайте оновлення знов." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Повідомлення про помилку: '%s'." -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1521,73 +1520,73 @@ "Ваш оригінальний sources.list було збережено в /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Перервано" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Понижено версію:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Щоб продовжити натисніть [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "Продовжити [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Подробиці [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Більше не підтримується: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Видалити: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Встановити %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Оновити %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Продовжити [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1654,9 +1653,8 @@ msgstr "Оновлення дистрибутивів" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Оновлення Ubuntu до версії 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Оновлення Ubuntu до версії 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1674,84 +1672,85 @@ msgid "Terminal" msgstr "Термінал" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Будь ласка, зачекайте, це може зайняти деякий час." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Оновлення завершено" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Не вдалося знайти примітки випуску." -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Сервер може бути перенавантажений. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Не вдалося завантажити примітки випуску." -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Будь ласка, перевірте ваше з'єднання з Інтернетом." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Оновлення" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Відомості про релізе" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Завантаження додаткових файлів пакунків..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Файл %s з %s при %sБ/с" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Файл %s з %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Відкрити посилання в браузері" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Копіювати посилання в буфер обміну" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Завантаження файлу %(current)li з %(total)li із швидкістю %(speed)s/с" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Завантаження файлу %(current)li з %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Ваша версія Ubuntu вже не підтримується." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1759,52 +1758,59 @@ "Ви надалі не отримуватимете жодних виправлень безпеки та критичних оновлень. " "Будь ласка, оновіть систему до пізнішої версії Ubuntu." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Інформація про оновлення" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Встановлення" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Назва" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Версія %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Ви не можете завантажити список змін за відсутності з’єднання з інтернетом." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Завантаження списку змін..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Прибрати виділення" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "Вибрати _все" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "Обрано %(count)s оновлення." +msgstr[1] "Обрано %(count)s оновлення." +msgstr[2] "Обрано %(count)s оновлень." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s буде завантажено." #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "Оновлення завантажено, але не встановлено." msgstr[1] "Оновлення завантажено, але не встановлено." msgstr[2] "Оновлення завантажено, але не встановлено." @@ -1813,11 +1819,18 @@ msgid "There are no updates to install." msgstr "Немає оновлень для встановлення." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Завантажувальний розмір невідомий." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1825,7 +1838,7 @@ "Неможливо з’ясувати коли було востаннє оновлено інформацію про пакунки. " "Натисніть, будь-ласка, кнопку \"Перевірити\" щоб зробити це зараз." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1834,7 +1847,7 @@ "Інформація про пакунки востаннє була оновлена %(days_ago)s днів тому.\n" "Натисніть кнопку \"Перевірка\" для перевірки наявності оновлень." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." @@ -1842,7 +1855,7 @@ msgstr[1] "Інформація про пакунки була оновлена %(days_ago)s днів тому." msgstr[2] "Інформація про пакунки була оновлена %(days_ago)s днів тому." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1852,36 +1865,46 @@ msgstr[2] "Інформація про пакунки була оновлена %(hours_ago)s годин тому." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Інформація про пакунки востаннє була оновлена близько %s хвилин тому." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Інформація про пакунки була щойно оновлена." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Оновлення програм виправляють помилки, проблеми безпеки та додають нові " +"можливості." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" "Для вашого комп'ютера можуть бути доступні оновлення програмного " "забезпечення." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Ласкаво просимо в Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" -msgstr "" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "Ці оновлення було випущено з моменту випуску цієї версії Ubuntu." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Для цього комп’ютера доступні оновлення програмного забезпечення." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1893,7 +1916,7 @@ "смітник і видаліть тимчасові пакети колишніх об'єктів за допомогою 'sudo apt-" "get clean'." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1901,23 +1924,23 @@ "Комп’ютер потребує перезавантаження для завершення встановлення оновлень. " "Збережіть ваші дані перед тим як продовжити." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Зчитування інформації про пакунок" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "З’єднання..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "Ви не можете перевірити наявність оновлень або завантажити оновлення." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Неможливо ініціалізувати інформацію про пакунок" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1931,7 +1954,7 @@ "Будь ласка, повідомте про цю помилку в \"Менеджері оновлення\" та включіть у " "звіт таке повідомлення:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1944,31 +1967,31 @@ "Будь ласка, повідомте про цю помилку в \"Менеджері оновлення\" та включіть у " "звіт таке повідомлення:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Нове встановлення)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Розмір %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Від версії %(old_version)s до %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Версія %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Оновлення реліза зараз неможливо." -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1977,21 +2000,21 @@ "Оновлення реліза не може бути виконано зараз, будь ласка, спробуйте пізніше. " "Сервер повідомив: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Завантаження засобу оновлення випуску" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Новий випуск Ubuntu '%s' є доступним" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Індекс програм пошкоджений" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -2001,6 +2024,17 @@ "використовуйте менеджер пакетів \"Synaptic\" або запустіть в терміналі " "\"sudo apt-get install -f\"." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Доступний новий реліз '%s' ." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Скасувати" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Перевірити наявність оновлень" @@ -2010,22 +2044,18 @@ msgstr "Встановити всі доступні оновлення" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Скасувати" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Журнал змін" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Оновлення" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Формується список оновлень" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -2049,20 +2079,20 @@ " * Неофіційним програмним забезпеченням, яке не підтримується Ubuntu\n" " * Звичайними змінами у попередніх випусках Ubuntu" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Завантаження списку змін" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Інші оновлення (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "Це оновлення надходить з джерела, що не підтримує журналювання змін." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2070,7 +2100,7 @@ "Помилка завантаження списку змін. \n" "Перевірте з'єднання з Internet." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2083,7 +2113,7 @@ "Доступна версія: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2097,7 +2127,7 @@ "+changelog,\n" "доки зміни не стануть доступними, або спробуйте знову пізніше." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2111,52 +2141,43 @@ "+changelog,\n" "доки зміни не стануть доступними, або спробуйте знову пізніше." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Не вдалося визначити дистрибутив" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Виникла помилка '%s' при перевірці яку систему Ви використовуєте." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Важливі оновлення безпеки" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Рекоменодовані оновлення" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Пропоновані оновлення" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backports" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Оновлення дистрибутиву" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Інші оновлення" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Запуск менеджера оновлень" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Оновлення програм виправляють помилки, проблеми безпеки та додають нові " -"можливості." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Часткове оновлення" @@ -2229,37 +2250,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Оновлення програм" +msgid "Update Manager" +msgstr "Менеджер оновлення" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Оновлення програм" +msgid "Starting Update Manager" +msgstr "Запуск менеджера оновлень." #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "Оновити" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "оновлення" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Встановлення" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Зміни" +msgid "updates" +msgstr "оновлення" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Опис" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Опис оновлень" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2267,25 +2278,35 @@ "Ви під'єднані в режимі роумінгу, тому може стягуватися додаткова плата за " "дані, передані під час цього оновлення." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Ви під’єднані за допомогою бездротового модему." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Безпечніше буде під'єднати комп'ютер до мережі змінного струму перед " "оновленням." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Встановлення оновлень" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Зміни" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "_Параметри…" +msgid "Description" +msgstr "Опис" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Встановлення" +msgid "Description of update" +msgstr "Опис оновлень" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "_Параметри…" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2308,9 +2329,8 @@ msgstr "Ви відмовилось від оновлення Ubuntu до нової версії" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Ви можете оновити систему пізніше, відкривши Менеджер Оновлень і натиснув " @@ -2324,59 +2344,59 @@ msgid "Show and install available updates" msgstr "Перегляд і встановлення доступних оновлень" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Показати версію та вийти" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Каталог, який вміщує файли даних." -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Перевірити чи доступний новий випуск Ubuntu" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" "Перевірити можливість оновлення до останнього випуску, що перебуває в стані " "розробки" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" "Оновити, використовуючи найновішу, запропоновану оновлювачем випусків, версію" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Не вибирати карту при запуску" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Спробуйте запустить dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Не перевіряти оновлення під час старту" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Протестувати оновлення в безпечному режимі" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Проводиться часткове оновлення" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Показати опис пакета замість журналу змін." -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "Спробуйте оновитись до останньої версії за допомогою $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2386,11 +2406,11 @@ "Наразі підтримуються режим \"стільниця\" для регулярного оновлення " "персональних робочих станцій та \"сервер\" для серверних систем." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Запустити вказаний інтерфейс оболонки" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2398,11 +2418,11 @@ "Перевіряти доступність нової версії дистрибутива і повертати результат за " "допомогою кода виходу." -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Перевіряється наявність нового випуску Ubuntu" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2410,59 +2430,59 @@ "Для отримання інформації щодо оновлення, будь ласка, відвідайте:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Нової версії не знайдено" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Доступний новий реліз '%s' ." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Виконайте команду 'do-release-upgrade' для оновлення." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Доступне оновлення Ubuntu %(version)s" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Ви відмовились від оновлення до Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Додати результати відладки" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Показати непідтримувані пакунки на цьому комп'ютері." -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Показати підтримувані пакунки на цьому комп'ютері." -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Показати всі пакунки з їх статусами" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Показати список всіх пакунків" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Сумарний статус підтримки '%s':" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" "Ви маєте %(num)s пакунків (%(percent).1f%%) з них підтримуються до %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" @@ -2470,11 +2490,11 @@ "Ви маєте %(num)s пакунків (%(percent).1f%%) яких вже/взагалі не можуть бути " "завантажені." -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "Ви маєте %(num)s пакунків (%(percent).1f%%) яких не підтримуються." -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2482,54 +2502,71 @@ "Запустить з --show-unsupported, --show-supported або --show-all, щоб " "подивитьсь більш детально" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Більше не доступне для завантаження" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Не підтримується: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Підтримується до %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Не підтримується" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Незадіяний метод: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Файл на диску" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb пакунок" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Встановлення відсутніх пакунків." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Пакунок %s повинен бути встановлений." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb пакунок" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s повинен бути позначений як встановлений вручну ." +msgid "%i obsolete entries in the status file" +msgstr "%i застарілі записи в файлі статусу" + +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "Застарілі записи в dpkg статусі" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "Застарілі записи dpkg статусів" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." @@ -2538,67 +2575,81 @@ "встановлено kdelibs5-dev. Див. bugs.launchpad.net, bug #279621 для детальної " "інформації." -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" -msgstr "%i застарілі записи в файлі статусу" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" -msgstr "Застарілі записи в dpkg статусі" - -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" -msgstr "Застарілі записи dpkg статусів" +msgid "%s needs to be marked as manually installed." +msgstr "%s повинен бути позначений як встановлений вручну ." -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" "Видаліть LILO після того, як встановлено GRUB. (Дивіться помилку #314004 для " "більш детальної інформації)." -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Після того, як пакет '%s' був оновлений, його не вдається знайти, тому " -#~ "процес звітування про помилку розпочався." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Оновлення Ubuntu до версії 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "Обрано %(count)s оновлення." -#~ msgstr[1] "Обрано %(count)s оновлення." -#~ msgstr[2] "Обрано %(count)s оновлень." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Ласкаво просимо в Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." -#~ msgstr "Ці оновлення було випущено з моменту випуску цієї версії Ubuntu." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Для цього комп’ютера доступні оновлення програмного забезпечення." - -#~ msgid "Update Manager" -#~ msgstr "Менеджер оновлення" - -#~ msgid "Starting Update Manager" -#~ msgstr "Запуск менеджера оновлень." - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Ви під’єднані за допомогою бездротового модему." - -#~ msgid "_Install Updates" -#~ msgstr "_Встановлення оновлень" +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." +#~ msgstr "" +#~ "Після того, як пакет '%s' був оновлений, його не вдається знайти, тому " +#~ "процес звітування про помилку розпочався." #~ msgid "Checking for a new ubuntu release" #~ msgstr "Перевірка нової версії Ubuntu" @@ -2719,6 +2770,9 @@ #~ "це, використовуючи в Терміналі команду 'ubuntu-bug update-manager', та " #~ "додайте до звіту файли з /var/log/dist-upgrade/." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Оновлення Ubuntu до версії 11.10" + #~ msgid "%.0f kB" #~ msgstr "%.0f кБ" diff -Nru update-manager-17.10.11/po/update-manager.pot update-manager-0.156.14.15/po/update-manager.pot --- update-manager-17.10.11/po/update-manager.pot 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/update-manager.pot 2017-12-23 05:00:38.000000000 +0000 @@ -3,12 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#: ../hwe-support-status:167 #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-20 10:14-0700\n" +"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,137 +19,1662 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: ../UpdateManager/backend/InstallBackendAptdaemon.py:68 -msgid "Checking for updates…" +#. TRANSLATORS: download size of small updates, e.g. "250 kB" +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 +#, python-format +msgid "%(size).0f kB" +msgid_plural "%(size).0f kB" +msgstr[0] "" +msgstr[1] "" + +#. TRANSLATORS: download size of updates, e.g. "2.3 MB" +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 +#, python-format +msgid "%.1f MB" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 +#, python-format +msgid "Server for %s" +msgstr "" + +#. More than one server is used. Since we don't handle this case +#. in the user interface we set "custom servers" to true and +#. append a list of all used servers +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 +msgid "Main server" +msgstr "" + +#: ../DistUpgrade/distro.py:255 +msgid "Custom servers" +msgstr "" + +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 +msgid "Could not calculate sources.list entry" +msgstr "" + +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 +msgid "" +"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " +"wrong architecture?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 +msgid "Failed to add the CD" +msgstr "" + +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 +#, python-format +msgid "" +"There was a error adding the CD, the upgrade will abort. Please report this " +"as a bug if this is a valid Ubuntu CD.\n" +"\n" +"The error message was:\n" +"'%s'" +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:147 +msgid "Remove package in bad state" +msgid_plural "Remove packages in bad state" +msgstr[0] "" +msgstr[1] "" + +#: ../DistUpgrade/DistUpgradeCache.py:150 +#, python-format +msgid "" +"The package '%s' is in an inconsistent state and needs to be reinstalled, " +"but no archive can be found for it. Do you want to remove this package now " +"to continue?" +msgid_plural "" +"The packages '%s' are in an inconsistent state and need to be reinstalled, " +"but no archives can be found for them. Do you want to remove these packages " +"now to continue?" +msgstr[0] "" +msgstr[1] "" + +#. FIXME: not ideal error message, but we just reuse a +#. existing one here to avoid a new string +#: ../DistUpgrade/DistUpgradeCache.py:248 +msgid "The server may be overloaded" +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:361 +msgid "Broken packages" +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:362 +msgid "" +"Your system contains broken packages that couldn't be fixed with this " +"software. Please fix them first using synaptic or apt-get before proceeding." +msgstr "" + +#. FIXME: change the text to something more useful +#: ../DistUpgrade/DistUpgradeCache.py:679 +#, python-format +msgid "" +"An unresolvable problem occurred while calculating the upgrade:\n" +"%s\n" +"\n" +" This can be caused by:\n" +" * Upgrading to a pre-release version of Ubuntu\n" +" * Running the current pre-release version of Ubuntu\n" +" * Unofficial software packages not provided by Ubuntu\n" +"\n" +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:689 +msgid "This is most likely a transient problem, please try again later." +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:692 +msgid "" +"If none of this applies, then please report this bug using the command " +"'ubuntu-bug update-manager' in a terminal." +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 +msgid "Could not calculate the upgrade" +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:748 +msgid "Error authenticating some packages" +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:749 +msgid "" +"It was not possible to authenticate some packages. This may be a transient " +"network problem. You may want to try again later. See below for a list of " +"unauthenticated packages." +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:769 +#, python-format +msgid "" +"The package '%s' is marked for removal but it is in the removal blacklist." +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:773 +#, python-format +msgid "The essential package '%s' is marked for removal." +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:782 +#, python-format +msgid "Trying to install blacklisted version '%s'" +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:900 +#, python-format +msgid "Can't install '%s'" +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:901 +msgid "" +"It was impossible to install a required package. Please report this as a bug " +"using 'ubuntu-bug update-manager' in a terminal." +msgstr "" + +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:912 +msgid "Can't guess meta-package" +msgstr "" + +#: ../DistUpgrade/DistUpgradeCache.py:913 +msgid "" +"Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" +"desktop or edubuntu-desktop package and it was not possible to detect which " +"version of Ubuntu you are running.\n" +" Please install one of the packages above first using synaptic or apt-get " +"before proceeding." +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:100 +msgid "Reading cache" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:209 +msgid "Unable to get exclusive lock" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:210 +msgid "" +"This usually means that another package management application (like apt-get " +"or aptitude) already running. Please close that application first." +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:243 +msgid "Upgrading over remote connection not supported" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:244 +msgid "" +"You are running the upgrade over a remote ssh connection with a frontend " +"that does not support this. Please try a text mode upgrade with 'do-release-" +"upgrade'.\n" +"\n" +"The upgrade will abort now. Please try without ssh." +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:258 +msgid "Continue running under SSH?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:259 +#, python-format +msgid "" +"This session appears to be running under ssh. It is not recommended to " +"perform a upgrade over ssh currently because in case of failure it is harder " +"to recover.\n" +"\n" +"If you continue, an additional ssh daemon will be started at port '%s'.\n" +"Do you want to continue?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:273 +msgid "Starting additional sshd" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:274 +#, python-format +msgid "" +"To make recovery in case of failure easier, an additional sshd will be " +"started on port '%s'. If anything goes wrong with the running ssh you can " +"still connect to the additional one.\n" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:282 +#, python-format +msgid "" +"If you run a firewall, you may need to temporarily open this port. As this " +"is potentially dangerous it's not done automatically. You can open the port " +"with e.g.:\n" +"'%s'" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 +msgid "Can not upgrade" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:355 +#, python-format +msgid "An upgrade from '%s' to '%s' is not supported with this tool." +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:364 +msgid "Sandbox setup failed" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:365 +msgid "It was not possible to create the sandbox environment." +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:371 +msgid "Sandbox mode" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:372 +#, python-format +msgid "" +"This upgrade is running in sandbox (test) mode. All changes are written to " +"'%s' and will be lost on the next reboot.\n" +"\n" +"*No* changes written to a system directory from now until the next reboot " +"are permanent." +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:400 +msgid "" +"Your python install is corrupted. Please fix the '/usr/bin/python' symlink." +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:426 +msgid "Package 'debsig-verify' is installed" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:427 +msgid "" +"The upgrade can not continue with that package installed.\n" +"Please remove it with synaptic or 'apt-get remove debsig-verify' first and " +"run the upgrade again." +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:439 +#, python-format +msgid "Can not write to '%s'" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:440 +#, python-format +msgid "" +"Its not possible to write to the system directory '%s' on your system. The " +"upgrade can not continue.\n" +"Please make sure that the system directory is writable." +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:451 +msgid "Include latest updates from the Internet?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:452 +msgid "" +"The upgrade system can use the internet to automatically download the latest " +"updates and install them during the upgrade. If you have a network " +"connection this is highly recommended.\n" +"\n" +"The upgrade will take longer, but when it is complete, your system will be " +"fully up to date. You can choose not to do this, but you should install the " +"latest updates soon after upgrading.\n" +"If you answer 'no' here, the network is not used at all." +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:672 +#, python-format +msgid "disabled on upgrade to %s" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:699 +msgid "No valid mirror found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:700 +#, python-format +msgid "" +"While scanning your repository information no mirror entry for the upgrade " +"was found. This can happen if you run a internal mirror or if the mirror " +"information is out of date.\n" +"\n" +"Do you want to rewrite your 'sources.list' file anyway? If you choose 'Yes' " +"here it will update all '%s' to '%s' entries.\n" +"If you select 'No' the upgrade will cancel." +msgstr "" + +#. hm, still nothing useful ... +#: ../DistUpgrade/DistUpgradeController.py:720 +msgid "Generate default sources?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:721 +#, python-format +msgid "" +"After scanning your 'sources.list' no valid entry for '%s' was found.\n" +"\n" +"Should default entries for '%s' be added? If you select 'No', the upgrade " +"will cancel." +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:756 +msgid "Repository information invalid" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:757 +msgid "" +"Upgrading the repository information resulted in a invalid file so a bug " +"reporting process is being started." +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:764 +msgid "Third party sources disabled" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:765 +msgid "" +"Some third party entries in your sources.list were disabled. You can re-" +"enable them after the upgrade with the 'software-properties' tool or your " +"package manager." +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:805 +msgid "Package in inconsistent state" +msgid_plural "Packages in inconsistent state" +msgstr[0] "" +msgstr[1] "" + +#: ../DistUpgrade/DistUpgradeController.py:808 +#, python-format +msgid "" +"The package '%s' is in an inconsistent state and needs to be reinstalled, " +"but no archive can be found for it. Please reinstall the package manually or " +"remove it from the system." +msgid_plural "" +"The packages '%s' are in an inconsistent state and need to be reinstalled, " +"but no archive can be found for them. Please reinstall the packages manually " +"or remove them from the system." +msgstr[0] "" +msgstr[1] "" + +#: ../DistUpgrade/DistUpgradeController.py:856 +msgid "Error during update" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:857 +msgid "" +"A problem occurred during the update. This is usually some sort of network " +"problem, please check your network connection and retry." +msgstr "" + +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 +msgid "Not enough free disk space" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:867 +#, python-format +msgid "" +"The upgrade has aborted. The upgrade needs a total of %s free space on disk " +"'%s'. Please free at least an additional %s of disk space on '%s'. Empty " +"your trash and remove temporary packages of former installations using 'sudo " +"apt-get clean'." +msgstr "" + +#. calc the dist-upgrade and see if the removals are ok/expected +#. do the dist-upgrade +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 +msgid "Calculating the changes" +msgstr "" + +#. ask the user +#: ../DistUpgrade/DistUpgradeController.py:928 +msgid "Do you want to start the upgrade?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:994 +msgid "Upgrade canceled" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:995 +msgid "" +"The upgrade will cancel now and the original system state will be restored. " +"You can resume the upgrade at a later time." +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 +msgid "Could not download the upgrades" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1002 +msgid "" +"The upgrade has aborted. Please check your Internet connection or " +"installation media and try again. All files downloaded so far have been kept." +msgstr "" + +#. FIXME: strings are not good, but we are in string freeze +#. currently +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 +msgid "Error during commit" +msgstr "" + +#. generate a new cache +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 +msgid "Restoring original system state" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 +msgid "Could not install the upgrades" +msgstr "" + +#. invoke the frontend now and show a error message +#: ../DistUpgrade/DistUpgradeController.py:1094 +msgid "" +"The upgrade has aborted. Your system could be in an unusable state. A " +"recovery will run now (dpkg --configure -a)." +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1099 +#, python-format +msgid "" +"\n" +"\n" +"Please report this bug in a browser at http://bugs.launchpad.net/ubuntu/" +"+source/update-manager/+filebug and attach the files in /var/log/dist-" +"upgrade/ to the bug report.\n" +"%s" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1136 +msgid "" +"The upgrade has aborted. Please check your Internet connection or " +"installation media and try again. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1216 +msgid "Remove obsolete packages?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1217 +#: ../DistUpgrade/DistUpgrade.ui.h:8 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1217 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1229 +msgid "" +"A problem occurred during the clean-up. Please see the below message for " +"more information. " +msgstr "" + +#. FIXME: instead of error out, fetch and install it +#. here +#: ../DistUpgrade/DistUpgradeController.py:1305 +msgid "Required depends is not installed" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1306 +#, python-format +msgid "The required dependency '%s' is not installed. " +msgstr "" + +#. sanity check (check for ubuntu-desktop, brokenCache etc) +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 +msgid "Checking package manager" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1578 +msgid "Preparing the upgrade failed" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1579 +msgid "" +"Preparing the system for the upgrade failed so a bug reporting process is " +"being started." +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1593 +msgid "Getting upgrade prerequisites failed" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1594 +msgid "" +"The system was unable to get the prerequisites for the upgrade. The upgrade " +"will abort now and restore the original system state.\n" +"\n" +"Additionally, a bug reporting process is being started." +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1622 +msgid "Updating repository information" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1629 +msgid "Failed to add the cdrom" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1630 +msgid "Sorry, adding the cdrom was not successful." +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1658 +msgid "Invalid package information" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1659 +msgid "After updating your package " +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 +msgid "Fetching" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 +msgid "Upgrading" +msgstr "" + +#. don't abort here, because it would restore the sources.list +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 +msgid "Upgrade complete" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 +msgid "" +"The upgrade has completed but there were errors during the upgrade process." +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1702 +msgid "Searching for obsolete software" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1711 +msgid "System upgrade is complete." +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:1761 +msgid "The partial upgrade was completed." +msgstr "" + +#: ../DistUpgrade/DistUpgradeQuirks.py:202 +msgid "evms in use" +msgstr "" + +#: ../DistUpgrade/DistUpgradeQuirks.py:203 +msgid "" +"Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " +"software is no longer supported, please switch it off and run the upgrade " +"again when this is done." +msgstr "" + +#: ../DistUpgrade/DistUpgradeQuirks.py:496 +msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." +msgstr "" + +#: ../DistUpgrade/DistUpgradeQuirks.py:498 +msgid "" +"The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " +"and you may encounter problems after the upgrade. For more information see " +"https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx Do you want to " +"continue with the upgrade?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 +msgid "" +"Upgrading may reduce desktop effects, and performance in games and other " +"graphically intensive programs." +msgstr "" + +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 +msgid "" +"This computer is currently using the NVIDIA 'nvidia' graphics driver. No " +"version of this driver is available that works with your video card in " +"Ubuntu 10.04 LTS.\n" +"\n" +"Do you want to continue?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeQuirks.py:579 +msgid "" +"This computer is currently using the AMD 'fglrx' graphics driver. No version " +"of this driver is available that works with your hardware in Ubuntu 10.04 " +"LTS.\n" +"\n" +"Do you want to continue?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeQuirks.py:609 +msgid "No i686 CPU" +msgstr "" + +#: ../DistUpgrade/DistUpgradeQuirks.py:610 +msgid "" +"Your system uses an i586 CPU or a CPU that does not have the 'cmov' " +"extension. All packages were built with optimizations requiring i686 as the " +"minimal architecture. It is not possible to upgrade your system to a new " +"Ubuntu release with this hardware." +msgstr "" + +#: ../DistUpgrade/DistUpgradeQuirks.py:646 +msgid "No ARMv6 CPU" +msgstr "" + +#: ../DistUpgrade/DistUpgradeQuirks.py:647 +msgid "" +"Your system uses an ARM CPU that is older than the ARMv6 architecture. All " +"packages in karmic were built with optimizations requiring ARMv6 as the " +"minimal architecture. It is not possible to upgrade your system to a new " +"Ubuntu release with this hardware." +msgstr "" + +#: ../DistUpgrade/DistUpgradeQuirks.py:667 +msgid "No init available" +msgstr "" + +#: ../DistUpgrade/DistUpgradeQuirks.py:668 +msgid "" +"Your system appears to be a virtualised environment without an init daemon, " +"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " +"environment, requiring an update to your virtual machine configuration " +"first.\n" +"\n" +"Are you sure you want to continue?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeMain.py:63 +msgid "Sandbox upgrade using aufs" +msgstr "" + +#: ../DistUpgrade/DistUpgradeMain.py:65 +msgid "Use the given path to search for a cdrom with upgradable packages" +msgstr "" + +#: ../DistUpgrade/DistUpgradeMain.py:71 +msgid "" +"Use frontend. Currently available: \n" +"DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" +msgstr "" + +#: ../DistUpgrade/DistUpgradeMain.py:74 +msgid "*DEPRECATED* this option will be ignored" +msgstr "" + +#: ../DistUpgrade/DistUpgradeMain.py:77 +msgid "Perform a partial upgrade only (no sources.list rewriting)" +msgstr "" + +#: ../DistUpgrade/DistUpgradeMain.py:80 +msgid "Disable GNU screen support" +msgstr "" + +#: ../DistUpgrade/DistUpgradeMain.py:82 +msgid "Set datadir" +msgstr "" + +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:114 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:117 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#, python-format +msgid "Please insert '%s' into the drive '%s'" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:138 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 +msgid "Fetching is complete" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:146 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:149 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 +#, python-format +msgid "Fetching file %li of %li at %sB/s" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:152 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 +#, python-format +msgid "About %s remaining" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:152 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 +#, python-format +msgid "Fetching file %li of %li" +msgstr "" + +#. FIXME: add support for the timeout +#. of the terminal (to display something useful then) +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:183 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:186 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 +msgid "Applying changes" +msgstr "" + +#. we do not report followup errors from earlier failures +#: ../DistUpgrade/DistUpgradeViewGtk.py:208 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:212 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 +msgid "dependency problems - leaving unconfigured" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:213 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:217 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 +#, python-format +msgid "Could not install '%s'" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:214 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:218 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 +#, python-format +msgid "" +"The upgrade will continue but the '%s' package may not be in a working " +"state. Please consider submitting a bug report about it." +msgstr "" + +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:231 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:235 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 +#, python-format +msgid "" +"Replace the customized configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:232 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:236 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 +msgid "" +"You will lose any changes you have made to this configuration file if you " +"choose to replace it with a newer version." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 +msgid "A fatal error occurred" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 +msgid "" +"Please report this as a bug (if you haven't already) and include the files /" +"var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " +"report. The upgrade has aborted.\n" +"Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 +msgid "Ctrl-c pressed" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 +msgid "" +"This will abort the operation and may leave the system in a broken state. " +"Are you sure you want to do that?" +msgstr "" + +#. append warning +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 +msgid "To prevent data loss close all open applications and documents." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 +#, python-format +msgid "No longer supported by Canonical (%s)" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 +#, python-format +msgid "Downgrade (%s)" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#, python-format +msgid "Remove (%s)" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#, python-format +msgid "No longer needed (%s)" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#, python-format +msgid "Install (%s)" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#, python-format +msgid "Upgrade (%s)" +msgstr "" + +#. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +msgid "Media Change" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 +msgid "Show Difference >>>" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 +msgid "<<< Hide Difference" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 +msgid "Error" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 +msgid "&Cancel" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 +msgid "&Close" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 +msgid "Show Terminal >>>" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 +msgid "<<< Hide Terminal" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 +msgid "Information" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 +msgid "Details" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 +#, python-format +msgid "No longer supported %s" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 +#, python-format +msgid "Remove %s" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 +#, python-format +msgid "Remove (was auto installed) %s" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 +#, python-format +msgid "Install %s" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 +#, python-format +msgid "Upgrade %s" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 +msgid "Restart required" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +msgid "Restart the system to complete the upgrade" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 +msgid "_Restart Now" +msgstr "" + +#. FIXME make this user friendly +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 +msgid "" +"Cancel the running upgrade?\n" +"\n" +"The system could be in an unusable state if you cancel the upgrade. You are " +"strongly advised to resume the upgrade." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 +msgid "Cancel Upgrade?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeView.py:59 +#, python-format +msgid "%li day" +msgid_plural "%li days" +msgstr[0] "" +msgstr[1] "" + +#: ../DistUpgrade/DistUpgradeView.py:61 +#, python-format +msgid "%li hour" +msgid_plural "%li hours" +msgstr[0] "" +msgstr[1] "" + +#: ../DistUpgrade/DistUpgradeView.py:63 +#, python-format +msgid "%li minute" +msgid_plural "%li minutes" +msgstr[0] "" +msgstr[1] "" + +#: ../DistUpgrade/DistUpgradeView.py:64 +#, python-format +msgid "%li second" +msgid_plural "%li seconds" +msgstr[0] "" +msgstr[1] "" + +#. TRANSLATORS: you can alter the ordering of the remaining time +#. information here if you shuffle %(str_days)s %(str_hours)s %(str_minutes)s +#. around. Make sure to keep all '$(str_*)s' in the translated string +#. and do NOT change anything appart from the ordering. +#. +#. %(str_hours)s will be either "1 hour" or "2 hours" depending on the +#. plural form +#. +#. Note: most western languages will not need to change this +#: ../DistUpgrade/DistUpgradeView.py:80 +#, python-format +msgid "%(str_days)s %(str_hours)s" +msgstr "" + +#. TRANSLATORS: you can alter the ordering of the remaining time +#. information here if you shuffle %(str_hours)s %(str_minutes)s +#. around. Make sure to keep all '$(str_*)s' in the translated string +#. and do NOT change anything appart from the ordering. +#. +#. %(str_hours)s will be either "1 hour" or "2 hours" depending on the +#. plural form +#. +#. Note: most western languages will not need to change this +#: ../DistUpgrade/DistUpgradeView.py:98 +#, python-format +msgid "%(str_hours)s %(str_minutes)s" +msgstr "" + +#. 56 kbit +#. 1Mbit = 1024 kbit +#: ../DistUpgrade/DistUpgradeView.py:149 +#, python-format +msgid "" +"This download will take about %s with a 1Mbit DSL connection and about %s " +"with a 56k modem." +msgstr "" + +#. if we have a estimated speed, use it +#: ../DistUpgrade/DistUpgradeView.py:153 +#, python-format +msgid "This download will take about %s with your connection. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 +msgid "Preparing to upgrade" +msgstr "" + +#: ../DistUpgrade/DistUpgradeView.py:256 +msgid "Getting new software channels" +msgstr "" + +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 +msgid "Getting new packages" +msgstr "" + +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 +msgid "Installing the upgrades" +msgstr "" + +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 +msgid "Cleaning up" +msgstr "" + +#: ../DistUpgrade/DistUpgradeView.py:344 +#, python-format +msgid "" +"%(amount)d installed package is no longer supported by Canonical. You can " +"still get support from the community." +msgid_plural "" +"%(amount)d installed packages are no longer supported by Canonical. You can " +"still get support from the community." +msgstr[0] "" +msgstr[1] "" + +#. FIXME: make those two separate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeView.py:353 +#, python-format +msgid "%d package is going to be removed." +msgid_plural "%d packages are going to be removed." +msgstr[0] "" +msgstr[1] "" + +#: ../DistUpgrade/DistUpgradeView.py:358 +#, python-format +msgid "%d new package is going to be installed." +msgid_plural "%d new packages are going to be installed." +msgstr[0] "" +msgstr[1] "" + +#: ../DistUpgrade/DistUpgradeView.py:364 +#, python-format +msgid "%d package is going to be upgraded." +msgid_plural "%d packages are going to be upgraded." +msgstr[0] "" +msgstr[1] "" + +#: ../DistUpgrade/DistUpgradeView.py:369 +#, python-format +msgid "" +"\n" +"\n" +"You have to download a total of %s. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeView.py:374 +msgid "" +"Installing the upgrade can take several hours. Once the download has " +"finished, the process cannot be canceled." +msgstr "" + +#: ../DistUpgrade/DistUpgradeView.py:378 +msgid "" +"Fetching and installing the upgrade can take several hours. Once the " +"download has finished, the process cannot be canceled." +msgstr "" + +#: ../DistUpgrade/DistUpgradeView.py:383 +msgid "Removing the packages can take several hours. " +msgstr "" + +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 +msgid "The software on this computer is up to date." +msgstr "" + +#: ../DistUpgrade/DistUpgradeView.py:389 +msgid "" +"There are no upgrades available for your system. The upgrade will now be " +"canceled." +msgstr "" + +#: ../DistUpgrade/DistUpgradeView.py:402 +msgid "Reboot required" +msgstr "" + +#: ../DistUpgrade/DistUpgradeView.py:403 +msgid "" +"The upgrade is finished and a reboot is required. Do you want to do this now?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 +#, python-format +msgid "authenticate '%(file)s' against '%(signature)s' " +msgstr "" + +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 +#, python-format +msgid "extracting '%s'" +msgstr "" + +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +msgid "Could not run the upgrade tool" +msgstr "" + +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +msgid "" +"This is most likely a bug in the upgrade tool. Please report it as a bug " +"using the command 'ubuntu-bug update-manager'." +msgstr "" + +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 +msgid "Upgrade tool signature" +msgstr "" + +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 +msgid "Upgrade tool" +msgstr "" + +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 +msgid "Failed to fetch" +msgstr "" + +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 +msgid "Fetching the upgrade failed. There may be a network problem. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 +msgid "Authentication failed" +msgstr "" + +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 +msgid "" +"Authenticating the upgrade failed. There may be a problem with the network " +"or with the server. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 +msgid "Failed to extract" +msgstr "" + +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 +msgid "" +"Extracting the upgrade failed. There may be a problem with the network or " +"with the server. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 +msgid "Verification failed" +msgstr "" + +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 +msgid "" +"Verifying the upgrade failed. There may be a problem with the network or " +"with the server. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +msgid "Can not run the upgrade" +msgstr "" + +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +msgid "" +"This usually is caused by a system where /tmp is mounted noexec. Please " +"remount without noexec and run the upgrade again." +msgstr "" + +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#, python-format +msgid "The error message is '%s'." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewText.py:91 +msgid "" +"Please report this as a bug and include the files /var/log/dist-upgrade/main." +"log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " +"aborted.\n" +"Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewText.py:115 +msgid "Aborting" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewText.py:120 +msgid "Demoted:\n" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewText.py:127 +msgid "To continue please press [ENTER]" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 +msgid "Continue [yN] " +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +msgid "Details [d]" +msgstr "" + +#. TRANSLATORS: the "y" is "yes" +#. TRANSLATORS: first letter of a positive (yes) answer +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 +msgid "y" +msgstr "" + +#. TRANSLATORS: the "n" is "no" +#. TRANSLATORS: first letter of a negative (no) answer +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 +msgid "n" +msgstr "" + +#. TRANSLATORS: the "d" is "details" +#: ../DistUpgrade/DistUpgradeViewText.py:165 +msgid "d" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewText.py:170 +#, python-format +msgid "No longer supported: %s\n" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewText.py:175 +#, python-format +msgid "Remove: %s\n" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewText.py:185 +#, python-format +msgid "Install: %s\n" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewText.py:190 +#, python-format +msgid "Upgrade: %s\n" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewText.py:207 +msgid "Continue [Yn] " +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewText.py:228 +msgid "" +"To finish the upgrade, a restart is required.\n" +"If you select 'y' the system will be restarted." +msgstr "" + +#: ../DistUpgrade/DistUpgrade.ui.h:1 +msgid "_Cancel Upgrade" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.ui.h:2 +msgid "_Resume Upgrade" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.ui.h:3 +msgid "" +"Cancel the running upgrade?\n" +"\n" +"The system could be in an unusable state if you cancel the upgrade. You are " +"strongly adviced to resume the upgrade." +msgstr "" + +#: ../DistUpgrade/DistUpgrade.ui.h:6 +msgid "_Start Upgrade" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.ui.h:9 +msgid "_Replace" msgstr "" -#: ../UpdateManager/backend/InstallBackendAptdaemon.py:93 -msgid "Installing updates…" +#: ../DistUpgrade/DistUpgrade.ui.h:10 +msgid "Difference between the files" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:37 +#: ../DistUpgrade/DistUpgrade.ui.h:11 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.ui.h:12 +msgid "_Continue" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.ui.h:13 +msgid "Start the upgrade?" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.ui.h:15 +msgid "" +"Restart the system to complete the upgrade\n" +"\n" +"Please save your work before continuing." +msgstr "" + +#: ../DistUpgrade/DistUpgrade.ui.h:18 +msgid "Distribution Upgrade" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.ui.h:19 +msgid "Upgrading Ubuntu to version 12.04" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.ui.h:20 +msgid " " +msgstr "" + +#: ../DistUpgrade/DistUpgrade.ui.h:22 +msgid "Setting new software channels" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.ui.h:24 +msgid "Restarting the computer" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.ui.h:27 +msgid "Terminal" +msgstr "" + +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:39 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:79 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 +msgid "Could not find the release notes" +msgstr "" + +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 +msgid "The server may be overloaded. " +msgstr "" + +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 +msgid "Could not download the release notes" +msgstr "" + +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +msgid "Please check your internet connection." +msgstr "" + +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 +msgid "Upgrade" +msgstr "" + +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 +#: ../data/gtkbuilder/UpdateManager.ui.h:20 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 +msgid "Release Notes" +msgstr "" + +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 +msgid "Downloading additional package files..." +msgstr "" + +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#, python-format +msgid "File %s of %s at %sB/s" +msgstr "" + +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 +#, python-format +msgid "File %s of %s" +msgstr "" + +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:83 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/Dialogs.py:120 -msgid "Settings…" +#: ../UpdateManager/GtkProgress.py:159 +#, python-format +msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/Dialogs.py:148 ../UpdateManager/UpdateManager.py:244 -msgid "You stopped the check for updates." +#: ../UpdateManager/GtkProgress.py:164 +#, python-format +msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/Dialogs.py:150 -msgid "_Check Again" +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 +msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/Dialogs.py:161 -msgid "No software updates are available." +#: ../UpdateManager/UpdateManager.py:106 +msgid "" +"You will not get any further security fixes or critical updates. Please " +"upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/Dialogs.py:163 ../UpdateManager/Dialogs.py:172 -msgid "The software on this computer is up to date." +#: ../UpdateManager/UpdateManager.py:114 +msgid "Upgrade information" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 +msgid "Install" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:233 +msgid "Name" +msgstr "" + +#. upload_archive = version_match.group(2).strip() +#: ../UpdateManager/UpdateManager.py:393 +#, python-format +msgid "Version %s: \n" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:450 +msgid "" +"No network connection detected, you can not download changelog information." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:458 +msgid "Downloading list of changes..." msgstr "" -#. Translators: these are Ubuntu version names like "Ubuntu 12.04" -#: ../UpdateManager/Dialogs.py:174 +#: ../UpdateManager/UpdateManager.py:502 +msgid "_Deselect All" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:508 +msgid "Select _All" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + +#: ../UpdateManager/UpdateManager.py:572 +#, python-format +msgid "%s will be downloaded." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:584 +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" + +#: ../UpdateManager/UpdateManager.py:589 +msgid "There are no updates to install." +msgstr "" + +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 #, python-format -msgid "However, %s %s is now available (you have %s)." +msgid "%(count_str)s %(download_str)s" msgstr "" -#: ../UpdateManager/Dialogs.py:179 -msgid "Upgrade…" +#: ../UpdateManager/UpdateManager.py:602 +msgid "Unknown download size." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:628 +msgid "" +"It is unknown when the package information was updated last. Please click " +"the 'Check' button to update the information." msgstr "" -#. Translators: this is an Ubuntu version name like "Ubuntu 12.04" -#: ../UpdateManager/Dialogs.py:201 +#: ../UpdateManager/UpdateManager.py:634 #, python-format -msgid "Software updates are no longer provided for %s %s." +msgid "" +"The package information was last updated %(days_ago)s days ago.\n" +"Press the 'Check' button below to check for new software updates." msgstr "" -#. Translators: this is an Ubuntu version name like "Ubuntu 12.04" -#: ../UpdateManager/Dialogs.py:205 +#: ../UpdateManager/UpdateManager.py:639 +#, python-format +msgid "The package information was last updated %(days_ago)s day ago." +msgid_plural "The package information was last updated %(days_ago)s days ago." +msgstr[0] "" +msgstr[1] "" + +#: ../UpdateManager/UpdateManager.py:643 +#, python-format +msgid "The package information was last updated %(hours_ago)s hour ago." +msgid_plural "" +"The package information was last updated %(hours_ago)s hours ago." +msgstr[0] "" +msgstr[1] "" + +#. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format -msgid "To stay secure, you should upgrade to %s %s." +msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/Dialogs.py:218 -msgid "Not all updates can be installed" +#: ../UpdateManager/UpdateManager.py:654 +msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/Dialogs.py:220 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 msgid "" -"Run a partial upgrade, to install as many updates as possible.\n" -"\n" -" This can be caused by:\n" -" * A previous upgrade which didn't complete\n" -" * Problems with some of the installed software\n" -" * Unofficial software packages not provided by Ubuntu\n" -" * Normal changes of a pre-release version of Ubuntu" -msgstr "" - -#: ../UpdateManager/Dialogs.py:228 -msgid "_Partial Upgrade" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." msgstr "" -#: ../UpdateManager/Dialogs.py:229 -msgid "_Continue" +#: ../UpdateManager/UpdateManager.py:693 +msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/Dialogs.py:265 -msgid "_Try Again" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/Dialogs.py:279 -msgid "The computer needs to restart to finish installing updates." +#: ../UpdateManager/UpdateManager.py:702 +msgid "" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/Dialogs.py:280 -msgid "_Restart" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#. Basic GTK+ parameters -#: ../UpdateManager/UpdateManager.py:85 ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +#: ../UpdateManager/UpdateManager.py:756 +#, python-format +msgid "" +"The upgrade needs a total of %s free space on disk '%s'. Please free at " +"least an additional %s of disk space on '%s'. Empty your trash and remove " +"temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:242 -msgid "Some software couldn’t be checked for updates." +#: ../UpdateManager/UpdateManager.py:781 +msgid "" +"The computer needs to restart to finish installing updates. Please save your " +"work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:245 -msgid "Updated software is available from a previous check." +#: ../UpdateManager/UpdateManager.py:845 +msgid "Reading package information" msgstr "" -#. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:323 -msgid "Software index is broken" +#: ../UpdateManager/UpdateManager.py:863 +msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:324 -msgid "" -"It is impossible to install or remove any software. Please use the package " -"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " -"this issue at first." +#: ../UpdateManager/UpdateManager.py:880 +msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:330 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:331 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -157,143 +1683,100 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:348 -msgid "Could not calculate the upgrade" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:349 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" "Please report this bug against the 'update-manager' package and include the " -"following error message:\n" -msgstr "" - -#: ../UpdateManager/UpdatesAvailable.py:248 -msgid "Install Now" -msgstr "" - -#: ../UpdateManager/UpdatesAvailable.py:278 -#: ../UpdateManagerText/UpdateManagerText.py:36 -msgid "Install" -msgstr "" - -#: ../UpdateManager/UpdatesAvailable.py:312 -msgid "Download" +"following error message:" msgstr "" -#: ../UpdateManager/UpdatesAvailable.py:372 -msgid "_Remind Me Later" +#: ../UpdateManager/UpdateManager.py:1063 +msgid " (New install)" msgstr "" -#. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdatesAvailable.py:506 +#. TRANSLATORS: the b stands for Bytes +#: ../UpdateManager/UpdateManager.py:1070 #, python-format -msgid "Version %s: \n" -msgstr "" - -#: ../UpdateManager/UpdatesAvailable.py:569 -msgid "" -"No network connection detected, you can not download changelog information." -msgstr "" - -#: ../UpdateManager/UpdatesAvailable.py:579 -msgid "Downloading list of changes..." -msgstr "" - -#: ../UpdateManager/UpdatesAvailable.py:623 -msgid "_Deselect All" -msgstr "" - -#: ../UpdateManager/UpdatesAvailable.py:629 -msgid "Select _All" +msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdatesAvailable.py:704 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format -msgid "%s will be downloaded." -msgstr "" - -#: ../UpdateManager/UpdatesAvailable.py:718 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "" -msgstr[1] "" - -#: ../UpdateManager/UpdatesAvailable.py:724 -msgid "There are no updates to install." +msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdatesAvailable.py:733 -msgid "Unknown download size." +#: ../UpdateManager/UpdateManager.py:1076 +#, python-format +msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdatesAvailable.py:759 -#, python-format -msgid "" -"Updated software has been issued since %s %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 +msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdatesAvailable.py:764 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 +#, c-format, python-format msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"The release upgrade can not be performed currently, please try again later. " +"The server reported: '%s'" msgstr "" -#. print("on_button_install_clicked") -#: ../UpdateManager/UpdatesAvailable.py:794 -msgid "Not enough free disk space" +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 +msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdatesAvailable.py:795 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format -msgid "" -"The upgrade needs a total of %s free space on disk '%s'. Please free at " -"least an additional %s of disk space on '%s'. Empty your trash and remove " -"temporary packages of former installations using 'sudo apt-get clean'." +msgid "New Ubuntu release '%s' is available" msgstr "" -#: ../UpdateManager/UpdatesAvailable.py:821 -msgid "Connecting..." +#. we assert a clean cache +#: ../UpdateManager/UpdateManager.py:1159 +msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdatesAvailable.py:837 -msgid "You may not be able to check for updates or download new updates." +#: ../UpdateManager/UpdateManager.py:1160 +msgid "" +"It is impossible to install or remove any software. Please use the package " +"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " +"this issue at first." msgstr "" -#: ../UpdateManager/UpdatesAvailable.py:986 -msgid "Security updates" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" msgstr "" -#: ../UpdateManager/UpdatesAvailable.py:989 -msgid "Other updates" +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" msgstr "" -#: ../UpdateManager/UnitySupport.py:67 -msgid "Install All Available Updates" +#: ../UpdateManager/UnitySupport.py:57 +msgid "Check for Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:35 -msgid "Cancel" +#: ../UpdateManager/UnitySupport.py:66 +msgid "Install All Available Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:38 +#: ../UpdateManagerText/UpdateManagerText.py:34 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:41 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:54 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:57 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" -"A normal upgrade can not be calculated, please run:\n" +"A normal upgrade can not be calculated, please run: \n" " sudo apt-get dist-upgrade\n" "\n" "\n" @@ -304,30 +1787,35 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:127 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:333 +#: ../UpdateManager/Core/MyCache.py:138 +#, python-format +msgid "Other updates (%s)" +msgstr "" + +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:339 ../UpdateManager/Core/MyCache.py:376 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:346 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" -"Changes for %s versions:\n" +"Changes for the versions:\n" "Installed version: %s\n" "Available version: %s\n" "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:362 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -336,7 +1824,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:369 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -345,62 +1833,180 @@ "until the changes become available or try again later." msgstr "" -#. Translators: the %s is a distro name, like 'Ubuntu' and 'base' as in -#. the core components and packages. -#: ../UpdateManager/Core/UpdateList.py:167 -#, python-format -msgid "%s base" +#: ../UpdateManager/Core/UpdateList.py:49 +msgid "Failed to detect distribution" msgstr "" -#. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../UpdateManager/Core/utils.py:485 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format -msgid "%(size).0f kB" -msgid_plural "%(size).0f kB" -msgstr[0] "" -msgstr[1] "" +msgid "A error '%s' occurred while checking what system you are using." +msgstr "" -#. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../UpdateManager/Core/utils.py:489 -#, python-format -msgid "%.1f MB" +#: ../UpdateManager/Core/UpdateList.py:61 +msgid "Important security updates" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "updates" +#: ../UpdateManager/Core/UpdateList.py:62 +msgid "Recommended updates" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "Changes" +#: ../UpdateManager/Core/UpdateList.py:63 +msgid "Proposed updates" +msgstr "" + +#: ../UpdateManager/Core/UpdateList.py:64 +msgid "Backports" +msgstr "" + +#: ../UpdateManager/Core/UpdateList.py:65 +msgid "Distribution updates" +msgstr "" + +#: ../UpdateManager/Core/UpdateList.py:70 +msgid "Other updates" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:1 +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 -msgid "Description" +msgid "_Partial Upgrade" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:4 -msgid "Technical description" +msgid "Not all updates can be installed" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:5 -msgid "Details of updates" +msgid "" +"Run a partial upgrade, to install as many updates as possible. \n" +"\n" +"This can be caused by:\n" +" * A previous upgrade which didn't complete\n" +" * Problems with some of the installed software\n" +" * Unofficial software packages not provided by Ubuntu\n" +" * Normal changes of a pre-release version of Ubuntu" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:12 +msgid "Chec_k" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:13 +msgid "" +"You must check for updates manually\n" +"\n" +"Your system does not check for updates automatically. You can configure this " +"behavior in Software Sources on the Updates tab." +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:16 +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:17 +msgid "Co_ntinue" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:18 +msgid "Running on battery" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:19 +msgid "Your system is running on battery. Are you sure you want to continue?" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:21 +msgid "_Upgrade" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:22 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:8 +msgid "Show progress of individual files" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:23 +#: ../data/update-manager.desktop.in.h:1 +msgid "Update Manager" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:24 +msgid "Starting Update Manager" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:25 +msgid "U_pgrade" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:28 +msgid "updates" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:6 +#: ../data/gtkbuilder/UpdateManager.ui.h:29 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:7 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:8 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:34 +msgid "Description" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:35 +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "" + +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 +msgid "A new version of Ubuntu is available. Would you like to upgrade?" +msgstr "" + +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:3 +msgid "Don't Upgrade" +msgstr "" + +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:4 +msgid "Ask Me Later" +msgstr "" + +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:5 +msgid "Yes, Upgrade Now" +msgstr "" + +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:6 +msgid "You have declined to upgrade to the new Ubuntu" +msgstr "" + +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 +msgid "" +"You can upgrade at a later time by opening Update Manager and click on " +"\"Upgrade\"." +msgstr "" + #: ../data/update-manager.desktop.in.h:2 msgid "Software Updates" msgstr "" @@ -409,150 +2015,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:70 ../update-manager-text:55 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:73 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:76 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:79 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:83 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:90 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:93 +#: ../update-manager:84 +msgid "Try to run a dist-upgrade" +msgstr "" + +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:97 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager:111 +msgid "Running partial upgrade" +msgstr "" + +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../ubuntu-support-status:91 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 +msgid "" +"Try upgrading to the latest release using the upgrader from $distro-proposed" +msgstr "" + +#: ../do-release-upgrade:57 +msgid "" +"Run in a special upgrade mode.\n" +"Currently 'desktop' for regular upgrades of a desktop system and 'server' " +"for server systems are supported." +msgstr "" + +#: ../do-release-upgrade:63 +msgid "Run the specified frontend" +msgstr "" + +#: ../do-release-upgrade:68 +msgid "" +"Check only if a new distribution release is available and report the result " +"via the exit code" +msgstr "" + +#: ../do-release-upgrade:82 +msgid "Checking for a new Ubuntu release" +msgstr "" + +#: ../do-release-upgrade:96 +msgid "" +"For upgrade information, please visit:\n" +"%(url)s\n" +msgstr "" + +#: ../do-release-upgrade:102 +msgid "No new release found" +msgstr "" + +#: ../do-release-upgrade:114 +#, c-format +msgid "New release '%s' available." +msgstr "" + +#: ../do-release-upgrade:115 +msgid "Run 'do-release-upgrade' to upgrade to it." +msgstr "" + +#: ../check-new-release-gtk:90 +msgid "Ubuntu %(version)s Upgrade Available" +msgstr "" + +#: ../check-new-release-gtk:132 +#, c-format +msgid "You have declined the upgrade to Ubuntu %s" +msgstr "" + +#: ../check-new-release-gtk:192 +msgid "Add debug output" +msgstr "" + +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:43 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:40 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:50 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:50 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:47 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" +msgstr "" + +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:50 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:45 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:48 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:51 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:43 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/ur.po update-manager-0.156.14.15/po/ur.po --- update-manager-17.10.11/po/ur.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/ur.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2006. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2010-09-27 23:35+0000\n" "Last-Translator: Michael Vogt \n" "Language-Team: Urdu \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Server for %s" @@ -42,30 +43,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "مرکزی سرور" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "سی ڈی شامل کرنے میں ناکام" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -75,13 +76,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -96,22 +97,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "ہوسکتا ہے کہ سرور پر حد سے ‍ذیادہ بھار آگیا ھو۔" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "ٹوٹا ہوا پیکج" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -124,65 +125,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "کسی نقص کی باعث کئی پیکجوں کی تصدیق نہیں ہوسکی" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -191,25 +192,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -218,11 +219,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -233,11 +234,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -245,7 +246,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -254,29 +255,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -286,28 +287,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -315,11 +316,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -331,16 +332,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -353,11 +354,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -366,34 +367,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -406,23 +407,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -433,32 +434,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -466,33 +467,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -503,26 +504,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -530,37 +531,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -568,79 +569,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -648,16 +649,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -666,7 +667,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -675,11 +676,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -687,11 +688,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -699,11 +700,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -713,71 +714,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -787,27 +788,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -817,7 +818,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -826,26 +827,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -853,147 +854,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1001,32 +1002,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1042,7 +1043,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1056,14 +1057,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1071,34 +1072,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1111,28 +1110,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1140,145 +1139,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1286,73 +1285,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1410,7 +1409,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1429,133 +1428,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1563,31 +1570,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1596,34 +1610,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1631,29 +1653,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1662,7 +1684,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1670,58 +1692,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1731,22 +1763,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1760,26 +1788,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1788,7 +1816,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1797,7 +1825,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1806,47 +1834,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1907,54 +1929,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1979,7 +2004,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1991,216 +2016,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/uz.po update-manager-0.156.14.15/po/uz.po --- update-manager-17.10.11/po/uz.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/uz.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2008. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-29 09:54+0000\n" "Last-Translator: Falonchi aka \n" "Language-Team: Uzbek \n" @@ -20,20 +21,20 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" msgstr[0] "%(size).0f КБ" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MБ" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s учун сервер" @@ -41,30 +42,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Асосий сервер" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Бошқа серверлар" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "sources.list элементларини ҳисоблаб бўлмади." -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "CD ni qo'shish payitida xato" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -74,13 +75,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -95,22 +96,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Buzilgan paketlar" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -123,65 +124,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -190,25 +191,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -217,11 +218,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -232,11 +233,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -244,7 +245,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -253,29 +254,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -285,28 +286,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -314,11 +315,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -330,16 +331,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -352,11 +353,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -365,34 +366,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -405,23 +406,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -432,32 +433,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -465,33 +466,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -502,26 +503,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -529,37 +530,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -567,79 +568,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -647,16 +648,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -665,7 +666,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -674,11 +675,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -686,11 +687,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -698,11 +699,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -712,71 +713,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -786,27 +787,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -816,7 +817,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -825,26 +826,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -852,147 +853,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1000,32 +1001,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1041,7 +1042,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1055,14 +1056,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1070,34 +1071,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1110,28 +1109,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1139,145 +1138,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1285,73 +1284,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1409,7 +1408,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1428,164 +1427,180 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1594,34 +1609,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1629,29 +1652,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1660,7 +1683,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1668,58 +1691,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1729,22 +1762,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1758,26 +1787,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1786,7 +1815,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1795,7 +1824,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1804,47 +1833,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1905,54 +1928,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1977,7 +2003,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1989,218 +2015,284 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" #~ msgid "%.0f kB" diff -Nru update-manager-17.10.11/po/vi.po update-manager-0.156.14.15/po/vi.po --- update-manager-17.10.11/po/vi.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/vi.po 2017-12-23 05:00:38.000000000 +0000 @@ -2,11 +2,12 @@ # Copyright © 2005 Gnome i18n Project for Vietnamese. # Clytie Siddall , 2005. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager Gnome HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-04-16 11:54+0000\n" "Last-Translator: Hai Lang \n" "Language-Team: Vietnamese \n" @@ -19,20 +20,20 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" msgstr[0] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "Máy chủ dành cho %s" @@ -40,20 +41,20 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "Máy chủ chính" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "Tự chọn máy chủ" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "Không thể thống kê các mục trong sources.list" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" @@ -61,11 +62,11 @@ "Không tìm thấy các gói phần mềm, có thể do không đúng đĩa cài Ubuntu hoặc " "sai hệ thống?" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "Lỗi đọc dữ liệu từ CD" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -79,12 +80,12 @@ "Thông báo lỗi là:\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "Gỡ bỏ các gói ở tình trạng xấu" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -100,15 +101,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "Máy chủ có thể bị quá tải" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Gói bị lỗi" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -117,7 +118,7 @@ "này. Hãy sửa chúng bằng phần mềm synaptic hoặc apt-get trước khi tiếp tục." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -138,11 +139,11 @@ " * Phần mềm không được cung cấp chính thức bởi Ubuntu\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "Nhiều khả năng đây chỉ là vấn đề tạm thời, vui lòng thử lại sau." -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -150,16 +151,16 @@ "Nếu không giải quyết được, vui lòng báo lỗi này bằng lệnh 'ubuntu-bug update-" "manager' trong cửa sổ dòng lệnh." -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "Không thể tính được dung lượng cần nâng cấp" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "Gặp lỗi khi đang xác thực một số gói" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -169,7 +170,7 @@ "vui lòng thử lại sau. Bên dưới là danh sách các gói chưa được xác thực đầy " "đủ." -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." @@ -177,22 +178,22 @@ "Gói phần mềm '%s' được đánh dấu đề gỡ bỏ nhưng nó nằm trong danh sách các " "phần mềm không thể gỡ bỏ." -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "Gói phần mềm quan trọng '%s' sẽ bị gỡ bỏ." -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "Đang cố gắng để cài đặt phiên bản danh sách đen '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "Không thể cài đặt '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -201,11 +202,11 @@ "'ubuntu-bug update-manager' trong một cửa sổ dòng lệnh." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "Không thể đoán được gói gốc" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -219,15 +220,15 @@ " Xin vui lòng cài đặt một trong các gói trên trước, thông qua ứng dụng " "synaptic hoặc apt-get." -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "Đang đọc bộ nhớ đệm" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "Không thể tạo khóa độc quyền" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -235,11 +236,11 @@ "Điều này thường có nghĩa là một chương trình quản lý gói khác đang chạy (vd " "như apt-get hay aptitude). Xin hãy đóng chương trình đó trước." -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "Nâng cấp qua kết nối từ xa (remote connection) chưa được hỗ trợ" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -252,11 +253,11 @@ "release-upgrade'.\n" "Nâng cấp sẽ bị huỷ bỏ ngay bây giờ. Hãy thử lại mà không dùng ssh." -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "Tiếp tục chạy với SSH?" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -274,11 +275,11 @@ "'%s'.\n" "Bạn có muốn tiếp tục không?" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "Đang khởi động tiến trình sshd dự phòng" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -289,7 +290,7 @@ "được chạy ở cổng '%s'. Nếu gặp sự cố với phiên làm việc ssh hiện tại, bạn có " "thể kết nối lại thông qua dịch vụ dự phòng nêu trên.\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -301,29 +302,29 @@ "được tiến hành tự động vì có thể gây nguy hiểm. Bạn có thể mở cổng với:\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "Không thể nâng cấp" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "Quá trình nâng cấp từ '%s' lên '%s' không được hỗ trợ với công cụ này." -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "Có lỗi khi khởi tạo trong chế độ kiểm tra lỗi" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "Không tạo được chế độ kiểm tra lỗi" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "Chế độ kiểm tra lỗi" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -338,18 +339,18 @@ "Từ giờ đến lần khởi động lại tiếp theo, *không* thay đổi nào được ghi vào " "thư mục hệ thống một cách vĩnh viễn." -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" "Bản cài đặt python của bạn bị lỗi. Vui lòng sửa lại liên kết '/usr/bin/" "python'." -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "Gói 'debsig-verify' đã được cài đặt" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -359,12 +360,12 @@ "Vui lòng gỡ bỏ nó bằng phần mềm synaptic hoặc bằng lệnh 'apt-get remove " "debsig-verify' rồi thực hiện lại việc nâng cấp." -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "Không thể ghi vào '%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -375,11 +376,11 @@ "tiếp tục việc nâng cấp.\n" "Vui lòng kiểm tra lại rằng thư mục hệ thống của bạn cho ghi vào." -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "Bao gồm các cập nhật mới nhất từ Internet?" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -398,16 +399,16 @@ "nên tiến hành cài đặt các bản cập nhật mới nhất.\n" "Nếu bạn chọn \"Không\", sẽ không có gì được tải từ trên mạng." -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "bị hủy khi nâng cấp %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "Không tìm thấy nguồn cập nhật hợp lệ" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -427,11 +428,11 @@ "Nếu bạn chọn 'Không' thì việc cập nhật sẽ bị hủy bỏ." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "Tạo ra các nguồn cập nhật mặc định?" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -445,11 +446,11 @@ "Bạn có muốn thêm mục mặc định '%s' không? Nếu bạn chọn 'Không', việc nâng " "cấp sẽ bị huỷ bỏ." -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "Thông tin về các nguồn cập nhật không hợp lệ" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." @@ -457,11 +458,11 @@ "Việc nâng cấp thông tin kho đã tạo ra một tập tin không hợp lệ nên một tiến " "trình báo cáo lỗi đang được bắt đầu." -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "Không cho phép sử dụng các nguồn cập nhật bên ngoài" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -471,12 +472,12 @@ "thể cho phép sử dụng chúng sau khi nâng cấp bằng công cụ 'tính-năng-của-phần-" "mềm' hay bằng trình quản lý gói." -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "Gói ở tình trạng không ổn định" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -491,11 +492,11 @@ "lưu trữ nào cho gói này. Vui lòng cài đặt lại gói bằng cách thủ công hoặc gỡ " "bỏ nó khỏi hệ thống." -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "Gặp lỗi trong quá trình cập nhật" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -503,13 +504,13 @@ "Đã có lỗi xuất hiện trong quá trình cập nhật. Thông thường là do các vấn đề " "về mạng, hãy kiểm tra kết nối mạng và thử lại." -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "Không còn không gian đĩa trống" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -524,21 +525,21 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "Tính toán các thay đổi cần thực hiện" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "Bạn có muốn bắt đầu nâng cấp?" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "Nâng cấp bị huỷ bỏ" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." @@ -546,12 +547,12 @@ "Bây giờ việc nâng cấp sẽ bị hủy và hệ thống sẽ được trả về trạng thái ban " "đầu. Sau này bạn có thể tiếp tục việc nâng cấp." -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "Không thể tải các gói nâng cấp xuống" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -561,27 +562,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "Lỗi trong quá trình thực hiện" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "Khôi phục hệ thống về trạng thái ban đầu" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "Không thể cài đặt các gói nâng cấp" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -589,7 +590,7 @@ "Quá trình nâng cấp bị hủy bỏ. Trạng thái của hệ thống không thể sử dụng " "được. Chạy hồi phục ngay (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -606,7 +607,7 @@ "log/dist-upgrade/ vào báo cáo lỗi.\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " @@ -614,20 +615,20 @@ "Quá trình nâng cấp bị hủy bỏ. Xin kiểm tra lại kết nối Internet hay cài đặt " "các phương tiện và thử lại. " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "Xóa các gói không còn dùng nữa" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Giữ lại" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Xóa bỏ" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -636,27 +637,27 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "Các gói phụ thuộc chưa được cài đặt" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "Gói phụ thuộc '%s' chưa được cài đặt. " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "Đang kiểm tra trình quản lý gói" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "Quá trình chuẩn bị để nâng cấp thất bại" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." @@ -664,11 +665,11 @@ "Gặp lỗi trong việc chuẩn bị hệ thống cho việc nâng cấp nên một tiến trình " "báo cáo lỗi đang được bắt đầu." -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "Quá trình tải các gói phụ thuộc cần thiết để nâng cấp thất bại" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -680,68 +681,68 @@ "\n" "Ngoài ra, một tiến trình báo cáo lỗi đang được bắt đầu." -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "Cập nhật thông tin về các nguồn cập nhật" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "Không thể thêm cdrom" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "Rất tiếc, việc thêm CD/DVD không thành công." -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "Thông tin gói không hợp lệ" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "Đang lấy về" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "Đang nâng cấp" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "Nâng cấp hoàn tất" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "Việc nâng cấp đã hoàn thành nhưng có vài lỗi đã xảy ra." -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "Đang tìm các phần mềm không còn dùng nữa" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "Quá trình nâng cấp hệ thống đã hoàn thành" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "Quá trình nâng cấp từng phần kết thúc." -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "đang dùng evms" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -750,13 +751,13 @@ "Hệ thống cũ dùng hệ thống quản lí tập tin 'evms' trong /proc/mounts. 'evms' " "không còn được hỗ trợ, hãy tắt nó và thực hiện lại quá trình nâng cấp." -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" "Phần cứng đồ họa của bạn có thể không được hỗ trợ đầy đủ trong Ubuntu 12.04 " "LTS." -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -768,9 +769,9 @@ "https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx . Bạn có muốn " "tiếp tục nâng cấp không?" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." @@ -778,8 +779,8 @@ "Quá trình nâng cấp có thể làm giảm hiệu ứng đồ họa, hiệu năng các trò chơi " "và các chương trình khác yêu cầu đồ họa cao." -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -793,7 +794,7 @@ "\n" "Bạn có muốn tiếp tục?" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -807,11 +808,11 @@ "\n" "Bạn có muốn tiếp tục?" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "Không dùng bộ xử lý i686" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -823,11 +824,11 @@ "cứng với bộ xử lý tối thiểu là i686. Bạn không thể nâng cấp hệ thống lên đến " "bản Ubuntu tiếp theo với cấu hình phần cứng này." -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "Không có ARMv6 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -839,11 +840,11 @@ "thiểu. Không thể để nâng cấp hệ thống của bạn với một bản phát hành Ubuntu " "mới với phần cứng này." -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "Không init nào có sẵn" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -859,15 +860,15 @@ "\n" "Bạn có chắc chắn muốn tiếp tục không?" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "Sanbox nâng cấp sử dụng aufs" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "Dùng đường dẫn sau để tìm các gói nâng cấp trên CD/DVD" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -875,57 +876,57 @@ "Dùng trình có giao diện đồ họa. Các trình có thể dùng: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*ĐÃ LOẠI BỎ* tuỳ chọn này sẽ bị bỏ qua" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "Thực hiện nâng cấp từng phần (không ghi lại tệp tin sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "Tắt hỗ trợ màn hình GNU" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "Thiết lập datadir" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Vui lòng đưa đĩa '%s' vào ổ '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "Quá trình tải cập nhật đã hoàn thành" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "Đang tải file %li / %li tốc độ %sB/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "Còn khoảng %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "Đang tải tập tin %li của %li" @@ -935,27 +936,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "Đang áp dụng các thay đổi" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "có lỗi với các gói phụ thuộc - bỏ qua không cấu hình" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "Không thể cài đặt '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -967,7 +968,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -978,7 +979,7 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." @@ -986,20 +987,20 @@ "Bạn sẽ mất tất cả các thay đổi đã chỉnh sửa trong tập tin cấu hình này nếu " "bạn chọn thay thế nó bởi phiên bản mới." -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "Không tìm thấy lệnh 'diff'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "Gặp lỗi nghiêm trọng" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -1010,13 +1011,13 @@ "log/dist-upgrade/main.log và /var/log/dist-upgrade/apt.log trong bản báo " "cáo. Quá trình nâng cấp bị hủy bỏ." -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Nhắp Ctrl-c" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" @@ -1025,134 +1026,134 @@ "Bạn có chắc chắn muốn thực hiện nó." #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "Để tránh mất mát dữ liệu, hãy đóng các ứng dụng và tài liệu đang mở." -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "Không còn được hỗ trợ bởi Canonical (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "Hạ cấp (Downgrade) (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "Loại bỏ (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "Không còn cần thiết (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "Cài đặt (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "Nâng cấp (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "Đổi đĩa" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "Hiện khác biệt >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< Ẩn khác biệt" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "Lỗi" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Hủy" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "Đó&ng" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "Hiện cửa sổ dòng lệnh >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< Ẩn cửa sổ dòng lệnh" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "Thông tin" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "Chi tiết" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "Không còn hỗ trợ %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "Xóa %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "Xóa %s (được cài tự động)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "Cài đặt %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "Nâng cấp %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "Cần phải khởi động lại hệ thống" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "Khởi động lại hệ thống để hoàn tất nâng cấp" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "_Khởi động lại ngay" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1164,29 +1165,29 @@ "Hệ thống sẽ không làm việc ổn định nếu bạn hủy bỏ quá trình này. Khuyến cáo: " "bạn hãy tiếp tục quá trình nâng cấp." -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "Hủy quá trình nâng cấp?" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li ngày" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li giờ" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li phút" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1201,7 +1202,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1215,14 +1216,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1232,34 +1233,32 @@ "tốc độ 65k." #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "Quá trình tải xuống sẽ mất %s với tốc độ kết nối hiện tại của bạn. " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "Đang chuẩn bị nâng cấp" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "Đang sửa đổi các kênh cài đặt phần mềm" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "Đang lấy các gói mới" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "Đang cài đặt các bản nâng cấp" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "Đang dọn dẹp hệ thống" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1273,25 +1272,25 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "%d gói sẽ được xóa khỏi hệ thống." -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "%d gói mới sẽ được cài đặt." -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "%d gói sẽ được nâng cấp." -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1302,7 +1301,7 @@ "\n" "Bạn đã tải về tổng cộng %s. " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." @@ -1310,7 +1309,7 @@ "Việc cài đặt bản nâng cấp này có thể mất vài giờ. Ngay khi hoàn thành việc " "tải xuống, tiến trình nâng cấp không thể bị hủy bỏ." -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." @@ -1318,16 +1317,16 @@ "Việc lấy về và cài đặt bản nâng cấp này có thể mất vài giờ. Ngay khi hoàn " "thành việc tải xuống, tiến trình nâng cấp không thể bị hủy bỏ." -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "Việc gỡ bỏ các gói có thể mất vài giờ/ " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "Phần mềm trên máy tính này đã được cập nhật." -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." @@ -1335,38 +1334,38 @@ "Hiện không có bản nâng cấp nào cho hệ thống. Quá trình nâng cấp sẽ được hủy " "bỏ." -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "Cần phải khởi động lại hệ thống" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" "Quá trình nâng cấp đã hoàn thành và hệ thống cần được khởi động lại. Bạn có " "muốn thực hiện ngay không?" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "xác thực '%(file)s' với '%(signature)s' " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "giải nén '%s'" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "Không thể chạy công cụ nâng cấp" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1374,71 +1373,71 @@ "Điều này hầu như có vẻ là một lỗi trong công cụ nâng cấp. Hãy báo cáo lỗi " "này sử dụng lệnh 'ubuntu-bug update-manager'." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "Chữ ký của công cụ nâng cấp" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "Công cụ nâng cấp" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "Lỗi tải xuống" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "Lỗi tải xuống bản nâng cấp. Có thể là do vấn đề về mạng. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "Lỗi xác thực" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "Lỗi xác thực bản nâng cấp. Có thể có vấn đề về mạng hoặc với máy chủ. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "Lỗi giải nén" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "Lỗi giải nén bản nâng cấp. Có thể có vấn đề về mạng hoặc với máy chủ. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "Việc xác nhận thất bại" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "Lỗi xác minh gói nâng cấp. Có thể có vấn đề về mạng hoặc với máy chủ. " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "Không thể thực hiện quá trình nâng cấp" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1446,13 +1445,13 @@ "Điều này thường bị gây ra bởi một hệ thống có /tmp được gắn với tuỳ chọn " "noexec. Hãy gắn lại mà không có noexec rồi chạy lại nâng cấp." -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "Thông báo lỗi: '%s'" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1464,73 +1463,73 @@ "bị hủy bỏ.\n" "Tập tin gốc sources.list đã được lưu ở /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "Đang dừng lại" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "Đã chuyển xuống phiên bản cũ:\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "Để tiếp tục, hãy nhấn [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "_Tiếp tục " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "Chi tiết [t]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "k" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "Không còn hỗ trợ: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "Gỡ bỏ: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "Cài mới: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "Nâng cấp: %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "Tiếp tục [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1597,9 +1596,8 @@ msgstr "Nâng cấp bản phân phối" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "Nâng cấp Ubuntu lên phiên bản 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "Đang nâng cấp Ubuntu lên phiên bản 12.04" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1617,84 +1615,85 @@ msgid "Terminal" msgstr "Cửa sổ dòng lệnh" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "Vui lòng đợi trong chốc lát." -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "Cập nhật hoàn thành" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "Không tìm thấy bản chú giải phát hành" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "Máy chủ có thể đang quá tải. " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "Không thể tải về bản chú giải phát hành" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "Hãy kiểm tra kết nối internet của bạn." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "Nâng cấp" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "Bản chú giải phát hành" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "Đang tải các gói bổ sung..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "Tập tin %s / %s, tốc độ %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "Tập tin %s / %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "Mở trong Trình duyệt" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "Sao chép vào Bộ nhớ" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "Đang tải tập tin %(current)li của %(total)li với tốc độ %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "Đang tải tập tin %(current)li của %(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "Phiên bản Ubuntu của bạn không còn được hỗ trợ." -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." @@ -1702,64 +1701,76 @@ "Bạn sẽ không lấy các bản sửa lỗi bảo vệ hay cập nhật cấp thiết nữa. Vui lòng " "nâng cấp lên phiên bản Ubuntu mới hơn." -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "Thông tin cập nhật" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "Cài đặt" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "Tên" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "Phiên bản %s: \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" "Không tìm thấy kết nối mạng, bạn không thể tải xuống thông tin về các thay " "đổi." -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "Đang tải danh sách các thay đổi" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "_Bỏ chọn tất cả" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "C_họn tất cả" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "%(count)s thành phần cần nâng cấp đã được chọn." + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "%s sẽ được tải về" #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "Các bản cập nhật đã được tải xuống xong, nhưng chưa được cài đặt." #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "Không có bản cập nhật nào để cài đặt." -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "Không biết kích thước tải về." -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." @@ -1767,7 +1778,7 @@ "Không rõ khi nào thông tin gói được cập nhật lần cuối. Hãy nhấn nút 'Kiểm " "tra' để cập nhật thông tin." -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1777,13 +1788,13 @@ "trước.\n" "Hãy nhấn nút 'Kiểm tra' bên dưới để kiểm tra cập nhật phần mềm mới." -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "Thông tin gói đã được cập nhật %(days_ago)s ngày trước." -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1791,34 +1802,46 @@ msgstr[0] "Thông tin gói đã được cập nhật %(hours_ago)s giờ trước." #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "Thông tin gói được cập nhật lần cuối khoảng %s phút trước." -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "Thông tin gói vừa được cập nhật." -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" +"Các bản cập nhật phần mềm giúp sửa lỗi, loại bỏ các lổ hổng bảo mật và cung " +"cấp các tính năng mới." + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "Các bản cập nhật phần mềm có thể đã sẵn sàng cho máy tính của bạn." -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "Chào mừng đến với Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" +"Các bản cập nhật phần mềm sau đã được đưa ra từ khi phiên Ubuntu này được " +"phát hành." + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "Đang có các bản cập nhật phần mềm cho máy tính này." -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1829,7 +1852,7 @@ "nhất %s trống trên đĩa '%s'. Chẳng hạn: làm sạch Thùng rác và dùng 'sudo apt-" "get clean' để xóa các tập tin tạm của các gói đã cài đặt." -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." @@ -1837,23 +1860,23 @@ "Cần khởi động lại máy tính để hoàn thiện cài đặt các bản cập nhật. Vui lòng " "lưu lại công việc trước khi tiếp tục." -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "Đang đọc thông tin về gói" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "Đang kết nối…" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "Bạn có thể sẽ không kiểm tra hoặc tải về bản nâng cấp được nữa." -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "Không thể khởi tạo thông tin về gói" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1865,7 +1888,7 @@ "\n" "Hãy thông báo lỗi của 'update-manager' và kèm theo thông báo lỗi sau:\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1876,31 +1899,31 @@ "\n" "Hãy thông báo lỗi của 'update-manager' và kèm theo thông báo lỗi sau:" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (Mới cài đặt)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(Dung lượng: %s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "Từ phiên bản %(old_version)s lên %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "Phiên bản %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "Không thể nâng cấp bản phát hành ngay được" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " @@ -1909,21 +1932,21 @@ "Không thể tiến hành nâng cấp bản phát hành ngay được, xin thử lại sau. Máy " "chủ báo cáo: '%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "Đang tải công cụ nâng cấp bản phát hành" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "Phiên bản Ubuntu mới '%s' sẵn sàng" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "Chỉ mục phần mềm bị hỏng" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1933,6 +1956,17 @@ "quản lý gói \"Synaptic\" hoặc chạy lệnh \"sudo apt-get install -f\" trong " "cửa sổ lệnh để sửa lỗi này trước tiên." +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "Phiên bản mới '%s' sẵn sàng." + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Hủy bỏ" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "Kiểm tra bản cập nhật" @@ -1942,22 +1976,18 @@ msgstr "Cài đặt tất cả bản cập nhật sẵn sàng" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Hủy bỏ" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "Nhật ký thay đổi" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "Các cập nhật" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "Xây dựng danh sách cập nhật" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1982,20 +2012,20 @@ " * Những thay đổi bình thường của phiên bản Ubuntu thử nghiệm trước khi phát " "hành" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "Đang tải về bản ghi thay đổi" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "Cập nhật khác (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "Cập nhật này không đến từ một nguồn hỗ trợ bản ghi thay đổi." -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -2003,7 +2033,7 @@ "Không tải được danh sách các thay đổi. \n" "Hãy kiểm tra kết nối Internet của bạn." -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -2016,7 +2046,7 @@ "Phiên bản sẵn sàng: %s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -2029,7 +2059,7 @@ "Vui lòng xem tạm trên http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "đến khi thay đổi sẵn sàng hoặc thử lại sau." -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -2042,52 +2072,43 @@ "Vui lòng sử dụng http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "đến khi thay đổi sẵn sàng hoặc thử lại sau." -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "Không thể tìm ra bản phân phối" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "Lỗi '%s' xảy ra khi đang kiểm tra hệ thống nào bạn đang dùng." -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "Các bản cập nhật bảo mật quan trọng" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "Các bản cập nhật được khuyến nghị" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "Các bản cập nhật được đề xuất" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Các bản cập nhật bảo trì" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "Cập nhật bản phân phối" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "Các bản cập nhật khác" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "Đang khởi động trình quản lý cập nhật" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "" -"Các bản cập nhật phần mềm giúp sửa lỗi, loại bỏ các lổ hổng bảo mật và cung " -"cấp các tính năng mới." - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "_Nâng cấp một phần" @@ -2159,37 +2180,27 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "Bản cập nhật phần mềm" +msgid "Update Manager" +msgstr "Trình Quản lý Cập nhật" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "Bản cập nhật phần mềm" +msgid "Starting Update Manager" +msgstr "Đang khởi động Trình quản lí Cập nhật" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "_Nâng cấp" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "các cập nhật" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "Cài đặt" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "Các thay đổi" +msgid "updates" +msgstr "các cập nhật" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "Diễn giải" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "Diễn giải các cập nhật" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." @@ -2197,25 +2208,35 @@ "Bạn đang kết nối qua roaming và có thể phải trả phí dữ liệu cho bản cập nhật " "này." -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "Bạn đang kết nối qua một modem không dây." -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" "Sẽ an toàn hơn nếu cắm một nguồn điện xoay chiều vào máy tính trước khi cập " "nhật." +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "_Cài đặt các cập nhật" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "Các thay đổi" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "Thiết _lập..." +msgid "Description" +msgstr "Diễn giải" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "Cài đặt" +msgid "Description of update" +msgstr "Diễn giải các cập nhật" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "Thiết _lập..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2239,9 +2260,8 @@ msgstr "Bạn vừa từ chối nâng cấp lên Ubuntu mới" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" "Bạn có thể nâng cấp sau bằng cách mở Trình quản lý cập nhật và nhấn vào " @@ -2255,58 +2275,58 @@ msgid "Show and install available updates" msgstr "Hiển thị và cài đặt các bản cập nhật đã sẵn sàng" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "Hiển thị phiên bản và thoát" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "Thư mục chứa các tập tin dữ liệu" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "Kiểm tra nếu một Ubuntu mới phát hành có sẵn" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "Kiểm tra nếu có bản mới nhất phát hành trong giai đoạn phát triển" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "Nâng cấp, sử dụng phiên bản mới nhất đề xuất của Upgrader phát hành" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "Không tập trung vào bản đồ khi đang khởi động" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "Hãy thử chạy dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "Đừng kiểm tra cập nhật khi khởi động." -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "Thử nghiệm nâng cấp với một aufs chỗ thử bao" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "Thực hiện nâng cấp một phần" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "Hiện mô tả gói thay vì nhật ký sửa đổi" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" "Đang thử nâng cấp tới các phiên bản phát hành mới nhất sử dụng trình nâng " "cấp từ $distro-proposed" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2316,11 +2336,11 @@ "Hiện nay 'desktop' cho nâng cấp thường xuyên của một hệ thống máy tính để " "bàn và 'máy chủ' cho các hệ thống máy chủ được hỗ trợ." -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "Thực thi một trình quản lý chỉ định" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" @@ -2328,11 +2348,11 @@ "Kiểm tra chỉ khi một bản phân phối mới có sẵn và thông báo kết quả thông qua " "lệnh thoát" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "Đang tìm bản phát hành Ubuntu mới" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2340,68 +2360,68 @@ "Để xem thông tin nâng cấp, vui lòng truy cập:\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "Chưa có bản phát hành mới nào" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "Phiên bản mới '%s' sẵn sàng." -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "Chạy 'do-release-upgrade' để nâng cấp." -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Ubuntu %(version)s hiện đang sẵn sàng" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "Bạn đã từ chối việc nâng cấp lên Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "Thêm kết xuất tìm lỗi" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "Hiện các gói không được hỗ trợ trên máy này" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "Hiện các gói được hỗ trợ trên máy này" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "Hiện tất cả các gói với tình trạng của chúng" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "Hiện tất cả các gói trong một danh sách" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "Tóm tắt tình trạng hỗ trợ của '%s':" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "Bạn có %(num)s gói (%(percent).1f%%) được hỗ trợ đến %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "Bạn có %(num)s gói (%(percent).1f%%) không thể/không còn để tải xuống" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "Bạn có %(num)s gói (%(percent).1f%%) không được hỗ trợ" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2409,120 +2429,151 @@ "Chạy với tùy chọn --show-unsupported, --show-supported hoặc --show-all để " "biết thêm chi tiết" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "Không còn tải xuống được:" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "Không được hỗ trợ: " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "Được hỗ trợ đến %s:" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "Không được hỗ trợ" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "Không thực hiện được phương thức: %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "Một tệp tin trên đĩa" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "gói .deb" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "Cài đặt các gói còn thiếu." -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "Gói %s nên được cài đặt." -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr "gói .deb" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s phải được đánh dấu để cài thủ công." - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"Khi nâng cấp, nếu kdelibs4-dev được cài đặt, kdelibs5-dev nhu cầu được cài " -"đặt. Xem bugs.launchpad.net, lỗi # 279621 để biết chi tiết." - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "%i mục lỗi thời trong tệp trạng thái" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "Những mục lỗi thời trong trạng thái dpkg" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "Dpkg tình trạng quá cũ mục" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"Khi nâng cấp, nếu kdelibs4-dev được cài đặt, kdelibs5-dev nhu cầu được cài " +"đặt. Xem bugs.launchpad.net, lỗi # 279621 để biết chi tiết." + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s phải được đánh dấu để cài thủ công." + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "Gỡ bỏ lilo vì grub đã được cài đặt.(Xem thêm lỗi số #314004.)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "Sau khi cập nhật thông tin gói của bạn, không thể tìm thấy gói chủ yếu " -#~ "'%s' nữa nên một tiến trình báo cáo lỗi đang được bắt đầu." +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "Đang nâng cấp Ubuntu lên phiên bản 12.04" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "%(count)s thành phần cần nâng cấp đã được chọn." +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "Chào mừng đến với Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." #~ msgstr "" -#~ "Các bản cập nhật phần mềm sau đã được đưa ra từ khi phiên Ubuntu này được " -#~ "phát hành." - -#~ msgid "Software updates are available for this computer." -#~ msgstr "Đang có các bản cập nhật phần mềm cho máy tính này." - -#~ msgid "Update Manager" -#~ msgstr "Trình Quản lý Cập nhật" - -#~ msgid "Starting Update Manager" -#~ msgstr "Đang khởi động Trình quản lí Cập nhật" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "Bạn đang kết nối qua một modem không dây." - -#~ msgid "_Install Updates" -#~ msgstr "_Cài đặt các cập nhật" +#~ "Sau khi cập nhật thông tin gói của bạn, không thể tìm thấy gói chủ yếu " +#~ "'%s' nữa nên một tiến trình báo cáo lỗi đang được bắt đầu." #~ msgid "Checking for a new ubuntu release" #~ msgstr "Đang kiểm tra bản phát hành Ubuntu mới" @@ -2644,6 +2695,9 @@ #~ "'ubuntu-bug update-manager' trong một cửa sổ dòng lệnh và thêm vào các " #~ "tập tin trong /var/log/dist-upgrade/ trong báo cáo lỗi." +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "Nâng cấp Ubuntu lên phiên bản 11.10" + #~ msgid "Your graphics hardware may not be fully supported in Ubuntu 11.04." #~ msgstr "" #~ "Phần cứng đồ hoạ của bạn có thể không được hỗ trợ hoàn toàn trong Ubuntu " diff -Nru update-manager-17.10.11/po/xh.po update-manager-0.156.14.15/po/xh.po --- update-manager-17.10.11/po/xh.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/xh.po 2017-12-23 05:00:38.000000000 +0000 @@ -4,11 +4,12 @@ # Translation by Canonical Ltd with thanks to # Translation World CC in South Africa, 2005. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-notifier\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2010-03-09 05:49+0000\n" "Last-Translator: Launchpad Translations Administrators \n" "Language-Team: Xhosa \n" @@ -21,7 +22,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -29,13 +30,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "" @@ -43,30 +44,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -76,13 +77,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -97,22 +98,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -125,65 +126,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -192,25 +193,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -219,11 +220,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -234,11 +235,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -246,7 +247,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -255,29 +256,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -287,28 +288,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -316,11 +317,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -332,16 +333,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -354,11 +355,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -367,34 +368,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -407,23 +408,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -434,32 +435,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -467,33 +468,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -504,26 +505,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -531,37 +532,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -569,79 +570,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -649,16 +650,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -667,7 +668,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -676,11 +677,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -688,11 +689,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -700,11 +701,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -714,71 +715,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -788,27 +789,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -818,7 +819,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -827,26 +828,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -854,147 +855,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1002,32 +1003,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1043,7 +1044,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1057,14 +1058,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1072,34 +1073,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1112,28 +1111,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1141,145 +1140,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1287,73 +1286,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1411,7 +1410,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1430,133 +1429,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1564,31 +1571,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1597,34 +1611,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1632,29 +1654,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1663,7 +1685,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1671,58 +1693,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1732,22 +1764,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1761,26 +1789,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1789,7 +1817,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1798,7 +1826,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1807,47 +1835,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1908,54 +1930,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1980,7 +2005,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1992,216 +2017,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/po/zh_CN.po update-manager-0.156.14.15/po/zh_CN.po --- update-manager-17.10.11/po/zh_CN.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/zh_CN.po 2017-12-23 05:00:38.000000000 +0000 @@ -5,11 +5,12 @@ # # YunQiang Su , 2012. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-04-10 10:40+0000\n" "Last-Translator: Yiding He \n" "Language-Team: Chinese (simplified) \n" @@ -22,20 +23,20 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" msgstr[0] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s 的服务器" @@ -43,30 +44,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "主服务器" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "自定义服务器" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "无法计算 sources.list 条目" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "无法定位任何软件包文件，也许这张不是 Ubuntu 光盘，或者其架构错误？" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "添加 CD 失败" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -80,12 +81,12 @@ "错误信息是：\n" "'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "卸载状态异常的软件包" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -101,15 +102,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "服务器可能已过载" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "破损的软件包" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -118,7 +119,7 @@ "修复它们。" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -139,11 +140,11 @@ " * 非 Ubuntu 提供的非官方软件包\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "很可能发生了一个传输问题，请稍后重试。" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." @@ -151,16 +152,16 @@ "如果没有应用任何变更，您可以在终端里输入命令‘ubuntu-bug update-manager’来报告" "这个 bug。" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "无法计算升级" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "一些软件包认证出错" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -169,28 +170,28 @@ "一些软件包无法通过签名验证。这可能是暂时的网络问题，您可以在稍后再试。以下是" "未认证软件包的列表。" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "软件包“%s”标记为可移除，但它已在移除黑名单中。" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "必要的软件包“%s”被标记为移除。" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "尝试安装黑名单版本“%s”" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "无法安装 '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -199,11 +200,11 @@ "这个 bug。" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "无法猜出元软件包" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -215,15 +216,15 @@ "以无法确定运行的 ubuntu 的版本。\n" " 请先用新立得或 APT 安装以上所举软件包中的一个。" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "正在读取缓存" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "无法获得排它锁" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -231,11 +232,11 @@ "这通常意味着另一个软件包管理程序(如 apt-get 或 aptitude)正在运行。请先关闭那" "个程序。" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "不支持通过远程连接升级" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -248,11 +249,11 @@ "\n" "现在将退出升级。请试试不使用 ssh 的方式。" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "继续在 SSH 下执行？" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -268,11 +269,11 @@ "如果您选择继续，将在 '%s' 端口上建立额外的 SSH 守护进程。\n" "您想要继续吗？" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "正在启用额外的 ssh 守护进程" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -282,7 +283,7 @@ "为了在失败时更容易恢复，将在端口“%s”开启一个额外的 ssh 守护进程。如果当前运行" "的 ssh 发生错误，您仍能够通过该额外的 ssh 进行连接。\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -294,29 +295,29 @@ "动进行这个操作。您可以通过类似这样的命令打开端口：\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "无法升级" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "此工具不支持从 '%s' 到 ‘%s' 的升级。" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "安装沙盒失败" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "不能创建沙盒环境" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "沙盒模式" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -329,16 +330,16 @@ "\n" "从现在起对系统目录的变更重启后都将 *不复存在* 。" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "您的 python 安装错误，请修复“/usr/bin/python”符号链接。" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "已安装软件包“debsig-verify”" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -348,12 +349,12 @@ "请使用新立得软件包管理器来移除它，或者先使用 “sudo apt-get remove debsig-" "verify”卸载后再重新尝试升级。" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "无法写入 '%s'" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -363,11 +364,11 @@ "无法写入您的系统目录 %s ，升级无法继续。\n" "请确保系统目录可写。" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "包括网络上的最新更新？" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -385,16 +386,16 @@ "再进行系统更新。\n" "如果选择\"否\"，就不会使用网络。" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "已禁止升级到 %s" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "未找到可用的镜像" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -411,11 +412,11 @@ "“%s”。" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "生成默认的源？" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -427,21 +428,21 @@ "\n" "是否为“%s”添加默认项？如果选择“否”，将会取消升级。" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "仓库信息无效" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "更新软件源时返回了无效文件，已启动错误报告进程。" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "第三方源被禁用" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -450,12 +451,12 @@ "您的 sources.list 中的一些第三方源被禁用。您可以在升级后用\"软件源\"工具或包" "管理器来重新启用它们。" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "软件包存在冲突" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -469,23 +470,23 @@ "软件包“%s”处于冲突状态，需要重新安装， 但是没能找到它的存档。请重新手动安装这" "个软件包或者将其从系统中删除。" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "升级时出错" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "升级过程中出错。这通常是一些网络问题，请检查您的网络连接后再试" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "磁盘空间不足" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -499,32 +500,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "正在计算变更" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "您要开始升级么？" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "升级已取消" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "升级将会取消，系统会恢复到原始状态。您可以在之后继续升级。" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "无法下载升级包" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -533,34 +534,34 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "确认时出错" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "正在恢复原始系统状态" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "无法安装升级" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" "更新已取消。您的系统可能处在不稳定状态。正在恢复 (dpkg --configure -a)。" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -576,26 +577,26 @@ "+filebug 中报告此错误，然后随错误报告附上 /var/log/dist-upgrade/ 中的文件。\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "更新已取消。请检查您的因特网连接或安装媒体，然后再试一遍。 " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "删除陈旧的软件包？" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "保持(_K)" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "删除(_R)" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -603,37 +604,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "需要的依赖关系未安装" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "需要的依赖关系“%s”未安装 。 " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "正在检查软件包管理器" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "升级准备失败" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "更新时的系统准备失败，已启动错误报告进程。" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "准备升级失败" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -644,68 +645,68 @@ "\n" "此外，错误报告进程也将启动。" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "正在更新软件仓库信息" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "添加光驱失败" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "对不起，没有成功添加光驱。" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "无效的软件包信息" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "正在获取" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "正在升级" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "升级完成" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "升级已完成，但其间出现错误。" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "正在搜索废弃的软件" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "系统升级完成" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "部分升级完成。" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "evms 使用中" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -714,11 +715,11 @@ "您的系统在 /proc/mounts 中使用“evms”卷管理器。“evms”软件不再被支持，请关闭它" "并重新运行升级。" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "Ubuntu 12.04 LTS 可能无法完全支持您的显卡。" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -729,16 +730,16 @@ "信息，请查看 https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx 。仍" "然想要继续升级吗？" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "升级过程可能会降低桌面特效，游戏性能以及对显示要求高的程序。" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -751,7 +752,7 @@ "\n" "您想继续吗？" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -764,11 +765,11 @@ "\n" "您想继续吗？" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "非 i686 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -778,11 +779,11 @@ "您的系统使用的是 i586 或是没有“cmov”扩展的 CPU。所有优化生成的软件包都需要最" "低 i686 的架构。这样的硬件无法升级到新的 Ubuntu 发行版。" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "没有 ARMv6 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -793,11 +794,11 @@ "化都需要至少 ARMv6 的 CPU 架构。在这种硬件基础上无法将您的系统升级到一个新的 " "Ubuntu 发行版。" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "无可用的 init" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -811,15 +812,15 @@ "\n" "您确定要继续吗？" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "使用 aufs 进行沙盒升级" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "使用所给的路径查找带升级包的 CD-ROM" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -827,57 +828,57 @@ "使用前端。当前可用的有： \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*已废弃* 这个选项将被忽略" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "仅执行部分升级(不重写 sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "关闭对 GNU screen 的支持" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "设置数据目录" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "请将 '%s' 插入光驱 '%s'" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "下载完成" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "正在下载文件 %li/%li 速度 %s/s" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "大约还要 %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "下载第 %li 个文件(共 %li 个文件)" @@ -887,27 +888,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "正在应用更改" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "依赖关系问题 - 保持未配置状态" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "无法安装“%s”" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -917,7 +918,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -928,26 +929,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "如果选择替换为新版本的配置文件，您将会失去所有已做的修改。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "找不到 diff 命令" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "出现致命错误" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -958,147 +959,147 @@ "main.log 和 /var/log/dist-upgrade/apt.log 。升级已取消。\n" "您的原始 sources.list 已保存在 /etc/apt/sources.list.distUpgrade 。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "Crtl+C 被按下" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "这将取消本次操作且可能使系统处于被破坏的状态。您确定要这样做？" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "为防止数据丢失，请关闭所有打开的应用程序和文档。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "不再被 Canonical 支持 (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "降级 (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "卸载 (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "不再需要 (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "安装 (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "升级 (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "改变介质" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "显示差别 >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< 隐藏差别" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "错误" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "取消(&C)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "关闭(&C)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "显示终端 >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< 隐藏终端" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "信息" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "细节" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "不再支持 %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "移除 %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "移除(被自动安装的) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "安装 %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "升级 %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "需要重启" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "重新启动系统以完成升级" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "现在重启(_R)" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1109,29 +1110,29 @@ "\n" "如果取消升级系统可能不稳定，强烈建议您继续升级。" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "取消升级？" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li 天" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li 小时" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li 分钟" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1146,7 +1147,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1160,14 +1161,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1177,34 +1178,32 @@ "约需要 %s 秒时间。" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "根据您的连接速度，这次下载将要用大约 %s 的时间 " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "正在准备升级" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "获得新的软件源" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "获取新的软件包" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "正在安装升级" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "正在清理" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1217,25 +1216,25 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "将删除 %d 个软件包。" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "将安装 %d 个新的软件包。" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "将升级 %d 个软件包。" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1246,64 +1245,64 @@ "\n" "您共需下载 %s。 " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "安装升级可能会耗费几小时的时间。一旦下载完毕就不能取消该进程。" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" "升级文件的获取和安装可能会耗费几小时的时间。一旦下载完毕就不能取消该进程。" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "包的删除可能会耗费几小时的时间。 " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "此计算机中的软件是最新软件。" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "你的系统没有可用升级。升级被取消。" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "需要重启" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "升级已经完成并需要重启。您要现在重启么？" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "使用 '%(signature)s' 对 '%(file)s' 进行验证 " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "正在提取 '%s'" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "不能运行升级工具" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." @@ -1311,71 +1310,71 @@ "这可能是升级工具的一个 bug，请使用命令‘ubuntu-bug update-manager’来报告这个 " "bug。" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "升级工具签名" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "升级工具" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "下载失败" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "获取升级信息失败。可能网络有问题。 " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "认证失败" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "认证升级信息失败。可能是网络或服务器的问题。 " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "提取失败" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "提取升级信息失败。可能是网络或服务器的问题。 " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "验证失败" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "验证升级程序失败。可能是网络或服务器的问题。 " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "不能运行升级" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1383,13 +1382,13 @@ "可能的原因是系统的 /tmp 目录无可执行权限。请以可执行权限重新挂载该目录，重新" "升级。" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "错误信息是“%s”。" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1400,73 +1399,73 @@ "dist-upgrade/apt.log 。升级已取消。\n" "您的原始 sources.list 已保存在 /etc/apt/sources.list.distUpgrade 。" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "中止" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "降级：\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "按 [ENTER] 键以继续" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "继续 [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "详细信息[d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "详" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "不再支持：%s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "移除：%s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "安装：%s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "升级：%s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "继续 [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1531,9 +1530,8 @@ msgstr "发行版升级" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "把 Ubuntu 升级到 11.10" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "正在将 Ubuntu 升级到 12.04 版" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1551,151 +1549,164 @@ msgid "Terminal" msgstr "终端" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "请稍候，这需要花一些时间。" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "更新完成" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "无法找到发行注记" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "服务器可能已过载。 " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "无法下载发行说明" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "请检查您的互联网连接。" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "升级" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "发行注记" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "正在下载附加软件包..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "文件 %s/%s 速度： %sB/s" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "文件 %s/%s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "在浏览器中打开链接" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "复制链接到剪贴板" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "正在下载文件 %(current)li/%(total)li 速度 %(speed)s/s" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "正在下载文件 %(current)li/%(total)li" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "不再提供您的 Ubuntu 版本的支持。" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "不会得到进一步的安全修补程序或关键更新。请升级到较新的 Ubuntu 版本。" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "升级信息" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "安装" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "名称" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "版本 %s： \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "未检测到网络连接，您无法下载更新日志。" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "正在下载更新列表..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "全部不选(_D)" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "选择全部(_A)" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "已选择 %(count)s 个更新。" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "将会下载 %s。" #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "该更新已下载完毕但未安装。" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "没有更新需要安装。" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "未知下载大小。" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "软件包信息上次更新的时间未知。请点击“检查”按钮更新软件包信息。" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1704,13 +1715,13 @@ "%(days_ago)s 天前最后一次更新软件包信息。\n" "要检查软件更新，点击下面的“检查”按钮。" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "软件包信息上次是在 %(days_ago)s 天前更新的。" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1718,34 +1729,42 @@ msgstr[0] "软件包信息上次是在 %(hours_ago)s 小时前更新的。" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "该软件包信息已在 %s 分钟之前更新。" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "该软件包信息刚刚更新。" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "软件更新可以为您修复错误，消除安全漏洞及提供新的特性" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "您的计算机有可用的软件更新。" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "欢迎使用 Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" -msgstr "" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "自正式发布起，Ubuntu 已提供了下列软件更新。" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "当前计算机有可用软件更新。" + +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1755,29 +1774,29 @@ "这个更新需要花去 %s 磁盘上总计 %s 的空间。请在 %s 磁盘上留出 %s 空间。清空您" "的回收站和临时文件，用“sudo apt-get clean”清理以前的安装文件。" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "计算机需要重新启动来完成更新。请在继续操作前保存好您的工作。" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "读取软件包信息" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "正在连接..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "您可能无法检查更新或下载新的更新。" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "无法初始化软件包信息" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1789,7 +1808,7 @@ "\n" "请汇报这个“update-manager”软件包的错误，并且将如下信息包含在报告中：\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1801,52 +1820,52 @@ "请汇报这个有关“update-manager”软件包的错误，并且将下列错误信息包含在错误报告" "中：" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (新安装)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(大小：%s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "从版本 %(old_version)s 到 %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "版本 %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "版本升级目前不可用" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "发行版目前无法更新，请再试一次。服务器报告：'%s'" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "正在下载发布升级工具" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "新的 Ubuntu 发行版 %s 可用" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "软件索引已经损坏" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1855,6 +1874,17 @@ "无法安装或删除任何软件。请使用新立得软件包管理器或在终端运行 \"sudo apt-get " "install -f\" 来修正这个问题。" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "有新版本“%s”可供使用" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "取消" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "检查更新" @@ -1864,22 +1894,18 @@ msgstr "安装全部可利用的更新" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "取消" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "变更日志" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "更新" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "正在建立更新列表" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1903,20 +1929,20 @@ " * 不是由 Ubuntu 提供的非官方软件包\n" " * Ubuntu 预发行版本的普通更改" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "正在下载变更日志" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "其它更新 (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "更新不是来源于支持日志变更的源。" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -1924,7 +1950,7 @@ "无法下载更新列表。 \n" "请检查您的网络连接。" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1937,7 +1963,7 @@ "可用版本：%s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1950,7 +1976,7 @@ "请访问 http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "直到变更可用或再试一遍。" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1963,50 +1989,43 @@ "请使用 http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "直到能够访问该列表或稍后再试。" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "检测发行版失败" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "检查您正在使用哪种系统的时候发生一个错误 “%s”。" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "重要安全更新" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "推荐更新" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "提前释放的更新" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "Backports" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "发行版升级" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "其它更新" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "运行升级管理器" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "软件更新可以为您修复错误，消除安全漏洞及提供新的特性" - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "部分升级(_P)" @@ -2075,59 +2094,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "软件更新" +msgid "Update Manager" +msgstr "更新管理器" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "软件更新" +msgid "Starting Update Manager" +msgstr "正在启动更新管理器" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "升级(_P)" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "更新" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "安装" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "变更" +msgid "updates" +msgstr "更新" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "描述" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "升级描述" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "您正在使用漫游连接，更新可能会耗费很多流量。" -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "您在使用无线调制解调器连接网络。" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "在更新前最好将计算机连接电源。" +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "安装更新(_I)" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "变更" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "设置(_S)..." +msgid "Description" +msgstr "描述" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "安装" +msgid "Description of update" +msgstr "升级描述" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "设置(_S)..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2150,9 +2169,8 @@ msgstr "您已经拒绝升级到新版本的 Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "如果您希望以后再升级，可以打开更新管理器，然后点击“升级”。" @@ -2164,56 +2182,56 @@ msgid "Show and install available updates" msgstr "显示并安装可用更新" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "显示版本并退出" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "包含数据文件的文件夹" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "检查是否有新的 Ubuntu 发行版可用" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "验证是否能够升级到最新版本" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "使用最新 proposed 版本的升级器升级" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "开始时焦点不要定位在图上" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "尝试进行版本升级" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "启动时不检查更新" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "进行带沙盒 aufs 隔离层的测试升级" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "运行部分升级" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "显示包的说明而不是变更日志" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "尝试通过 $distro-proposed 更新到最新版本。" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2222,21 +2240,21 @@ "以特定模式升级。\n" "目前支持：用“桌面”为桌面系统，“服务器”为服务器系统升级。" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "运行指定的前端" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "仅在有新的发行版发布时检查，并通过退出码(exit code)报告结果" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "正在检查新版 Ubuntu" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2244,68 +2262,68 @@ "要获得关于升级的信息，请访问：\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "未发现新版本" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "有新版本“%s”可供使用" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "运行“do-release-upgrade”来升级到新版本。" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "Ubuntu %(version)s 升级可用" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "您已经拒绝升级到 Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "添加调试输出" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "显示此计算机中不受支持的包" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "显示此计算机中受支持的包" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "显示所有包及其状态" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "列出所有包" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "'%s' 的支持状态摘要：" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "有 %(num)s 个包(%(percent).1f%%)的支持截止时间是 %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "有 %(num)s 个包(%(percent).1f%%) (已)不能不能下载" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "有 %(num)s 个包(%(percent).1f%%)不受支持" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2313,117 +2331,150 @@ "通过 --show-unsupported、--show-supported 或 --show-all 运行以查看更多详细信" "息" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "已不能下载：" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "不受支持： " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "支持截止时间 %s：" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "不受支持" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "尚未实现的方法：%s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "磁盘上的文件" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb 软件包" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "安装缺失的软件包。" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "包 %s 应当被安装。" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb 软件包" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s 需要标记为手动安装。" - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"在升级时， 如果已经安装了 kdelibs4-dev， 那么需要安装 kdelibs5-dev。参阅 " -"bugs.launchpad.net 上的 bug #279621 来了解详情。" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "状态文件中包含 %i 项过期条目" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "dpkg 状态中的过期条目" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "过期的 dpkg 状态条目" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"在升级时， 如果已经安装了 kdelibs4-dev， 那么需要安装 kdelibs5-dev。参阅 " +"bugs.launchpad.net 上的 bug #279621 来了解详情。" + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s 需要标记为手动安装。" + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "由于 grub 已安装，移除 lilo。(详情参见 bug #314004 。)" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "更新包信息后就已找不到基本包(essential) '%s'，因此即将启动错误报告进程。" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "正在将 Ubuntu 升级到 12.04 版" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "已选择 %(count)s 个更新。" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "欢迎使用 Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." -#~ msgstr "自正式发布起，Ubuntu 已提供了下列软件更新。" - -#~ msgid "Software updates are available for this computer." -#~ msgstr "当前计算机有可用软件更新。" - -#~ msgid "Update Manager" -#~ msgstr "更新管理器" - -#~ msgid "Starting Update Manager" -#~ msgstr "正在启动更新管理器" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "您在使用无线调制解调器连接网络。" - -#~ msgid "_Install Updates" -#~ msgstr "安装更新(_I)" +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." +#~ msgstr "" +#~ "更新包信息后就已找不到基本包(essential) '%s'，因此即将启动错误报告进程。" #~ msgid "Checking for a new ubuntu release" #~ msgstr "检查新的 Ubuntu 发行版本" @@ -2561,5 +2612,8 @@ #~ "这些软件的更新在该版本的 Ubuntu 发行之后被证明有问题。如果您不想现在安装它" #~ "们，可以在稍后从管理员菜单“更新管理器”中选择安装。" +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "把 Ubuntu 升级到 11.10" + #~ msgid "%.0f kB" #~ msgstr "%.0f kB" diff -Nru update-manager-17.10.11/po/zh_HK.po update-manager-0.156.14.15/po/zh_HK.po --- update-manager-17.10.11/po/zh_HK.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/zh_HK.po 2017-12-23 05:00:38.000000000 +0000 @@ -1,8 +1,9 @@ +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager 0.41.1\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-04-13 00:58+0000\n" "Last-Translator: Walter Cheuk \n" "Language-Team: Chinese (Hong Kong) \n" @@ -15,7 +16,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -23,13 +24,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s伺服器" @@ -37,30 +38,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "主要伺服器" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "自訂伺服器" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "無法推算 sources.list 項目" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "找不到套件檔案；也許這不是 Ubuntu 光碟，又或者處理器架構不對？" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "無法加入光碟" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -74,12 +75,12 @@ "錯誤訊息：\n" "「%s」" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "移除有問題套件" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -95,15 +96,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "伺服器可能負載過大" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "損毀的套件" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -112,7 +113,7 @@ "修正再繼續。" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -133,27 +134,27 @@ " * 非 Ubuntu 官方軟件套件的問題\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "這通常只是暫時性的問題。請稍候再試。" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" "如全都不對，請在終端機內輸入指令「ubuntu-bug update-manager」回報錯誤。" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "無法為升級進行推算" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "認證一些套件時發生錯誤" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -162,28 +163,28 @@ "系統無法認證一些套件。這可能是由於短暫的網絡問題；您可以稍後再試。以下為沒有" "認證的套件。" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "套件「%s」標記作移除，但它在移除黑名單中。" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "必備套件「%s」被標記作移除。" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "正在嘗試安裝黑名單版本「%s」" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "無法安裝「%s」" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -191,11 +192,11 @@ "無法安裝必要的套件。請在終端機內輸入「ubuntu-bug update-manager」回報錯誤。" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "無法估計元套件 (meta-package)" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -207,15 +208,15 @@ "edubuntu-desktop 套件，因此無法偵測正在使用那個版本的 Ubuntu。\n" " 請先以「Synaptic 套件管理員」或 apt-get 安裝上述其中一個套件再繼續。" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "正在讀取快取" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "無法取得(使用)排他鎖定" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -223,11 +224,11 @@ "這通常表示有其他的套件管理員程式（如 apt-get 或 aptitude）正在執行。請先關閉" "這些應用程式。" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "不支援透過遠端連線升級" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -240,11 +241,11 @@ "\n" "目前更新將會中止。請透過非 ssh 連線重試。" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "繼續執行於 SSH 中？" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -260,11 +261,11 @@ "若您繼續，一個額外的 ssh 背景程序將會啟動在 '%s' 連接埠。\n" "您想要繼續嗎？" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "啟動後備 sshd 中" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -274,7 +275,7 @@ "為在失敗時更易進行修復，一個後備 sshd 將在‘%s’埠被啟動。如果使用中的 ssh 有任" "何問題，您仍可以連接後備的 sshd 。\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -286,29 +287,29 @@ "執行。可以這樣開啟連接埠：\n" "「%s」" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "無法升級" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "這個工具不支援從‘%s’到‘%s’的升級" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "沙堆(Sandbox)架設失敗" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "不可能建立沙堆(sandbox)環境。" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "沙堆(Sandbox)模式" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -318,16 +319,16 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "您的 python 安裝已毀損。請修正 ‘/usr/bin/python’ 的符號連結。" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "套件 'debsig-verify' 安裝完成。" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -336,12 +337,12 @@ "該已安裝套件令升級無法繼續，請先以「Synaptic 套件管理員」或「apt-get remove " "debsig-verify」指令將其移除再進行升級。" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -349,11 +350,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "包括互聯網上的最新更新嗎？" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -371,16 +372,16 @@ "工作，但是在升級後，應該要盡快安裝最新的更新。\n" "如在此回答「否」，將完全不會使用網絡。" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "因升級至 %s 停用" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "找不到有效的鏡像站" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -399,11 +400,11 @@ "如果選擇「否」，則會取消更新。" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "產生預設的來源？" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -415,21 +416,21 @@ "\n" "要新增 '%s' 的預設項目嗎？如果選擇「否」，則會取消升級。" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "套件庫資料無效" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "因更新套件庫資料導致檔案無效，故啟動錯誤報告程序。" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "已停用第三方來源" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -438,12 +439,12 @@ "部份在 sources.list 的第三方項目已經停用。升級完成後可以「軟件來源(software-" "properties)」工具或套件管理員重新啟用。" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "套件在不一致狀態" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -457,23 +458,23 @@ "這個套件 '%s' 狀態不一致而需要重新安裝，但找不到其存檔套件。請手動重新安裝或" "將其由系統移除。" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "更新時發生錯誤" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "更新時發生錯誤。這可能是某些網絡問題，請檢查網絡連線後再試。" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "磁碟空間不足" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -487,32 +488,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "正在推算改動" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "想要開始更新嗎？" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "升級取消了" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "現在將取消升級，並將系統還原至原來狀態。您可以在之後繼續升級。" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "無法下載升級套件" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -522,27 +523,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "提交時發生錯誤" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "回復原有系統狀態" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "無法安裝升級套件" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -550,7 +551,7 @@ "已放棄升級。系統可能會處於不穩定狀態。現在會執行復原程序 (dpkg --configure -" "a)。" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -561,26 +562,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "已放棄升級。請檢查您的互聯網連線或安裝媒體，接著再試一次。 " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "移除廢棄的套件？" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "保留(_K)" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "移除(_R)" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -588,37 +589,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "必需的相依套件未安裝" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "必需的相依套件「%s」未安裝。 " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "正在檢查套件管理員" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "準備升級失敗" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "取得升級先決元件失敗" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -626,68 +627,68 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "更新套件庫資料" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "無法加入光碟" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "很抱歉，沒有成功加入光碟。" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "套件資訊無效" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "提取中" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "升級中" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "升級完成" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "升級已經完成，但在升級過程中有發生錯誤。" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "搜尋廢棄的軟件中" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "系統升級完成。" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "部份升級完成。" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "有軟件正使用 evms" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -696,11 +697,11 @@ "您的系統於 /proc/mounts 使用 'evms' volume 管理程式。'evms' 軟件已不受支援，" "請將其關閉再執行升級工作。" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -708,16 +709,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "升級可能減低桌面特效和遊戲及其他著重圖形程式的表現。" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -730,7 +731,7 @@ "\n" "是否要繼續？" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -743,11 +744,11 @@ "\n" "是否要繼續？" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "非 i686 處理器" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -758,11 +759,11 @@ "i686 架構為最佳化目標來建置，所以處理器至少需要有 i686 等級。對於目前的硬件來" "說，無法將系統升級到新的 Ubuntu 發行版。" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "非 ARMv6 處理器" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -773,11 +774,11 @@ "化目標來建置，所以處理器至少需要有 ARMv6 等級。對於目前的硬件來說，無法將系統" "升級到新的 Ubuntu 發行版。" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "無法初始化" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -791,15 +792,15 @@ "\n" "您確定想要繼續？" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "使用 aufs 作為沙堆升級" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "使用指定路徑搜尋附有升級套件的光碟" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -808,57 +809,57 @@ "DistUpgradeViewText (純文字), DistUpgradeViewGtk (GTK+), DistUpgradeViewKDE " "(KDE)" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*已棄用* 這個選項會被忽略" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "只進行部份更新 (無須修改 sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "停用 GNU screen 支援" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "設定資料目錄" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "請將‘%s’放入光碟機‘%s’" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "提取完成" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "正提取第 %li 個檔案 (共 %li 個)，速度為 %sB/秒" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "大約還有 %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "正提取第 %li 個檔案 (共 %li 個)" @@ -868,27 +869,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "正在套用改動" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "相依關係問題 - 仍未被設定" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "無法安裝‘%s’" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -898,7 +899,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -909,26 +910,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "如選擇以新版取代，會失去您改動過的設定。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "找不到‘diff’指令" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "發生嚴重錯誤" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -939,147 +940,147 @@ "log/dist-upgrade/apt.log 附在報告。升級程序已中止。\n" "您原先的 sources.list 儲存於 /etc/apt/sources.list.distUpgrade" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "按下 Ctrl+c" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "這將會中止操作並可能令系統在不完整的狀態。您確定要進行嗎?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "為避免遺失資料，請關閉所有已開啟的程式及文件。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "不再受 Canonical 支援 (%s 個)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "降級 (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "移除 (%s 個)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "不再需要 (%s 個)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "安裝 (%s 個)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "升級 (%s 個)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "媒體變更" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "顯示差異 >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< 隱藏差異" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "錯誤" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "取消(&C)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "關閉(&C)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "顯示終端畫面 >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< 隱藏終端畫面" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "資訊" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "詳情" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "不再受支援 %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "移除 %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "移除 (自動安裝的) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "安裝 %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "升級 %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "需要重新開機" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "重新啟動系統以完成更新" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "現在重新啟動(_R)" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1090,29 +1091,29 @@ "\n" "如果您取消升級，系統可能會在不穩定的狀態。強烈建議您繼續升級工作。" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "要取消升級嗎？" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li 日" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li 小時" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li 分鐘" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1127,7 +1128,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s零 %(str_hours)s" @@ -1141,14 +1142,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s又 %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1156,34 +1157,32 @@ msgstr "這次下載所需時間在 1M 寬頻連線大約要 %s，用 56k 數據機大約要 %s。" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "按照您的連線速度，此下載會花約 %s。 " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "準備升級" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "取得新軟件頻道中" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "取得新套件" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "安裝升級" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "清理" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1197,25 +1196,25 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "即將移除 %d 個套件。" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "即將安裝 %d 個新套件。" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "即將升級 %d 個套件。" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1226,134 +1225,134 @@ "\n" "您必須下載全部的%s。 " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "您的系統已經在最新狀態。現在將取消升級的動作。" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "需要重新開機" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "升級已經完成及需要重新啟動。現在要重新啟動嗎？" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "無法執行升級工具" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" "這可能是升級工具的錯誤，請使用指令「ubuntu-bug update-manager」回報錯誤。" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "升級工具簽署" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "升級工具" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "提取失敗" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "提取升級套件失敗。可能是網絡問題。 " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "認證失敗" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "認證升級套件失敗。可能是因為跟伺服器的網絡連線出現問題。 " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "解壓失敗" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "升級套件解壓失敗。可能是因為網絡或伺服器出現問題。 " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "驗證失敗" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "驗證升級套件失敗。可能是因為網絡或伺服器出現問題。 " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "不能進行升級" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1361,13 +1360,13 @@ "這通常是由使用 noexec 掛載 /tmp 的系統引致的。請不要使用 noexec 重新掛載，並" "再次進行升級。" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "錯誤訊息 '%s'。" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1378,73 +1377,73 @@ "apt.log 附在報告。升級程序已中止。\n" "您原先的 sources.list 儲存於 /etc/apt/sources.list.distUpgrade" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "正在中止" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "降等：\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "若要繼續請按 [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "繼續 [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "詳情 [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "不再支援：%s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "移除： %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "安裝： %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "升級： %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "繼續 [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1510,9 +1509,8 @@ msgstr "發行版升級" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "將 Ubuntu 升級至 11.10 版" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "將 Ubuntu 升級至 12.04 版" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1530,151 +1528,165 @@ msgid "Terminal" msgstr "終端" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "請稍候，這可能需要一點時間。" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "更新完成" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "找不到發行公告" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "伺服器可能負荷過重。 " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "無法下載發行公告" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "請檢查您的互聯網連線。" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "升級" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "發行公告" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "正在下載額外的套件檔案..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "檔案 %s / %s (速度：%sB/秒)" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "檔案 %s / %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "用瀏覽器開啟連結" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "複製連結至剪貼簿" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "共 %(total)li 個檔案，正下載第 %(current)li 個 (速度：%(speed)s/秒)" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "共 %(total)li 個檔案，正下載第 %(current)li 個" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "您的 Ubuntu 發行版本已經不再支援。" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "將無法再取得保安修正或重要更新。請升級至最新版本 Ubuntu。" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "升級資訊" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "安裝" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "版本 %s： \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "偵測不到網絡連線，故無法下載改動記錄。" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "正在下載改動清單..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "取消所有選取(_D)" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "全部選取(_A)" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "已選取 %(count)s 項更新。" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "會下載 %s。" #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." -msgstr[0] "更新已下載，但尚未安裝" +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." +msgstr[0] "" +msgstr[1] "" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "下載大小不詳。" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "未知套件資訊的上次更新時間。請點擊「檢查」按鈕來更新資訊。" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1683,13 +1695,13 @@ "%(days_ago)s 天前更新過套件資訊。\n" "請按下方「檢查」鈕看看有否新資訊。" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "上次更新套件資訊是 %(days_ago)s 天前。" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1697,34 +1709,42 @@ msgstr[0] "上次更新套件資訊是 %(hours_ago)s 小時前。" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "套件資訊約 %s 分鐘前更新。" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "套件資訊剛更新。" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "軟件更新會更正錯誤、排除安全隱患並提供新功能。" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "可能有軟體更新提供予閣下之電腦。" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "歡迎使用 Ubuntu" + +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:700 -msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1734,29 +1754,29 @@ "升級工作需要總共 %s 可用空間於硬碟 ‘%s’。請額外空出最少 %s 的空間於 ‘%s’。清" "理清理您的回收筒或使用 ‘sudo apt-get clean’ 移除上次安裝的暫存套件。" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "必須重新啟動電腦來完成安裝更新，在繼續之前請先儲存您的工作。" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "正在讀取套件資訊" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "連線中..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "可能無法檢查是否有、或下載新的更新。" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "無法為套件資訊進行初始化" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1768,7 +1788,7 @@ "\n" "請將此匯報為「update-manager」套件的問題並附上以下錯誤訊息：\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1779,52 +1799,52 @@ "\n" "請為「update-manager」套件匯報此問題並附上以下錯誤訊息：" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (新安裝)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(大小：%s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "由 %(old_version)s 版更新至 %(new_version)s 版" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "%s 版" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "目前不能升級發行版" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "目前無法升級發行版，請稍後重試。該伺服器回報：「%s」。" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "正在下載發行版更新工具" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "有新的 Ubuntu 發行版 '%s' 可供升級" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "軟件索引已損壞" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1833,6 +1853,17 @@ "無法安裝或移除套件。請先以「Synaptic 套件管理員」或在終端機執行「sudo apt-" "get install -f」修正問題。" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "有新發行版 '%s' 提供。" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "取消" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "檢查有否更新" @@ -1842,22 +1873,18 @@ msgstr "安裝所有可進行的更新" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "取消" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "正在建立更新清單" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1881,20 +1908,20 @@ " * 非 Ubuntu 官方軟件套件的問題\n" " * 測試版 Ubuntu 的正常改動" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "正在下載改動記錄" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "其他更新 (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "此更新來源不支援改動記錄。" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -1902,7 +1929,7 @@ "未能下載改動清單。\n" "請檢查互聯網連線。" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1915,7 +1942,7 @@ "新版本：%s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1929,7 +1956,7 @@ "+changelog ，\n" "或稍候再嘗試。" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1943,50 +1970,43 @@ "+changelog ，\n" "或稍候再嘗試。" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "無法偵測出版本" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "當檢查您所使用的系統時有錯誤 \"%s\" 發生。" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "重要保安更新" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "重要更新" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "建議更新" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "回植套件" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "發行版更新" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "其他更新" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "啟動更新管理員" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "軟件更新會更正錯誤、排除安全隱患並提供新功能。" - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "部份升級(_P)" @@ -2055,59 +2075,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "軟件更新" +msgid "Update Manager" +msgstr "更新管理員" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "軟件更新" +msgid "Starting Update Manager" +msgstr "正在啟動更新管理員" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "升級(_P)" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "更新" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "安裝" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "改動" +msgid "updates" +msgstr "更新" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "說明" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "更新說明" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "正以漫遊連上網絡，可能要對本次更新所下載的資料量付費。" -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "您正以無線數據機連線。" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "在更新前先將電腦接上變壓器比較安全。" +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "安裝更新套件(_I)" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "改動" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "設定(_S)..." +msgid "Description" +msgstr "說明" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "安裝" +msgid "Description of update" +msgstr "更新說明" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "設定(_S)..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2130,9 +2150,8 @@ msgstr "您已拒絕升級至新版 Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "您稍後仍可以透過開啟更新管理員並按下『升級』進行升級。" @@ -2144,56 +2163,56 @@ msgid "Show and install available updates" msgstr "顯示並安裝現有的軟件更新" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "顯示版本並結束" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "含有資料檔案的目錄" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "檢查有否新 Ubuntu 發行版可供升級" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "檢查能否升級至最新測試版" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "以最新建議版本的發行升級工具進行升級" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "啟動時不預先選取圖錄" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "試著執行 dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "啟動時不要檢查更新" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "使用沙堆 aufs 層測試升級" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "執行部份升級" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "嘗試使用 $distro-proposed 的升級程式來升級至最新的發行版本" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2203,21 +2222,21 @@ "目前只支援以 'desktop' 模式升級桌面版本的系統，以及以 'server' 模式升級伺服器" "版的系統。" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "執行指定的前端" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "檢查是否有新的發行版並以結束碼報告結果" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2225,170 +2244,211 @@ "若要取得升級資訊，請參訪：\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "找不到新發行版" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "有新發行版 '%s' 提供。" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "執行 ‘do-release-upgrade’ 進行升級工作。" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "可以升級至 Ubuntu %(version)s" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "您已拒絕升級至 Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "未實作的方法： %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "磁碟上之檔案" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb 套件" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "安裝缺少的套件。" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "應安裝 %s 套件。" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb 套件" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s 要標記為手動安裝。" - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"升級時如已安裝 kdelibs4-dev，那就必須安裝 kdelibs5-dev。詳情請見 bugs." -"launchpad.net，bug #279621。" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "狀態檔中有 %i 條廢棄項目" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "dpkg 狀態中有廢棄條目" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "廢棄的 dpkg 狀態項目" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" -msgstr "因 grub 已安裝，移除 lilo (詳情見 bug #314004）" - -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "將 Ubuntu 升級至 12.04 版" +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"升級時如已安裝 kdelibs4-dev，那就必須安裝 kdelibs5-dev。詳情請見 bugs." +"launchpad.net，bug #279621。" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "已選取 %(count)s 項更新。" +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s 要標記為手動安裝。" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +msgstr "因 grub 已安裝，移除 lilo (詳情見 bug #314004）" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "歡迎使用 Ubuntu" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Update Manager" -#~ msgstr "更新管理員" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "Starting Update Manager" -#~ msgstr "正在啟動更新管理員" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "You are connected via a wireless modem." -#~ msgstr "您正以無線數據機連線。" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "_Install Updates" -#~ msgstr "安裝更新套件(_I)" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "Your system is up-to-date" #~ msgstr "系統已經在最新狀態" @@ -2396,6 +2456,10 @@ #~ msgid "Software updates are available for this computer" #~ msgstr "有軟件更新適用於此電腦" +#~ msgid "The update has already been downloaded, but not installed" +#~ msgid_plural "The updates have already been downloaded, but not installed" +#~ msgstr[0] "更新已下載，但尚未安裝" + #~ msgid "There are no updates to install" #~ msgstr "沒有要安裝的升級" @@ -2438,6 +2502,9 @@ #~ msgid "1 kB" #~ msgstr "1 kB" +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "將 Ubuntu 升級至 11.10 版" + #~ msgid "Your graphics hardware may not be fully supported in Ubuntu 11.04." #~ msgstr "您的繪圖硬件可能無法在 Ubuntu 11.04 獲得完整的支援。" diff -Nru update-manager-17.10.11/po/zh_TW.po update-manager-0.156.14.15/po/zh_TW.po --- update-manager-17.10.11/po/zh_TW.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/zh_TW.po 2017-12-23 05:00:38.000000000 +0000 @@ -1,8 +1,9 @@ +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager 0.41.1\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2012-03-23 02:57+0000\n" "Last-Translator: Cheng-Chia Tseng \n" "Language-Team: Chinese (Taiwan) \n" @@ -15,20 +16,20 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" msgstr[0] "%(size).0f kB" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "%s伺服器" @@ -36,30 +37,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "主伺服器" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "自訂伺服器" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "無法計算 sources.list 項目" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "找不到套件檔，也許這不是 Ubuntu 光碟，或者處理器架構不對。" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "無法加入光碟" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -73,12 +74,12 @@ "錯誤訊息：\n" "「%s」" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "移除有問題套件" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -93,15 +94,15 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "伺服器可能負載過大" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "損毀套件" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." @@ -109,7 +110,7 @@ "本軟體無法修正閣下系統某有損毀套件。請先使用 synaptic 或 apt-get 修正才繼續。" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -130,27 +131,27 @@ " * 安裝了非由 Ubuntu 官方提供的軟體套件\n" "\n" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "很可能只是暫時有問題。請稍候再試。" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" "如全都不對，請在終端機內輸入指令「ubuntu-bug update-manager」回報錯誤。" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "無法計算升級" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "認證一些套件時發生錯誤" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -159,28 +160,28 @@ "無法驗證部份套件。可能是因為短時間的網路問題。您可以稍候再試一次。下面是未被" "驗證的套件清單。" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "套件「%s」標記作移除，但它在移除黑名單中。" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "必要套件「%s」被標記作移除。" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "正在嘗試安裝黑名單版本「%s」" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "無法安裝「%s」" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." @@ -188,11 +189,11 @@ "無法安裝必要的套件。請在終端機內輸入「ubuntu-bug update-manager」回報錯誤。" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "無法估計元套件 (meta-package)" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -204,15 +205,15 @@ "此無法偵測正在使用那個版本的 Ubuntu。\n" " 請先使用 synaptic 或 apt-get 安裝上述其中一個套件再繼續作業" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "正在讀取快取" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "無法取得(使用)排他鎖定" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." @@ -220,11 +221,11 @@ "這通常表示有其他的套件管理員程式（如 apt-get 或 aptitude）正在執行。請先關閉" "這些應用程式。" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "不支援透過遠端連線升級" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -237,11 +238,11 @@ "\n" "目前更新將會中止。請透過非 ssh 連線重試。" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "繼續執行於 SSH 中？" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -257,11 +258,11 @@ "若您繼續，一個額外的 ssh 背景程序將會啟動在 '%s' 連接埠。\n" "您想要繼續嗎？" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "啟動後備 sshd 中" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -271,7 +272,7 @@ "為在失敗時更易進行修復，一個後備 sshd 將在‘%s’埠被啟動。如果使用中的 ssh 有任" "何問題，您仍可以連接後備的 sshd 。\n" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -283,29 +284,29 @@ "會自動執行。您可以這樣開啟連接埠：\n" "「%s」" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "無法升級" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "這個工具不支援從‘%s’到‘%s’的升級" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "沙堆(Sandbox)架設失敗" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "不可能建立沙堆(sandbox)環境。" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "沙堆(Sandbox)模式" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -319,16 +320,16 @@ "\n" "從現在起直到下次重新開機前，任何寫入系統目錄的變更都「不會」被留存。" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "您的 python 安裝已毀損。請修正 ‘/usr/bin/python’ 的符號連結。" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "套件 'debsig-verify' 安裝完成。" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " @@ -337,12 +338,12 @@ "此已安裝的套件令升級無法繼續，請使用 synaptic 或命令 'apt-get remove debsig-" "verify' 移除它後再次進行升級。" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "無法寫入「%s」" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -352,11 +353,11 @@ "無法寫入您的系統目錄「%s」。升級程序無法繼續。\n" "請確認該系統目錄可以寫入。" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "要否包括來自網際網路的最新更新？" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -374,16 +375,16 @@ "工作，但是在升級後，您應該要盡快安裝最新的更新。\n" "如果您在此回答「否」，將完全不會使用網路。" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "因升級至 %s 停用" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "找不到有效的鏡像站" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -402,11 +403,11 @@ "如選「否」則會取消更新。" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "產生預設的來源？" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -418,21 +419,21 @@ "\n" "要新增「%s」的預設項目嗎？如果您選擇「否」則會取消升級。" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "套件庫資料無效" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "升級套件庫資訊導致檔案無效，因此正在啟動臭蟲回報程序" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "已停用第三方來源" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " @@ -441,12 +442,12 @@ "sources.list 中的某些第三方項目已停用。以「軟體來源」工具或套件管理員升級後可" "將之重新啟用。" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "套件在不一致狀態" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -460,23 +461,23 @@ "這個套件 '%s' 狀態不一致而需要重新安裝，但找不到它的套件。請手動地重新安裝套" "件或將它由系統中移除。" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "更新時發生錯誤" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "更新時發生錯誤。這可能是某些網路問題，試檢查網路連線後再試。" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "磁碟空間不足" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -490,32 +491,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "正在計算所有的更動" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "要開始升級嗎？" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "升級取消了" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "現在將取消升級，並且還原至原始系統。您可以在之後繼續升級。" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "無法下載升級套件" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -525,27 +526,27 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "提交時發生錯誤" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "回復原有系統狀態" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "無法安裝升級" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." @@ -553,7 +554,7 @@ "已放棄升級。您的系統可能處於不穩定狀態。現在將執行復原程序 (dpkg --configure " "-a)。" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -569,26 +570,26 @@ "manager/+filebug ，並請附加 /var/log/dist-upgrade/ 內的檔案至臭蟲回報中。\n" "%s" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "已放棄升級。請檢查您的網際網路連線或安裝媒體，接著再試一次。 " -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "移除廢棄的套件？" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "保留(_K)" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "移除(_R)" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -596,37 +597,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "必需的相依套件未被安裝" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "必需的相依套件‘%s’未被安裝。 " #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "正在檢查套件管理員" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "準備升級失敗" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "準備系統以供升級的動作失敗，所以正在啟動臭蟲回報程序。" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "取得升級先決元件失敗" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -637,68 +638,68 @@ "\n" "此外，臭蟲回報程序正在啟動中。" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "正在更新套件庫資訊" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "無法加入光碟" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "很抱歉，沒有成功加入光碟。" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "無效的套件資訊" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "接收中" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "升級中" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "升級完成" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "升級已經完成，但在升級過程中有發生錯誤。" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "搜尋廢棄的軟體中" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "系統升級完成。" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "部份升級完成。" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "有軟體正使用 evms" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " @@ -707,11 +708,11 @@ "您的系統於 /proc/mounts 使用 'evms' volume 管理程式。'evms' 軟體已不受支援，" "請將其關閉再執行升級工作。" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "您的繪圖硬體可能無法被 Ubuntu 12.04 LTS 完整支援。" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -722,16 +723,16 @@ "題。更多資訊可以查看 \"https://wiki.ubuntu.com/X/Bugs/" "UpdateManagerWarningForI8xx\"。您是否要繼續升級？" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "升級可能減低桌面特效和遊戲及其他著重圖形程式的表現。" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -744,7 +745,7 @@ "\n" "是否要繼續？" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -757,11 +758,11 @@ "\n" "是否要繼續？" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "無 i686 CPU" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -772,11 +773,11 @@ "構為最佳化目標來建置，所以 CPU 至少需要有 i686 等級。對於您目前的硬體來說，您" "無法將系統升級到最新的 Ubuntu 發行。" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "無 ARMv6 處理器" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -786,11 +787,11 @@ "您系統使用的 ARM 處理器舊於 ARMv6 架構。所有 karmic 套件都是以 ARMv6 為最低架" "構優化建造的。所以伴隨此硬體無法升級您的系統到新的 Ubuntu 版本。" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "無法初始化" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -804,15 +805,15 @@ "\n" "您確定想要繼續？" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "使用 aufs 作為沙堆升級" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "使用指定路徑搜尋附有升級套件的光碟" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" @@ -821,57 +822,57 @@ "DistUpgradeViewText (純文字), DistUpgradeViewGtk (GTK+), DistUpgradeViewKDE " "(KDE)" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "*已棄用* 這個選項會被忽略" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "只進行部份升級 (無須修改 sources.list)" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "停用 GNU 螢幕支援" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "設定資料目錄" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "請將‘%s’放入光碟機‘%s’" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "接收完成" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "接收第 %li 個檔案 (共 %li 個檔案，速度為 %sB/s)" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "大約剩下 %s" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "接收第 %li 個檔案 (共 %li 個)" @@ -881,27 +882,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "正在套用變更" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "相依問題 - 保留為未設定" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "無法安裝‘%s’" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -912,7 +913,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -923,26 +924,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "如果選擇以新版覆蓋，那麼將會失去您改變過的設定。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "找不到‘diff’指令" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "發生嚴重錯誤" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -953,147 +954,147 @@ "log/dist-upgrade/apt.log 附在您的報告中。升級程序已取消。\n" "您原先的 sources.list 儲存於 /etc/apt/sources.list.distUpgrade。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "按下 Ctrl+c" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "操作將被中止。這可能會造成系統的不完整。你確定要進行嗎?" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "為避免遺失資料，請關閉所有開啟的程式及文件。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "不再受 Canonical 支援 (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "降級 (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "移除 (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "不再需要 (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "安裝 (%s)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "升級 (%s)" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "媒體變更" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "顯示差異 >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "<<< 隱藏差異" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "錯誤" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "取消(&C)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "關閉(&C)" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "顯示終端畫面 >>>" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "<<< 隱藏終端畫面" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "資訊" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "詳情" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "不再支援 %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "移除 %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "移除 (曾是自動安裝的) %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "安裝 %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "升級 %s" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "需要重新開機" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "重新啟動系統以完成更新" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "現在重新啟動(_R)" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1104,29 +1105,29 @@ "\n" "如果您取消升級，系統可能會在不穩定的狀態。強烈建議您繼續升級工作。" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "要取消升級嗎？" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "%li 日" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "%li 小時" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "%li 分鐘" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1141,7 +1142,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "%(str_days)s %(str_hours)s" @@ -1155,14 +1156,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "%(str_hours)s又 %(str_minutes)s" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1170,34 +1171,32 @@ msgstr "這次下載所需時間在 1M DSL 連線大約要 %s，用 56k 數據機大約要 %s。" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "依照您的連線速率，此下載將要約 %s 的時間。 " -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "準備升級中" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "正取得新軟體頻道" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "取得新套件" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "安裝升級中" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "清理中" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1210,25 +1209,25 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "即將移除 %d 個套件。" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "即將安裝 %d 個新套件。" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "即將升級 %d 個套件。" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1239,134 +1238,134 @@ "\n" "要下載共%s。 " -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "安裝升級可能會花上幾個鐘頭。一旦下載完成，程序便無法取消。" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "升級的擷取與安裝可能花上數個鐘頭。一旦下載完成，升級程序無法取消。" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "移除套件可能會花上幾個鐘頭。 " #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "這臺電腦上的軟體已處最新狀態。" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "您的系統已在最新狀態。現在將取消升級動作。" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "需要重新開機" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "升級已經完成並需要重新開機。是否現在重新開機？" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "以「%(signature)s」驗證「%(file)s」 " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "正在抽出「%s」" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "無法執行升級工具" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" "這可能是升級工具的錯誤，請使用指令「ubuntu-bug update-manager」回報錯誤。" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "升級工具簽署" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "升級工具" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "接收失敗" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "接收升級套件失敗。可能是網路問題。 " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "認證失敗" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "認證升級套件失敗。可能是因為跟伺服器的網路連線出現問題。 " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "解壓失敗" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "升級套件解壓失敗。可能是因為網路或伺服器出現問題。 " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "檢驗失敗" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "檢驗升級套件失敗。可能是因為網路或伺服器出現問題。 " -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "不能進行升級" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." @@ -1374,13 +1373,13 @@ "這通常是由使用 noexec 掛載 /tmp 的系統引致的。請不要使用 noexec 重新掛載，並" "再次進行升級。" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "錯誤訊息 '%s'。" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1391,73 +1390,73 @@ "apt.log 附在您的報告中。升級程序已取消。\n" "您原先的 sources.list 儲存於 /etc/apt/sources.list.distUpgrade。" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "正在中止" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "降級：\n" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "若要繼續請按 [ENTER]" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "繼續 [yN] " -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "詳情 [d]" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "y" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "n" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "d" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "不再支援：%s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "移除： %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "安裝： %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "升級： %s\n" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "繼續 [Yn] " -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1523,9 +1522,8 @@ msgstr "發行版升級" #: ../DistUpgrade/DistUpgrade.ui.h:19 -#, fuzzy -msgid "Upgrading Ubuntu to version 12.10" -msgstr "將 Ubuntu 升級至 11.10 版" +msgid "Upgrading Ubuntu to version 12.04" +msgstr "升級 Ubuntu 至 12.04 版" #: ../DistUpgrade/DistUpgrade.ui.h:20 msgid " " @@ -1543,151 +1541,164 @@ msgid "Terminal" msgstr "終端" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "請稍候，這需要一點時間。" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "更新完成" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "找不到發行公告" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "伺服器可能負荷過重。 " -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "無法下載發行公告" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "請檢查您的網際網路連線。" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "升級" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "發行公告" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "正在下載額外的套件檔案..." -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "檔案 %s / %s (速度：%s 位元組/秒)" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "檔案 %s / %s" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "用瀏覽器開啟連結" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "複製連結至剪貼簿" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "共 %(total)li 個檔案，正下載第 %(current)li 個 (速度: %(speed)s/秒)" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "共 %(total)li 個檔案，正下載第 %(current)li 個" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "您的 Ubuntu 發行版本已經不再支援。" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "您將無法再取得安全性修正或重大更新。請升級至較新版本的 Ubuntu。" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "升級資訊" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "安裝" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "名稱" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "版本 %s： \n" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "未偵測到網路連線，您無法下載更動紀錄資訊。" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "正下載更動清單..." -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "全部不選(_D)" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "全部選取(_A)" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "已選取 %(count)s 項更新。" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "將下載 %s。" #: ../UpdateManager/UpdateManager.py:584 -#, fuzzy -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "更新已經下載，但尚未安裝。" #: ../UpdateManager/UpdateManager.py:589 msgid "There are no updates to install." msgstr "沒有要安裝的更新。" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "%(count_str)s %(download_str)s" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "未知下載大小。" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "未知套件資訊的上次更新時間。請點擊「檢查」按鈕來更新資訊。" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" @@ -1696,13 +1707,13 @@ "%(days_ago)s 天前更新過套件資訊。\n" "請按下方「檢查」鈕看看有否新資訊。" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "%(days_ago)s 天前更新過套件資訊。" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1710,34 +1721,42 @@ msgstr[0] "%(hours_ago)s 小時前更新過套件資訊。" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "套件資訊約 %s 分鐘前更新。" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "套件資訊剛更新。" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "軟體更新會修正錯誤、消除安全隱患並提供新功能。" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "可能有軟體更新提供予閣下之電腦。" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" -msgstr "" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" +msgstr "歡迎使用 Ubuntu" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" -msgstr "" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "自從這個版本的 Ubuntu 發行後，已經釋出這些軟體更新" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." +msgstr "有此電腦可用的軟體更新。" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1747,29 +1766,29 @@ "升級工作需要總共 %s 可用空間於硬碟 ‘%s’。請額外空出最少 %s 的空間於 ‘%s’。清" "理清理您的回收筒或使用 ‘sudo apt-get clean’ 移除上次安裝的暫存套件。" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "必須重啟電腦以完成安裝更新。繼續前請先儲存工作。" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "正在讀取套件資訊" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "連線中..." -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "您可能無法檢查是否有更新，或是下載新的更新。" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "無法初始化套件資訊" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1781,7 +1800,7 @@ "\n" "請匯報此為『update-manager』套件的問題並附上以下的錯誤訊息：\n" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1792,52 +1811,52 @@ "\n" "請匯報此為『update-manager』套件的問題並附上以下的錯誤訊息：" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr " (新安裝)" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "(大小：%s)" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "由版本 %(old_version)s 更新至 %(new_version)s" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "版本 %s" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "目前不能升級發行版" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "發行版升級升級目前無法執行，請稍後重試。該伺服器回報：「%s」。" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "正下載發行版更新工具" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "有新 Ubuntu 發行版 '%s' 可供升級" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "軟體索引損壞" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -1846,6 +1865,17 @@ "無法安裝或移除軟體。請先用 Synaptic 套件管理員或在終端機執行「sudo apt-get " "install -f」修正。" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +#, fuzzy +msgid "New hardware support is available" +msgstr "有新版「%s」提供。" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "取消" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "檢查更新" @@ -1855,22 +1885,18 @@ msgstr "安裝所有可進行的更新" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "取消" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "變更記錄" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "更新" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "正建立更新清單" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1894,20 +1920,20 @@ " * 安裝了非由 Ubuntu 官方提供的軟體套件\n" " * Ubuntu 非正式發佈版本的正常更動" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "正下載變更記錄" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "其他更新 (%s)" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "這份更新的來源不支援變更記錄 (changelog)。" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." @@ -1915,7 +1941,7 @@ "下載更動清單失敗。\n" "請檢查網際網路連線。" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1928,7 +1954,7 @@ "可用的版本：%s\n" "\n" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1941,7 +1967,7 @@ "有變更記錄提供前請至 http://launchpad.net/ubuntu/+source/%s/%s/+changelog，\n" "或稍候再試。" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1954,50 +1980,43 @@ "有更動清單提供前請至 http://launchpad.net/ubuntu/+source/%s/%s/+changelog，\n" "或稍候再試。" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "無法偵測出版本" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "當檢查您所使用的系統時有錯誤 \"%s\" 發生。" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "重要的安全性更新" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "推薦更新" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "建議更新" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "回殖套件 (Backports)" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "發行版更新" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "其他更新" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -#, fuzzy -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "啟動更新管理員" -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." -msgstr "軟體更新會修正錯誤、消除安全隱患並提供新功能。" - #: ../data/gtkbuilder/UpdateManager.ui.h:3 msgid "_Partial Upgrade" msgstr "部份升級(_P)" @@ -2065,59 +2084,59 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -#, fuzzy -msgid "Software Updater" -msgstr "軟體更新" +msgid "Update Manager" +msgstr "更新管理員" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -#, fuzzy -msgid "Starting Software Updater" -msgstr "軟體更新" +msgid "Starting Update Manager" +msgstr "正在啟動更新管理員" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "升級(_P)" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" -msgstr "更新" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#, fuzzy +msgid "I_nstall" +msgstr "安裝" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" -msgstr "變更" +msgid "updates" +msgstr "更新" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" -msgstr "說明" - -#: ../data/gtkbuilder/UpdateManager.ui.h:30 -#, fuzzy -msgid "Details of updates" -msgstr "更新說明" - -#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "您已透過漫遊連上網路，可能要對本次更新所下載的資料量付費。" -#: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." -msgstr "" +#: ../data/gtkbuilder/UpdateManager.ui.h:30 +msgid "You are connected via a wireless modem." +msgstr "您正透過無線數據機連線。" -#: ../data/gtkbuilder/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "It’s safer to connect the computer to AC power before updating." msgstr "在更新前先將電腦接上 AC 電源比較安全。" +#: ../data/gtkbuilder/UpdateManager.ui.h:32 +msgid "_Install Updates" +msgstr "安裝更新套件(_I)" + +#: ../data/gtkbuilder/UpdateManager.ui.h:33 +msgid "Changes" +msgstr "變更" + #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." -msgstr "設定(_S)..." +msgid "Description" +msgstr "說明" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -#, fuzzy -msgid "_Install Now" -msgstr "安裝" +msgid "Description of update" +msgstr "更新說明" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." +msgstr "設定(_S)..." #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" @@ -2140,9 +2159,8 @@ msgstr "您已拒絕升級至新的 Ubuntu" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 -#, fuzzy msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "您稍後仍可以透過開啟更新管理員並按下『升級』進行升級。" @@ -2154,56 +2172,56 @@ msgid "Show and install available updates" msgstr "顯示並安裝現有軟體更新" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "顯示版本後結束" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "含有資料檔案的目錄" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "檢查有否新 Ubuntu 發行版可供升級" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "檢查能否升級至最新開發發行版" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "使用最新建議版本的發行升級工具升級" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "啟動時不預先選取圖錄" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "試著執行 dist-upgrade" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "當啟動時不要檢查更新" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "使用沙堆 aufs 層測試升級" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "執行部份升級" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "顯示套件描述而不是變更紀錄" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "試著使用 $distro-proposed 的套件升級程式來升級到最新的發行版本" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " @@ -2213,21 +2231,21 @@ "目前只支援以 'desktop' 模式升級桌面版本的系統，以及以 'server' 模式升級伺服器" "版的系統。" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "執行指定的前端" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "檢查有否新發行版並以結束碼報告結果" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "檢查是否有新的 Ubuntu 發行" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" @@ -2235,68 +2253,68 @@ "若要取得升級資訊，請參訪：\n" "%(url)s\n" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "沒找到新發行版" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "有新版「%s」提供。" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "執行 ‘do-release-upgrade’ 進行升級工作。" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "可以升級至 Ubuntu %(version)s" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "您已拒絕升級至 Ubuntu %s" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "加入除錯輸出" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "顯示此機器上不再支援的套件" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "顯示此機器上受支援的套件" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "顯示所有套件及其狀態" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "將所有套件以清單顯示" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "「%s」的支援狀態摘要：" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "您現在有 %(num)s 個套件 (%(percent).1f%%) 將支援直到 %(time)s" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "您有 %(num)s 個套件 (%(percent).1f%%) 無法／不再能下載" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "您有 %(num)s 個套件 (%(percent).1f%%) 不再支援" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" @@ -2304,118 +2322,151 @@ "加上 --show-unsupported、--show-supported 或是 --show-all 作為參數執行以查看" "更多細節" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "不再能下載：" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "不再支援： " -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "支援直至 %s：" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "不再支援" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "未實作的方法： %s" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "磁碟上之檔案" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr ".deb 套件" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "安裝缺少的套件。" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "應安裝 %s 套件。" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" -msgstr ".deb 套件" - -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." -msgstr "%s 要標記為手動安裝。" - -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 -msgid "" -"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " -"installed. See bugs.launchpad.net, bug #279621 for details." -msgstr "" -"在升級時，如果有安裝 kdelibs4-dev，那 kdelibs5-dev 就必須安裝。詳情請見 bugs." -"launchpad.net， bug #279621。" - -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 #, python-format msgid "%i obsolete entries in the status file" msgstr "狀態檔有 %i 個廢棄條目" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 +#: ../Janitor/plugins/dpkg_status_plugin.py:39 msgid "Obsolete entries in dpkg status" msgstr "dpkg 狀態中之廢棄條目" #. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 +#: ../Janitor/plugins/dpkg_status_plugin.py:42 msgid "Obsolete dpkg status entries" msgstr "廢棄的 dpkg 狀態條目" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 +msgid "" +"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " +"installed. See bugs.launchpad.net, bug #279621 for details." +msgstr "" +"在升級時，如果有安裝 kdelibs4-dev，那 kdelibs5-dev 就必須安裝。詳情請見 bugs." +"launchpad.net， bug #279621。" + +#: ../Janitor/plugins/langpack_manual_plugin.py:34 +#, python-format +msgid "%s needs to be marked as manually installed." +msgstr "%s 要標記為手動安裝。" + +#: ../Janitor/plugins/remove_lilo_plugin.py:28 msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "因已安裝 grub，移除 lilo。（詳情見 bug #314004。）" -#~ msgid "" -#~ "After your package information was updated the essential package '%s' can " -#~ "not be found anymore so a bug reporting process is being started." -#~ msgstr "" -#~ "在您的套件資訊更新之後，我們無法再找到必要的「%s」套件，因此正在啟動臭蟲回" -#~ "報程序。" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " +msgstr "" -#~ msgid "Upgrading Ubuntu to version 12.04" -#~ msgstr "升級 Ubuntu 至 12.04 版" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" -#~ msgid "%(count)s update has been selected." -#~ msgid_plural "%(count)s updates have been selected." -#~ msgstr[0] "已選取 %(count)s 項更新。" +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" -#~ msgid "%(count_str)s %(download_str)s" -#~ msgstr "%(count_str)s %(download_str)s" +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" -#~ msgid "Welcome to Ubuntu" -#~ msgstr "歡迎使用 Ubuntu" +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" #~ msgid "" -#~ "These software updates have been issued since this version of Ubuntu was " -#~ "released." -#~ msgstr "自從這個版本的 Ubuntu 發行後，已經釋出這些軟體更新" - -#~ msgid "Software updates are available for this computer." -#~ msgstr "有此電腦可用的軟體更新。" - -#~ msgid "Update Manager" -#~ msgstr "更新管理員" - -#~ msgid "Starting Update Manager" -#~ msgstr "正在啟動更新管理員" - -#~ msgid "You are connected via a wireless modem." -#~ msgstr "您正透過無線數據機連線。" - -#~ msgid "_Install Updates" -#~ msgstr "安裝更新套件(_I)" +#~ "After your package information was updated the essential package '%s' can " +#~ "not be found anymore so a bug reporting process is being started." +#~ msgstr "" +#~ "在您的套件資訊更新之後，我們無法再找到必要的「%s」套件，因此正在啟動臭蟲回" +#~ "報程序。" #~ msgid "Checking for a new ubuntu release" #~ msgstr "檢查有沒有新的 ubuntu 發行版" @@ -2531,6 +2582,9 @@ #~ "您的 Intel 繪圖硬體在 Ubuntu 11.04 內的支援有限，且可能會在升級之後碰到一" #~ "些問題。您要繼續進行升級嗎？" +#~ msgid "Upgrading Ubuntu to version 11.10" +#~ msgstr "將 Ubuntu 升級至 11.10 版" + #~ msgid "%.0f kB" #~ msgstr "%.0f kB" diff -Nru update-manager-17.10.11/po/zu.po update-manager-0.156.14.15/po/zu.po --- update-manager-17.10.11/po/zu.po 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/po/zu.po 2017-12-23 05:00:38.000000000 +0000 @@ -3,11 +3,12 @@ # This file is distributed under the same license as the update-manager package. # FIRST AUTHOR , 2009. # +#: ../hwe-support-status:167 msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2012-06-14 00:53+0100\n" +"POT-Creation-Date: 2014-06-19 11:21+0200\n" "PO-Revision-Date: 2009-10-14 00:51+0000\n" "Last-Translator: Xolani1990 \n" "Language-Team: Zulu \n" @@ -20,7 +21,7 @@ "X-Generator: Launchpad (build 15099)\n" #. TRANSLATORS: download size of small updates, e.g. "250 kB" -#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433 +#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399 #, python-format msgid "%(size).0f kB" msgid_plural "%(size).0f kB" @@ -28,13 +29,13 @@ msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436 +#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402 #, python-format msgid "%.1f MB" msgstr "%.1f MB" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436 +#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442 #, python-format msgid "Server for %s" msgstr "" @@ -42,30 +43,30 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 -#: ../DistUpgrade/distro.py:246 +#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235 +#: ../DistUpgrade/distro.py:251 msgid "Main server" msgstr "" -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:255 msgid "Custom servers" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:142 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:141 msgid "Could not calculate sources.list entry" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:251 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:244 msgid "" "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the " "wrong architecture?" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:294 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:287 msgid "Failed to add the CD" msgstr "" -#: ../DistUpgrade/DistUpgradeAptCdrom.py:295 +#: ../DistUpgrade/DistUpgradeAptCdrom.py:288 #, python-format msgid "" "There was a error adding the CD, the upgrade will abort. Please report this " @@ -75,13 +76,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:151 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:154 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -96,22 +97,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:255 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:368 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "Izihuqulo eziphile" -#: ../DistUpgrade/DistUpgradeCache.py:369 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:693 +#: ../DistUpgrade/DistUpgradeCache.py:679 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -124,65 +125,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:703 +#: ../DistUpgrade/DistUpgradeCache.py:689 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:706 +#: ../DistUpgrade/DistUpgradeCache.py:692 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:711 -#: ../UpdateManager/UpdateManager.py:1031 +#: ../DistUpgrade/DistUpgradeCache.py:697 +#: ../UpdateManager/UpdateManager.py:1037 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:762 +#: ../DistUpgrade/DistUpgradeCache.py:748 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:763 +#: ../DistUpgrade/DistUpgradeCache.py:749 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:783 +#: ../DistUpgrade/DistUpgradeCache.py:769 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:787 +#: ../DistUpgrade/DistUpgradeCache.py:773 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:796 +#: ../DistUpgrade/DistUpgradeCache.py:782 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:914 +#: ../DistUpgrade/DistUpgradeCache.py:900 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:915 +#: ../DistUpgrade/DistUpgradeCache.py:901 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:926 +#: ../DistUpgrade/DistUpgradeCache.py:912 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:927 +#: ../DistUpgrade/DistUpgradeCache.py:913 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -191,25 +192,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:114 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:209 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:257 +#: ../DistUpgrade/DistUpgradeController.py:243 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:258 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -218,11 +219,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:272 +#: ../DistUpgrade/DistUpgradeController.py:258 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:273 +#: ../DistUpgrade/DistUpgradeController.py:259 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -233,11 +234,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:287 +#: ../DistUpgrade/DistUpgradeController.py:273 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:288 +#: ../DistUpgrade/DistUpgradeController.py:274 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -245,7 +246,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:296 +#: ../DistUpgrade/DistUpgradeController.py:282 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -254,29 +255,29 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:368 -#: ../DistUpgrade/DistUpgradeController.py:413 +#: ../DistUpgrade/DistUpgradeController.py:354 +#: ../DistUpgrade/DistUpgradeController.py:399 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:369 +#: ../DistUpgrade/DistUpgradeController.py:355 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:364 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:385 +#: ../DistUpgrade/DistUpgradeController.py:371 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:386 +#: ../DistUpgrade/DistUpgradeController.py:372 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " @@ -286,28 +287,28 @@ "are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:414 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:440 +#: ../DistUpgrade/DistUpgradeController.py:426 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:441 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:453 +#: ../DistUpgrade/DistUpgradeController.py:439 #, python-format msgid "Can not write to '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:454 +#: ../DistUpgrade/DistUpgradeController.py:440 #, python-format msgid "" "Its not possible to write to the system directory '%s' on your system. The " @@ -315,11 +316,11 @@ "Please make sure that the system directory is writable." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:465 +#: ../DistUpgrade/DistUpgradeController.py:451 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:466 +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -331,16 +332,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:686 +#: ../DistUpgrade/DistUpgradeController.py:672 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:713 +#: ../DistUpgrade/DistUpgradeController.py:699 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:714 +#: ../DistUpgrade/DistUpgradeController.py:700 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -353,11 +354,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:734 +#: ../DistUpgrade/DistUpgradeController.py:720 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:735 +#: ../DistUpgrade/DistUpgradeController.py:721 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -366,34 +367,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:770 +#: ../DistUpgrade/DistUpgradeController.py:756 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "" "Upgrading the repository information resulted in a invalid file so a bug " "reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:778 +#: ../DistUpgrade/DistUpgradeController.py:764 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:779 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:805 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:822 +#: ../DistUpgrade/DistUpgradeController.py:808 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -406,23 +407,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:870 +#: ../DistUpgrade/DistUpgradeController.py:856 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:871 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#. print("on_button_install_clicked") -#: ../DistUpgrade/DistUpgradeController.py:880 -#: ../UpdateManager/UpdateManager.py:757 +#. print "on_button_install_clicked" +#: ../DistUpgrade/DistUpgradeController.py:866 +#: ../UpdateManager/UpdateManager.py:755 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:881 +#: ../DistUpgrade/DistUpgradeController.py:867 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -433,32 +434,32 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:910 -#: ../DistUpgrade/DistUpgradeController.py:1692 +#: ../DistUpgrade/DistUpgradeController.py:896 +#: ../DistUpgrade/DistUpgradeController.py:1677 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:942 +#: ../DistUpgrade/DistUpgradeController.py:928 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1008 +#: ../DistUpgrade/DistUpgradeController.py:994 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1009 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1015 -#: ../DistUpgrade/DistUpgradeController.py:1149 +#: ../DistUpgrade/DistUpgradeController.py:1001 +#: ../DistUpgrade/DistUpgradeController.py:1135 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1016 +#: ../DistUpgrade/DistUpgradeController.py:1002 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. All files downloaded so far have been kept." @@ -466,33 +467,33 @@ #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1100 -#: ../DistUpgrade/DistUpgradeController.py:1137 -#: ../DistUpgrade/DistUpgradeController.py:1242 +#: ../DistUpgrade/DistUpgradeController.py:1086 +#: ../DistUpgrade/DistUpgradeController.py:1123 +#: ../DistUpgrade/DistUpgradeController.py:1228 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1102 -#: ../DistUpgrade/DistUpgradeController.py:1139 -#: ../DistUpgrade/DistUpgradeController.py:1281 +#: ../DistUpgrade/DistUpgradeController.py:1088 +#: ../DistUpgrade/DistUpgradeController.py:1125 +#: ../DistUpgrade/DistUpgradeController.py:1267 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1103 -#: ../DistUpgrade/DistUpgradeController.py:1118 -#: ../DistUpgrade/DistUpgradeController.py:1140 +#: ../DistUpgrade/DistUpgradeController.py:1089 +#: ../DistUpgrade/DistUpgradeController.py:1104 +#: ../DistUpgrade/DistUpgradeController.py:1126 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1108 +#: ../DistUpgrade/DistUpgradeController.py:1094 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1113 +#: ../DistUpgrade/DistUpgradeController.py:1099 #, python-format msgid "" "\n" @@ -503,26 +504,26 @@ "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1150 +#: ../DistUpgrade/DistUpgradeController.py:1136 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1230 +#: ../DistUpgrade/DistUpgradeController.py:1216 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 #: ../DistUpgrade/DistUpgrade.ui.h:8 msgid "_Keep" msgstr "_Londa" -#: ../DistUpgrade/DistUpgradeController.py:1231 +#: ../DistUpgrade/DistUpgradeController.py:1217 msgid "_Remove" msgstr "_Susa" -#: ../DistUpgrade/DistUpgradeController.py:1243 +#: ../DistUpgrade/DistUpgradeController.py:1229 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -530,37 +531,37 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1319 +#: ../DistUpgrade/DistUpgradeController.py:1305 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1320 +#: ../DistUpgrade/DistUpgradeController.py:1306 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1588 -#: ../DistUpgrade/DistUpgradeController.py:1653 +#: ../DistUpgrade/DistUpgradeController.py:1573 +#: ../DistUpgrade/DistUpgradeController.py:1638 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1593 +#: ../DistUpgrade/DistUpgradeController.py:1578 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1594 +#: ../DistUpgrade/DistUpgradeController.py:1579 msgid "" "Preparing the system for the upgrade failed so a bug reporting process is " "being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1608 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1609 +#: ../DistUpgrade/DistUpgradeController.py:1594 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" @@ -568,79 +569,79 @@ "Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1637 +#: ../DistUpgrade/DistUpgradeController.py:1622 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1644 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1645 +#: ../DistUpgrade/DistUpgradeController.py:1630 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1673 +#: ../DistUpgrade/DistUpgradeController.py:1658 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1674 +#: ../DistUpgrade/DistUpgradeController.py:1659 msgid "After updating your package " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1698 -#: ../DistUpgrade/DistUpgradeController.py:1750 +#: ../DistUpgrade/DistUpgradeController.py:1683 +#: ../DistUpgrade/DistUpgradeController.py:1736 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1704 -#: ../DistUpgrade/DistUpgradeController.py:1754 +#: ../DistUpgrade/DistUpgradeController.py:1689 +#: ../DistUpgrade/DistUpgradeController.py:1740 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1709 -#: ../DistUpgrade/DistUpgradeController.py:1756 -#: ../DistUpgrade/DistUpgradeController.py:1763 -#: ../DistUpgrade/DistUpgradeController.py:1774 +#: ../DistUpgrade/DistUpgradeController.py:1694 +#: ../DistUpgrade/DistUpgradeController.py:1742 +#: ../DistUpgrade/DistUpgradeController.py:1749 +#: ../DistUpgrade/DistUpgradeController.py:1760 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1710 -#: ../DistUpgrade/DistUpgradeController.py:1757 -#: ../DistUpgrade/DistUpgradeController.py:1764 +#: ../DistUpgrade/DistUpgradeController.py:1695 +#: ../DistUpgrade/DistUpgradeController.py:1743 +#: ../DistUpgrade/DistUpgradeController.py:1750 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1717 +#: ../DistUpgrade/DistUpgradeController.py:1702 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1726 +#: ../DistUpgrade/DistUpgradeController.py:1711 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1775 +#: ../DistUpgrade/DistUpgradeController.py:1761 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:204 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:205 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:502 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:504 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited " "and you may encounter problems after the upgrade. For more information see " @@ -648,16 +649,16 @@ "continue with the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:526 -#: ../DistUpgrade/DistUpgradeQuirks.py:554 -#: ../DistUpgrade/DistUpgradeQuirks.py:581 +#: ../DistUpgrade/DistUpgradeQuirks.py:520 +#: ../DistUpgrade/DistUpgradeQuirks.py:548 +#: ../DistUpgrade/DistUpgradeQuirks.py:575 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:530 -#: ../DistUpgrade/DistUpgradeQuirks.py:558 +#: ../DistUpgrade/DistUpgradeQuirks.py:524 +#: ../DistUpgrade/DistUpgradeQuirks.py:552 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -666,7 +667,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:585 +#: ../DistUpgrade/DistUpgradeQuirks.py:579 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -675,11 +676,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:615 +#: ../DistUpgrade/DistUpgradeQuirks.py:609 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:610 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -687,11 +688,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:652 +#: ../DistUpgrade/DistUpgradeQuirks.py:646 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:653 +#: ../DistUpgrade/DistUpgradeQuirks.py:647 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -699,11 +700,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:673 +#: ../DistUpgrade/DistUpgradeQuirks.py:667 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:674 +#: ../DistUpgrade/DistUpgradeQuirks.py:668 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -713,71 +714,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:73 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:76 +#: ../DistUpgrade/DistUpgradeMain.py:74 msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:79 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:82 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:84 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" -#. print("mediaChange %s %s" % (medium, drive)) +#. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 #: ../DistUpgrade/DistUpgradeViewGtk3.py:117 -#: ../DistUpgrade/DistUpgradeViewKDE.py:195 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 #: ../DistUpgrade/DistUpgradeViewGtk3.py:138 -#: ../DistUpgrade/DistUpgradeViewKDE.py:209 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 #: ../DistUpgrade/DistUpgradeViewGtk3.py:149 -#: ../DistUpgrade/DistUpgradeViewKDE.py:222 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 -#: ../DistUpgrade/DistUpgradeViewGtk.py:296 +#: ../DistUpgrade/DistUpgradeViewGtk.py:295 #: ../DistUpgrade/DistUpgradeViewGtk3.py:152 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:309 -#: ../DistUpgrade/DistUpgradeViewKDE.py:223 -#: ../DistUpgrade/DistUpgradeViewKDE.py:371 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:307 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 #: ../DistUpgrade/DistUpgradeViewGtk3.py:155 -#: ../DistUpgrade/DistUpgradeViewKDE.py:225 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -787,27 +788,27 @@ #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 #: ../DistUpgrade/DistUpgradeViewGtk3.py:186 -#: ../DistUpgrade/DistUpgradeViewKDE.py:262 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 #: ../DistUpgrade/DistUpgradeViewGtk3.py:212 -#: ../DistUpgrade/DistUpgradeViewKDE.py:275 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 #: ../DistUpgrade/DistUpgradeViewGtk3.py:217 -#: ../DistUpgrade/DistUpgradeViewKDE.py:277 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 #: ../DistUpgrade/DistUpgradeViewGtk3.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:278 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -817,7 +818,7 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 #: ../DistUpgrade/DistUpgradeViewGtk3.py:235 -#: ../DistUpgrade/DistUpgradeViewKDE.py:299 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -826,26 +827,26 @@ #: ../DistUpgrade/DistUpgradeViewGtk.py:232 #: ../DistUpgrade/DistUpgradeViewGtk3.py:236 -#: ../DistUpgrade/DistUpgradeViewKDE.py:300 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:251 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:256 -#: ../DistUpgrade/DistUpgradeViewKDE.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:250 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:254 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:464 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:477 -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:475 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:476 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -853,147 +854,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:482 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:495 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:493 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:483 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:494 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:631 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:627 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:641 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:642 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:643 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:644 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:649 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:645 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:650 -#: ../DistUpgrade/DistUpgradeViewGtk3.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:646 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:196 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:157 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:335 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:338 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:554 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:568 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "&Esula" -#: ../DistUpgrade/DistUpgradeViewKDE.py:572 -#: ../DistUpgrade/DistUpgradeViewKDE.py:813 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "&Vala" -#: ../DistUpgrade/DistUpgradeViewKDE.py:618 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:621 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:701 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:751 -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:777 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:779 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:781 -#: ../DistUpgrade/DistUpgradeViewText.py:182 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:785 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 -#: ../DistUpgrade/DistUpgradeViewText.py:230 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:809 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14 -#: ../data/gtkbuilder/UpdateManager.ui.h:26 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:830 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -1001,32 +1002,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:834 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:61 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:63 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:66 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1042,7 +1043,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:82 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1056,14 +1057,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:100 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:151 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1071,34 +1072,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:155 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#. Declare these translatable strings from the .ui files here so that -#. xgettext picks them up. -#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:260 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:348 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1111,28 +1110,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:362 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:373 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1140,145 +1139,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:378 +#: ../DistUpgrade/DistUpgradeView.py:374 msgid "" "Installing the upgrade can take several hours. Once the download has " "finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:382 +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " "download has finished, the process cannot be canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:387 +#: ../DistUpgrade/DistUpgradeView.py:383 msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676 +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680 msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:406 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:407 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:72 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 #, python-format msgid "authenticate '%(file)s' against '%(signature)s' " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 #, python-format msgid "extracting '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:151 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:152 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:227 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:234 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:268 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:269 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:273 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 msgid "Authentication failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:274 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:253 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 msgid "" "Authenticating the upgrade failed. There may be a problem with the network " "or with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:300 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:306 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 msgid "Can not run the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:301 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:280 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:307 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:93 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1286,73 +1285,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:117 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:122 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:129 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 -#: ../DistUpgrade/DistUpgradeViewText.py:203 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:157 -#: ../DistUpgrade/DistUpgradeViewText.py:196 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:162 -#: ../DistUpgrade/DistUpgradeViewText.py:206 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:165 -#: ../DistUpgrade/DistUpgradeViewText.py:213 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:168 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:173 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:178 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:188 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:210 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:231 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1410,7 +1409,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:19 -msgid "Upgrading Ubuntu to version 12.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:20 @@ -1429,133 +1428,141 @@ msgid "Terminal" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:64 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:66 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:114 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:115 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:125 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:114 +#: ../UpdateManager/DistUpgradeFetcher.py:119 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:126 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:115 +#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:68 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:91 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:62 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:85 +#: ../UpdateManager/UpdateManager.py:1257 msgid "Upgrade" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:95 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:89 #: ../data/gtkbuilder/UpdateManager.ui.h:20 #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Release Notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:134 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:128 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 msgid "Downloading additional package files..." msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:148 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:141 #, python-format msgid "File %s of %s at %sB/s" msgstr "" -#: ../UpdateManager/DistUpgradeFetcherKDE.py:150 +#: ../UpdateManager/DistUpgradeFetcherKDE.py:143 #, python-format msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:75 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:78 +#: ../UpdateManager/ChangelogViewer.py:76 msgid "Copy Link to Clipboard" msgstr "" -#: ../UpdateManager/GtkProgress.py:162 +#: ../UpdateManager/GtkProgress.py:159 #, python-format msgid "Downloading file %(current)li of %(total)li with %(speed)s/s" msgstr "" -#: ../UpdateManager/GtkProgress.py:167 +#: ../UpdateManager/GtkProgress.py:164 #, python-format msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100 +#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:107 +#: ../UpdateManager/UpdateManager.py:106 msgid "" "You will not get any further security fixes or critical updates. Please " "upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:115 +#: ../UpdateManager/UpdateManager.py:114 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:233 -#: ../UpdateManagerText/UpdateManagerText.py:35 +#: ../UpdateManager/UpdateManager.py:231 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManager/UpdateManager.py:235 +#: ../UpdateManager/UpdateManager.py:233 msgid "Name" msgstr "" #. upload_archive = version_match.group(2).strip() -#: ../UpdateManager/UpdateManager.py:395 +#: ../UpdateManager/UpdateManager.py:393 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:453 +#: ../UpdateManager/UpdateManager.py:450 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:458 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:507 +#: ../UpdateManager/UpdateManager.py:502 msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:513 +#: ../UpdateManager/UpdateManager.py:508 msgid "Select _All" msgstr "" +#: ../UpdateManager/UpdateManager.py:568 +#, python-format +msgid "%(count)s update has been selected." +msgid_plural "%(count)s updates have been selected." +msgstr[0] "" +msgstr[1] "" + #: ../UpdateManager/UpdateManager.py:572 #, python-format msgid "%s will be downloaded." msgstr "" #: ../UpdateManager/UpdateManager.py:584 -msgid "The update has already been downloaded." -msgid_plural "The updates have already been downloaded." +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" @@ -1563,31 +1570,38 @@ msgid "There are no updates to install." msgstr "" -#: ../UpdateManager/UpdateManager.py:598 +#. TRANSLATORS: this allows to switch the order of the count of +#. updates and the download size string (if needed) +#: ../UpdateManager/UpdateManager.py:595 +#, python-format +msgid "%(count_str)s %(download_str)s" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:602 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:624 +#: ../UpdateManager/UpdateManager.py:628 msgid "" "It is unknown when the package information was updated last. Please click " "the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:630 +#: ../UpdateManager/UpdateManager.py:634 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:635 +#: ../UpdateManager/UpdateManager.py:639 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:639 +#: ../UpdateManager/UpdateManager.py:643 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1596,34 +1610,42 @@ msgstr[1] "" #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago -#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646 -#: ../UpdateManager/UpdateManager.py:648 +#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:652 #, python-format msgid "The package information was last updated about %s minutes ago." msgstr "" -#: ../UpdateManager/UpdateManager.py:650 +#: ../UpdateManager/UpdateManager.py:654 msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:689 +#: ../UpdateManager/UpdateManager.py:674 +#: ../data/gtkbuilder/UpdateManager.ui.h:2 +msgid "" +"Software updates correct errors, eliminate security vulnerabilities and " +"provide new features." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:693 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:697 -#, python-format -msgid "" -"Updated software has been issued since %s was released. Do you want to " -"install it now?" +#: ../UpdateManager/UpdateManager.py:701 +msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:700 +#: ../UpdateManager/UpdateManager.py:702 msgid "" -"Updated software is available for this computer. Do you want to install it " -"now?" +"These software updates have been issued since this version of Ubuntu was " +"released." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:705 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:758 +#: ../UpdateManager/UpdateManager.py:756 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1631,29 +1653,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:783 +#: ../UpdateManager/UpdateManager.py:781 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:845 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:862 +#: ../UpdateManager/UpdateManager.py:863 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:879 +#: ../UpdateManager/UpdateManager.py:880 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1002 +#: ../UpdateManager/UpdateManager.py:1008 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:1009 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1662,7 +1684,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1032 +#: ../UpdateManager/UpdateManager.py:1038 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1670,58 +1692,68 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1056 +#: ../UpdateManager/UpdateManager.py:1063 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1063 +#: ../UpdateManager/UpdateManager.py:1070 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1072 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1076 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112 +#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113 +#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126 +#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1114 +#: ../UpdateManager/UpdateManager.py:1120 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1153 +#: ../UpdateManager/UpdateManager.py:1159 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1154 +#: ../UpdateManager/UpdateManager.py:1160 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" +#: ../UpdateManager/UpdateManager.py:1222 +#: ../UpdateManager/UpdateManager.py:1255 +msgid "New hardware support is available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:1256 +#: ../UpdateManagerText/UpdateManagerText.py:31 +msgid "Cancel" +msgstr "Esula" + #: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" @@ -1731,22 +1763,18 @@ msgstr "" #: ../UpdateManagerText/UpdateManagerText.py:34 -msgid "Cancel" -msgstr "Esula" - -#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Changelog" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:40 +#: ../UpdateManagerText/UpdateManagerText.py:37 msgid "Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:53 +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:56 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1760,26 +1788,26 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:125 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" -#: ../UpdateManager/Core/MyCache.py:147 +#: ../UpdateManager/Core/MyCache.py:138 #, python-format msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:325 +#: ../UpdateManager/Core/MyCache.py:316 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359 +#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:338 +#: ../UpdateManager/Core/MyCache.py:329 #, python-format msgid "" "Changes for the versions:\n" @@ -1788,7 +1816,7 @@ "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:348 +#: ../UpdateManager/Core/MyCache.py:339 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1797,7 +1825,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:353 +#: ../UpdateManager/Core/MyCache.py:344 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1806,47 +1834,41 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:51 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:63 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:72 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:1 -msgid "Starting Software Updater" -msgstr "" - -#: ../data/gtkbuilder/UpdateManager.ui.h:2 -msgid "" -"Software updates correct errors, eliminate security vulnerabilities and " -"provide new features." +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:3 @@ -1907,54 +1929,57 @@ #: ../data/gtkbuilder/UpdateManager.ui.h:23 #: ../data/update-manager.desktop.in.h:1 -msgid "Software Updater" +msgid "Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:24 -msgid "Starting Software Updater" +msgid "Starting Update Manager" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:25 msgid "U_pgrade" msgstr "" -#: ../data/gtkbuilder/UpdateManager.ui.h:27 -msgid "updates" +#: ../data/gtkbuilder/UpdateManager.ui.h:26 +msgid "I_nstall" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:28 -msgid "Changes" +msgid "updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:29 -msgid "Description" +msgid "" +"You are connected via roaming and may be charged for the data consumed by " +"this update." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:30 -msgid "Details of updates" +msgid "You are connected via a wireless modem." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:31 -msgid "" -"You are connected via roaming and may be charged for the data consumed by " -"this update." +msgid "It’s safer to connect the computer to AC power before updating." msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:32 -msgid "" -"You may want to wait until you’re not using a mobile broadband connection." +msgid "_Install Updates" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:33 -msgid "It’s safer to connect the computer to AC power before updating." +msgid "Changes" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:34 -msgid "_Settings..." +msgid "Description" msgstr "" #: ../data/gtkbuilder/UpdateManager.ui.h:35 -msgid "_Install Now" +msgid "Description of update" +msgstr "" + +#: ../data/gtkbuilder/UpdateManager.ui.h:36 +msgid "_Settings..." msgstr "" #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 @@ -1979,7 +2004,7 @@ #: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" -"You can upgrade at a later time by opening Software Updater and click on " +"You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" @@ -1991,216 +2016,282 @@ msgid "Show and install available updates" msgstr "" -#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51 +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 msgid "Show version and exit" msgstr "" -#: ../update-manager:69 +#: ../update-manager:64 msgid "Directory that contains the data files" msgstr "" -#: ../update-manager:72 +#: ../update-manager:67 msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186 +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../update-manager:79 +#: ../update-manager:74 msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../update-manager:86 +#: ../update-manager:81 msgid "Do not focus on map when starting" msgstr "" -#: ../update-manager:89 +#: ../update-manager:84 msgid "Try to run a dist-upgrade" msgstr "" -#: ../update-manager:92 +#: ../update-manager:87 msgid "Do not check for updates when starting" msgstr "" -#: ../update-manager:96 ../do-release-upgrade:70 +#: ../update-manager:91 ../do-release-upgrade:65 msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../update-manager:116 +#: ../update-manager:111 msgid "Running partial upgrade" msgstr "" -#: ../update-manager-text:59 +#: ../update-manager-text:54 msgid "Show description of the package instead of the changelog" msgstr "" -#: ../do-release-upgrade:58 ../check-new-release-gtk:190 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" "Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../do-release-upgrade:62 +#: ../do-release-upgrade:57 msgid "" "Run in a special upgrade mode.\n" "Currently 'desktop' for regular upgrades of a desktop system and 'server' " "for server systems are supported." msgstr "" -#: ../do-release-upgrade:68 +#: ../do-release-upgrade:63 msgid "Run the specified frontend" msgstr "" -#: ../do-release-upgrade:73 +#: ../do-release-upgrade:68 msgid "" "Check only if a new distribution release is available and report the result " "via the exit code" msgstr "" -#: ../do-release-upgrade:87 +#: ../do-release-upgrade:82 msgid "Checking for a new Ubuntu release" msgstr "" -#: ../do-release-upgrade:101 +#: ../do-release-upgrade:96 msgid "" "For upgrade information, please visit:\n" "%(url)s\n" msgstr "" -#: ../do-release-upgrade:107 +#: ../do-release-upgrade:102 msgid "No new release found" msgstr "" -#: ../do-release-upgrade:119 +#: ../do-release-upgrade:114 #, c-format msgid "New release '%s' available." msgstr "" -#: ../do-release-upgrade:120 +#: ../do-release-upgrade:115 msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../check-new-release-gtk:101 +#: ../check-new-release-gtk:90 msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../check-new-release-gtk:143 +#: ../check-new-release-gtk:132 #, c-format msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../check-new-release-gtk:196 +#: ../check-new-release-gtk:192 msgid "Add debug output" msgstr "" -#: ../ubuntu-support-status:91 +#: ../ubuntu-support-status:81 msgid "Show unsupported packages on this machine" msgstr "" -#: ../ubuntu-support-status:94 +#: ../ubuntu-support-status:84 msgid "Show supported packages on this machine" msgstr "" -#: ../ubuntu-support-status:97 +#: ../ubuntu-support-status:87 msgid "Show all packages with their status" msgstr "" -#: ../ubuntu-support-status:100 +#: ../ubuntu-support-status:90 msgid "Show all packages in a list" msgstr "" -#: ../ubuntu-support-status:142 +#: ../ubuntu-support-status:132 #, c-format msgid "Support status summary of '%s':" msgstr "" -#: ../ubuntu-support-status:145 +#: ../ubuntu-support-status:135 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../ubuntu-support-status:151 +#: ../ubuntu-support-status:141 msgid "" "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " "downloaded" msgstr "" -#: ../ubuntu-support-status:154 +#: ../ubuntu-support-status:144 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../ubuntu-support-status:162 +#: ../ubuntu-support-status:157 msgid "" "Run with --show-unsupported, --show-supported or --show-all to see more " "details" msgstr "" -#: ../ubuntu-support-status:166 +#: ../ubuntu-support-status:161 msgid "No longer downloadable:" msgstr "" -#: ../ubuntu-support-status:169 +#: ../ubuntu-support-status:164 msgid "Unsupported: " msgstr "" -#: ../ubuntu-support-status:174 +#: ../ubuntu-support-status:169 #, c-format msgid "Supported until %s:" msgstr "" -#: ../ubuntu-support-status:183 +#: ../ubuntu-support-status:178 msgid "Unsupported" msgstr "" -#. Why do we use %s here instead of $strings or {} format placeholders? -#. It's because we don't want to break existing translations. -#: ../janitor/plugincore/exceptions.py:42 +#: ../hwe-support-status:182 +msgid "" +"You are not running a system with a Hardware Enablement Stack. Your system " +"is supported until %(month)s %(year)s." +msgstr "" + +#: ../hwe-support-status:189 +msgid "Check HWE support status" +msgstr "" + +#: ../Janitor/computerjanitor/exc.py:30 #, python-format msgid "Unimplemented method: %s" msgstr "" -#: ../janitor/plugincore/core/file_cruft.py:41 +#: ../Janitor/computerjanitor/file_cruft.py:46 msgid "A file on disk" msgstr "" -#: ../janitor/plugincore/core/missing_package_cruft.py:39 +#: ../Janitor/computerjanitor/package_cruft.py:45 +msgid ".deb package" +msgstr "" + +#: ../Janitor/computerjanitor/missing_package_cruft.py:33 msgid "Install missing package." msgstr "" -#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292. -#: ../janitor/plugincore/core/missing_package_cruft.py:49 +#: ../Janitor/computerjanitor/missing_package_cruft.py:42 #, python-format msgid "Package %s should be installed." msgstr "" -#: ../janitor/plugincore/core/package_cruft.py:49 -msgid ".deb package" +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:36 +#, python-format +msgid "%i obsolete entries in the status file" msgstr "" -#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46 -#, python-format -msgid "%s needs to be marked as manually installed." +#: ../Janitor/plugins/dpkg_status_plugin.py:39 +msgid "Obsolete entries in dpkg status" msgstr "" -#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49 +#. pragma: no cover +#: ../Janitor/plugins/dpkg_status_plugin.py:42 +msgid "Obsolete dpkg status entries" +msgstr "" + +#: ../Janitor/plugins/kdelibs4to5_plugin.py:39 msgid "" "When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be " "installed. See bugs.launchpad.net, bug #279621 for details." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44 +#: ../Janitor/plugins/langpack_manual_plugin.py:34 #, python-format -msgid "%i obsolete entries in the status file" +msgid "%s needs to be marked as manually installed." msgstr "" -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47 -msgid "Obsolete entries in dpkg status" +#: ../Janitor/plugins/remove_lilo_plugin.py:28 +msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" msgstr "" -#. pragma: no cover -#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50 -msgid "Obsolete dpkg status entries" +#: ../HweSupportStatus/consts.py:20 +#, python-format +msgid "" +"\n" +"There is a graphics stack installed on this system. An upgrade to a \n" +"supported (or longer supported) configuration will become available\n" +"on %(date)s and can be invoked by running 'update-manager' in the\n" +"Dash.\n" +" " msgstr "" -#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42 -msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)" +#: ../HweSupportStatus/consts.py:28 +#, python-format +msgid "" +"\n" +"To upgrade to a supported (or longer supported) configuration:\n" +"\n" +"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n" +"sudo do-release-upgrade %s\n" +"\n" +"OR\n" +"\n" +"* Install a newer HWE version by running:\n" +"sudo apt-get install %s\n" +"\n" +"and reboot your system." +msgstr "" + +#: ../HweSupportStatus/consts.py:41 +#, python-format +msgid "" +"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s." +msgstr "" + +#: ../HweSupportStatus/consts.py:47 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is going out of support\n" +"on %s. After this date security updates for critical parts (kernel\n" +"and graphics stack) of your system will no longer be available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" +msgstr "" + +#: ../HweSupportStatus/consts.py:56 +#, python-format +msgid "" +"\n" +"Your current Hardware Enablement Stack (HWE) is no longer supported\n" +"since %s. Security updates for critical parts (kernel\n" +"and graphics stack) of your system are no longer available.\n" +"\n" +"For more information, please see:\n" +"http://wiki.ubuntu.com/1204_HWE_EOL\n" msgstr "" diff -Nru update-manager-17.10.11/pre-build.sh update-manager-0.156.14.15/pre-build.sh --- update-manager-17.10.11/pre-build.sh 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/pre-build.sh 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,46 @@ +#!/bin/sh + +set -e + +# update demotions +#(cd utils && ./demotions.py oneiric precise > demoted.cfg) +# when this gets enabled, make sure to add symlink in DistUpgrade +(cd utils && ./demotions.py lucid precise > demoted.cfg.lucid) + +# update base-installer +(cd utils && ./update-base-installer.sh) + +# update apt_btrfs_snapshot.py copy, this nees a installed +# apt-btrfs-snapshot on the build machine +if [ ! -e /usr/share/pyshared/apt_btrfs_snapshot.py ]; then + echo "please sudo apt-get install apt-btrfs-snapshot" + exit 1 +fi +cp /usr/share/pyshared/apt_btrfs_snapshot.py DistUpgrade + +# (auto) generate the required html +if [ ! -x /usr/bin/parsewiki ]; then + echo "please sudo apt-get install parsewiki" + exit 1 +fi +(cd DistUpgrade; + parsewiki DevelReleaseAnnouncement > DevelReleaseAnnouncement.html; + parsewiki ReleaseAnnouncement > ReleaseAnnouncement.html; + parsewiki EOLReleaseAnnouncement > EOLReleaseAnnouncement.html; +) + +# cleanup +rm -rf utils/apt/lists utils/apt/*.bin +(cd utils && ./update_mirrors.py ../DistUpgrade/mirrors.cfg) + +# run the test-suit +#echo "Running integrated tests" +#(cd tests && make) + +# test leftovers +rm -f ./tests/data-sources-list-test/apt.log + +# update version +DEBVER=$(LC_ALL=C dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p' | sed s/.*://) +echo "VERSION='$DEBVER'" > DistUpgrade/DistUpgradeVersion.py + diff -Nru update-manager-17.10.11/README update-manager-0.156.14.15/README --- update-manager-17.10.11/README 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/README 2017-12-23 05:00:38.000000000 +0000 @@ -1,5 +1,5 @@ -Software Updater for apt ------------------------- +Update Manager for apt +---------------------- This is an application which lets you manage available updates for your computer via apt and python-apt. @@ -15,4 +15,4 @@ If the release upgrade is running in text mode and gnu screen is available it will automatically use gnu screen. This means that if e.g. the network connection is dropping just running the upgrader -again will just reconnect to the running upgrade. +again will just reconnect to the running upgrade. \ No newline at end of file diff -Nru update-manager-17.10.11/README.dist-upgrade update-manager-0.156.14.15/README.dist-upgrade --- update-manager-17.10.11/README.dist-upgrade 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/README.dist-upgrade 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,34 @@ +Distribution Upgrade tools for Ubuntu +------------------------------------- + +This tool implements the spec at: +https://wiki.ubuntu.com/AutomaticUpgrade + +Broadly speaking a upgrade from one version to the next consists +of three things: + +1) The user must be informed about the new available distro + (possibly release notes as well) and run the upgrade tool +2) The upgrade tool must be able to download updated information + how to perform the upgrade (e.g. additional steps like upgrading + certain libs first) +3) The upgrade tools runs and installs/remove packages and does + some additional steps like post-release cleanup + + +The steps in additon to upgrading the installed packages fall into this +categories: +* switch to new sources.list entries +* adding the default user to new groups (warty, scanner group) +* remove packages/install others (breezy, R:mozilla-firefox, RI:firefox, + install ubuntu-desktop package again, R:portmap, I:language-package*) +* check conffile settings (breezy: /etc/X11/xorg.conf; warty: /etc/modules) +* check if {ubuntu,kubuntu,edubuntu}-desktop is installed +* ask/change mirrors (breezy) +* breezy: install new version of libgtk2.0-0 from hoary-updates, then + restart synaptic +* reboot + + +The tool need a backported "python-vte" and "python-apt" to work on +breezy. \ No newline at end of file diff -Nru update-manager-17.10.11/setup.cfg update-manager-0.156.14.15/setup.cfg --- update-manager-17.10.11/setup.cfg 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/setup.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -8,9 +8,3 @@ [sdist] formats = bztar - -[nosetests] -match=^test - -[install] -skip-build=0 diff -Nru update-manager-17.10.11/setup.py update-manager-0.156.14.15/setup.py --- update-manager-17.10.11/setup.py 2017-08-07 21:17:22.000000000 +0000 +++ update-manager-0.156.14.15/setup.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,68 +1,82 @@ -#!/usr/bin/env python3 -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- +#!/usr/bin/env python -import os +from distutils.core import setup, Extension import glob - -from distutils.core import setup -from subprocess import check_output +import os from DistUtilsExtra.command import ( - build_extra, build_i18n, build_help) + build_extra, build_i18n, build_help, build_icons) disabled = [] - def plugins(): - return [] - return [os.path.join('janitor/plugincore/plugins', name) - for name in os.listdir('janitor/plugincore/plugins') + return [os.path.join('Janitor/plugins', name) + for name in os.listdir('Janitor/plugins') if name.endswith('_plugin.py') and name not in disabled] - -for line in check_output('dpkg-parsechangelog --format rfc822'.split(), - universal_newlines=True).splitlines(): - header, colon, value = line.lower().partition(':') - if header == 'version': - version = value.strip() - break -else: - raise RuntimeError('No version found in debian/changelog') - - -class CustomBuild(build_extra.build_extra): - def run(self): - with open("UpdateManager/UpdateManagerVersion.py", "w") as f: - f.write("VERSION = '%s'\n" % version) - build_extra.build_extra.run(self) - +def profiles(): + profiles = [] + # FIXME: ship with a small collection of profiles for now + #for d in os.listdir("AutoUpgradeTester/profile/"): + for d in ["server", "ubuntu", "kubuntu", "main-all", + "lts-server", "lts-ubuntu", "lts-kubuntu"]: + base="AutoUpgradeTester/profile/" + cfgs = [f for f in glob.glob("%s/%s/*" % (base,d)) if os.path.isfile(f)] + profiles.append(("share/auto-upgrade-tester/profiles/"+d,cfgs)) + return profiles setup(name='update-manager', - version=version, - packages=['UpdateManager', + version='0.56', + ext_modules=[Extension('UpdateManager.fdsend', + ['UpdateManager/fdsend/fdsend.c'])], + packages=[ + 'UpdateManager', 'UpdateManager.backend', 'UpdateManager.Core', 'UpdateManagerText', + 'DistUpgrade', + 'computerjanitor', + 'AutoUpgradeTester', 'HweSupportStatus', - 'janitor', - 'janitor.plugincore', ], - scripts=['update-manager', - 'ubuntu-support-status', - 'update-manager-text', - 'hwe-support-status' + package_dir={ + '': '.', + 'computerjanitor': 'Janitor/computerjanitor', + }, + scripts=[ + 'update-manager', + 'ubuntu-support-status', + 'update-manager-text', + "do-release-upgrade", + "kubuntu-devel-release-upgrade", + "check-new-release-gtk", + "AutoUpgradeTester/auto-upgrade-tester", + "hwe-support-status", ], - data_files=[('share/update-manager/gtkbuilder', - glob.glob("data/gtkbuilder/*.ui") - ), + data_files=[ + ('share/update-manager/gtkbuilder', + glob.glob("data/gtkbuilder/*.ui")+ + glob.glob("DistUpgrade/*.ui") + ), + ('share/update-manager/', + glob.glob("DistUpgrade/*.cfg")+ + glob.glob("UpdateManager/*.ui") + ), ('share/man/man8', glob.glob('data/*.8') - ), + ), ('share/GConf/gsettings/', ['data/update-manager.convert']), - ], - cmdclass={"build": CustomBuild, - "build_i18n": build_i18n.build_i18n, - "build_help": build_help.build_help} + ('../etc/update-manager/', + ['data/release-upgrades', 'data/meta-release']), + ('share/computerjanitor/plugins', + plugins()), + ('share/auto-upgrade-tester/post_upgrade_tests', + glob.glob("AutoUpgradeTester/post_upgrade_tests/*")), + ]+profiles(), + cmdclass = { "build" : build_extra.build_extra, + "build_i18n" : build_i18n.build_i18n, + "build_help" : build_help.build_help, + "build_icons" : build_icons.build_icons } ) diff -Nru update-manager-17.10.11/tests/aptroot-cache-test/etc/apt/sources.list update-manager-0.156.14.15/tests/aptroot-cache-test/etc/apt/sources.list --- update-manager-17.10.11/tests/aptroot-cache-test/etc/apt/sources.list 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-cache-test/etc/apt/sources.list 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -deb http://archive.ubuntu.com/ubuntu lucid main - Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/tests/aptroot-cache-test/etc/apt/trusted.gpg and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/tests/aptroot-cache-test/etc/apt/trusted.gpg differ Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/tests/aptroot-cache-test/var/cache/apt/pkgcache.bin and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/tests/aptroot-cache-test/var/cache/apt/pkgcache.bin differ Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/tests/aptroot-cache-test/var/cache/apt/srcpkgcache.bin and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/tests/aptroot-cache-test/var/cache/apt/srcpkgcache.bin differ diff -Nru update-manager-17.10.11/tests/aptroot-cache-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_main_binary-amd64_Packages update-manager-0.156.14.15/tests/aptroot-cache-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_main_binary-amd64_Packages --- update-manager-17.10.11/tests/aptroot-cache-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_main_binary-amd64_Packages 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-cache-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_main_binary-amd64_Packages 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -Package: package-two -Priority: optional -Section: misc -Installed-Size: 1024 -Maintainer: Ubuntu Developers -Architecture: all -Version: 0.2 -Conflicts: package-one -Replaces: package-one -Filename: pool/main/p/package-two/package-two_0.2_all.deb -Description: an example package, now superseding package-one - -Package: package-four -Priority: optional -Section: misc -Installed-Size: 1024 -Maintainer: Ubuntu Developers -Architecture: all -Version: 0.2 -Conflicts: package-three -Filename: pool/main/p/package-four/package-four_0.2_all.deb -Description: an example package, now superseding package-three but not enough - diff -Nru update-manager-17.10.11/tests/aptroot-cache-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release update-manager-0.156.14.15/tests/aptroot-cache-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release --- update-manager-17.10.11/tests/aptroot-cache-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-cache-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release 1970-01-01 00:00:00.000000000 +0000 @@ -1,564 +0,0 @@ -Origin: Ubuntu -Label: Ubuntu -Suite: lucid -Version: 10.04 -Codename: lucid -Date: Thu, 29 Apr 2010 17:24:55 UTC -Architectures: amd64 armel i386 ia64 powerpc sparc -Components: main restricted universe multiverse -Description: Ubuntu Lucid 10.04 -MD5Sum: - 337c25a09805813b85fd45f38934de85 8595099 main/binary-amd64/Packages - cab26f8b56e0dc62da3bd4276242bb98 95 main/binary-amd64/Release - 9cf597f8375941099e5cbe5cb62eb46c 1779333 main/binary-amd64/Packages.gz - f9f2c23454c2e8d6b87cc65fc475900f 1383205 main/binary-amd64/Packages.bz2 - 09580d75756d0f4cd0343f53691c3a4b 1745634 main/binary-armel/Packages.gz - 0f3bb1f3481bbe12becbcb62876f4d06 95 main/binary-armel/Release - 56211cfabf8b74c999889e0d8c4b5cb4 1364526 main/binary-armel/Packages.bz2 - 2262cb384a0410cb32fa089ab85c1861 8473939 main/binary-armel/Packages - 02ee6eaffeb82c5a0051d495243c0165 94 main/binary-i386/Release - fbfcc35c9e642741a40a63a8cb0d5b39 1386205 main/binary-i386/Packages.bz2 - 502b8fbc56a4bcdd272e11d727e2de0b 1781497 main/binary-i386/Packages.gz - ecb6df4bd14586805082f2aa058307f8 8598110 main/binary-i386/Packages - 00a198754dfa49cf90bee9533b1cb3c9 1749837 main/binary-ia64/Packages.gz - debc1f8d004805ca20a9e0c0cb7e53f4 94 main/binary-ia64/Release - b0ff38246c5ee190d6e92a0618467695 8376166 main/binary-ia64/Packages - 2ca54f3877e5863651c58cd8465119a2 1367515 main/binary-ia64/Packages.bz2 - 34aede40849ea57b327c2486d2c604bf 8452314 main/binary-powerpc/Packages - 9745d87928ef9bb7ba56b5a0cd72b508 1763576 main/binary-powerpc/Packages.gz - 76753ca0dafa51daf2af2311887e4cf6 1376781 main/binary-powerpc/Packages.bz2 - fa9ebe24d4041f3d0482a84bc4a77daa 97 main/binary-powerpc/Release - 8945d7fb7db49e988aadf9ec07afee20 95 main/binary-sparc/Release - 0870b5da7fc4473f0ab009b946b2b23e 8403646 main/binary-sparc/Packages - a29f3f6b2a7b3c6db5c8759715b9d22f 1751944 main/binary-sparc/Packages.gz - 84f6441e0c5b84f31a2518e7edff0584 1369305 main/binary-sparc/Packages.bz2 - 512891c937587bb661cbd1b2c28127b1 52614 main/debian-installer/binary-amd64/Packages.gz - e3d4e27e3e9dd92e3cd67932f7a02f95 194115 main/debian-installer/binary-amd64/Packages - b0d4d9417d54a61753c9ab72b9c4a426 41737 main/debian-installer/binary-amd64/Packages.bz2 - e381d0db9e08775e40c5e53c5a0c1bb6 48196 main/debian-installer/binary-armel/Packages.bz2 - 920b2c4e97595fe2e5322ee84623a520 240037 main/debian-installer/binary-armel/Packages - 6824f830e30eac71b098ad2f987849eb 61654 main/debian-installer/binary-armel/Packages.gz - 4b783ed689041e93ce244976fc8bf104 45218 main/debian-installer/binary-i386/Packages.bz2 - 0c109aedf9e30668918c04891ade055b 218503 main/debian-installer/binary-i386/Packages - b428375f81f26fabcd60909ebc8ded6a 57235 main/debian-installer/binary-i386/Packages.gz - fabcbe9f726b90890909f02d4770d93b 187978 main/debian-installer/binary-ia64/Packages - e180f619659319ef54443880dfca9a8d 40723 main/debian-installer/binary-ia64/Packages.bz2 - f77338adedabfa027e6fafee0a1f22c4 51277 main/debian-installer/binary-ia64/Packages.gz - 6956168dbe8aecb361ac8fb2c3523333 57286 main/debian-installer/binary-powerpc/Packages.gz - 69fb2151b4ef63421dc434f25a9d82d8 217930 main/debian-installer/binary-powerpc/Packages - 19629074b8fed56f077a64e583ff4357 45144 main/debian-installer/binary-powerpc/Packages.bz2 - 61e472da5f878fa1aa2bfec7e40c52e6 187015 main/debian-installer/binary-sparc/Packages - 639835fb68050e9d17fd633d7e122ae2 51128 main/debian-installer/binary-sparc/Packages.gz - a2a3b00bc22d6b16347bee3b27c6d350 40671 main/debian-installer/binary-sparc/Packages.bz2 - 3111853af865b457b47cc0d4866b4907 658637 main/source/Sources.bz2 - 0ac7ebf71aaa9cc50104689189546e14 96 main/source/Release - 258a409d99f5c2001ab3976e8172efab 3245836 main/source/Sources - 6cd4edf935e55c59d1528f7c2389083a 833999 main/source/Sources.gz - fe9ce1ec5e6f46e8552d1b22b7678b1f 101 multiverse/binary-amd64/Release - b95a2dbb67c58328150461c5233927be 175917 multiverse/binary-amd64/Packages.bz2 - 8e550e7fce8fd780b5b2728f0b2b35e4 227377 multiverse/binary-amd64/Packages.gz - dc30e52e09fee6aec7ddd0f6a2c30f98 835855 multiverse/binary-amd64/Packages - e574e8b9b78a7064fbc451235e79e052 207550 multiverse/binary-armel/Packages.gz - b531c1ee652cdf66f9af846e8ba1e271 101 multiverse/binary-armel/Release - 5ea29c69cbd7e6a5ab7dd35ecf305031 753469 multiverse/binary-armel/Packages - 77c3148ae352ac14c388af94c82c71c9 159689 multiverse/binary-armel/Packages.bz2 - 7a1bb639c034b4d2db39a1795cfba84c 851731 multiverse/binary-i386/Packages - 52682ca95aa197a2402c3e3c00098210 232339 multiverse/binary-i386/Packages.gz - dd95741316cdfa7cd4f5c66d6635d621 179690 multiverse/binary-i386/Packages.bz2 - 7d71f89143cdceb5a51b2cb7bbe94067 100 multiverse/binary-i386/Release - 0b1026b97ba81845e4848a9034fd0b18 207960 multiverse/binary-ia64/Packages.gz - f30e9a2f48494f92475ad13ea866ae12 100 multiverse/binary-ia64/Release - d7035ec9075e53ded70494f76b75a782 159999 multiverse/binary-ia64/Packages.bz2 - 169b24bce02afc4be82ab11df2d1d5d9 748797 multiverse/binary-ia64/Packages - 5f781b642b28d798cdb9aa37ff63840d 212591 multiverse/binary-powerpc/Packages.gz - dbb7a4112d6a1a78208926da5fd1b1ea 103 multiverse/binary-powerpc/Release - 7e645fa0e439526e1bb697490c2d0385 770869 multiverse/binary-powerpc/Packages - 242c17c74ecbe8ea7c8b5b8ab4212ec1 163220 multiverse/binary-powerpc/Packages.bz2 - 9b4e85b0281d1678f2b7a101913ef5f3 743247 multiverse/binary-sparc/Packages - 5d97ce26cb71152fc164ff2ecbe26764 206433 multiverse/binary-sparc/Packages.gz - 50605cf89a99830ba3954051d8b999d3 101 multiverse/binary-sparc/Release - 453a96aa6e35699e51daced713c1064d 158888 multiverse/binary-sparc/Packages.bz2 - d41d8cd98f00b204e9800998ecf8427e 0 multiverse/debian-installer/binary-amd64/Packages - 4a4dd3598707603b3f76a2378a4504aa 20 multiverse/debian-installer/binary-amd64/Packages.gz - 4059d198768f9f8dc9372dc1c54bc3c3 14 multiverse/debian-installer/binary-amd64/Packages.bz2 - 4059d198768f9f8dc9372dc1c54bc3c3 14 multiverse/debian-installer/binary-armel/Packages.bz2 - d41d8cd98f00b204e9800998ecf8427e 0 multiverse/debian-installer/binary-armel/Packages - 4a4dd3598707603b3f76a2378a4504aa 20 multiverse/debian-installer/binary-armel/Packages.gz - 4a4dd3598707603b3f76a2378a4504aa 20 multiverse/debian-installer/binary-i386/Packages.gz - 4059d198768f9f8dc9372dc1c54bc3c3 14 multiverse/debian-installer/binary-i386/Packages.bz2 - d41d8cd98f00b204e9800998ecf8427e 0 multiverse/debian-installer/binary-i386/Packages - d41d8cd98f00b204e9800998ecf8427e 0 multiverse/debian-installer/binary-ia64/Packages - 4a4dd3598707603b3f76a2378a4504aa 20 multiverse/debian-installer/binary-ia64/Packages.gz - 4059d198768f9f8dc9372dc1c54bc3c3 14 multiverse/debian-installer/binary-ia64/Packages.bz2 - 4059d198768f9f8dc9372dc1c54bc3c3 14 multiverse/debian-installer/binary-powerpc/Packages.bz2 - d41d8cd98f00b204e9800998ecf8427e 0 multiverse/debian-installer/binary-powerpc/Packages - 4a4dd3598707603b3f76a2378a4504aa 20 multiverse/debian-installer/binary-powerpc/Packages.gz - 4059d198768f9f8dc9372dc1c54bc3c3 14 multiverse/debian-installer/binary-sparc/Packages.bz2 - 4a4dd3598707603b3f76a2378a4504aa 20 multiverse/debian-installer/binary-sparc/Packages.gz - d41d8cd98f00b204e9800998ecf8427e 0 multiverse/debian-installer/binary-sparc/Packages - 959a79dfcd36a637e33a4c4a4272ddc2 118837 multiverse/source/Sources.bz2 - c4f25c5713edb0775f5ee874de7ecf8b 504210 multiverse/source/Sources - 7e7a923c60e6990894afafdf5f56c441 145577 multiverse/source/Sources.gz - de076a69842b27e8305a41cc2a1b5494 102 multiverse/source/Release - 2a58b5f9f401ce3b497ff037f03c57a9 6149 restricted/binary-amd64/Packages.gz - 9ada66fa37a2c5307c191ca31c54b6ba 29002 restricted/binary-amd64/Packages - 1c91fce3fe0f345f6a78dafde1ae5838 101 restricted/binary-amd64/Release - 80a06e61bc510cd48c1ea29f40459aa2 6193 restricted/binary-amd64/Packages.bz2 - 5a748a5b7452fe41791c9a6bd758a5a9 508 restricted/binary-armel/Packages.gz - 73798a2780cb27b88a78b3afa3b89064 564 restricted/binary-armel/Packages.bz2 - 0d98b95cb712acfb81ccdeb02a92c2b0 101 restricted/binary-armel/Release - e86508f46fea90bd580672fdbcdc09d1 800 restricted/binary-armel/Packages - c55cc3ce43bf43370f87585e99966088 6133 restricted/binary-i386/Packages.gz - 59773390a87a4cc9fbbb5ac926c4d210 100 restricted/binary-i386/Release - ce51522712c441e2e7502731b2e5e619 28922 restricted/binary-i386/Packages - 4d8fcb65027b852b5cf9f4932e895b40 6208 restricted/binary-i386/Packages.bz2 - b9f1ed2ebbfa6a5a69fccdf1d3ab14c3 552 restricted/binary-ia64/Packages.bz2 - 3fee0239ecc6f0dfb0d4a17a6d324025 100 restricted/binary-ia64/Release - 050afda3c921cb575e3342477e8ceb72 785 restricted/binary-ia64/Packages - 292e9bdd78f19a5f9f6c57a6b97735f2 497 restricted/binary-ia64/Packages.gz - b9f1ed2ebbfa6a5a69fccdf1d3ab14c3 552 restricted/binary-powerpc/Packages.bz2 - 292e9bdd78f19a5f9f6c57a6b97735f2 497 restricted/binary-powerpc/Packages.gz - 050afda3c921cb575e3342477e8ceb72 785 restricted/binary-powerpc/Packages - 5de3bdb3711e7e2ffae99c84a7c21fd9 103 restricted/binary-powerpc/Release - 050afda3c921cb575e3342477e8ceb72 785 restricted/binary-sparc/Packages - 779a982005aebbee2673f8b84ca2e58e 101 restricted/binary-sparc/Release - b9f1ed2ebbfa6a5a69fccdf1d3ab14c3 552 restricted/binary-sparc/Packages.bz2 - 292e9bdd78f19a5f9f6c57a6b97735f2 497 restricted/binary-sparc/Packages.gz - d41d8cd98f00b204e9800998ecf8427e 0 restricted/debian-installer/binary-amd64/Packages - 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/debian-installer/binary-amd64/Packages.bz2 - 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-amd64/Packages.gz - 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-armel/Packages.gz - 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/debian-installer/binary-armel/Packages.bz2 - d41d8cd98f00b204e9800998ecf8427e 0 restricted/debian-installer/binary-armel/Packages - 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/debian-installer/binary-i386/Packages.bz2 - d41d8cd98f00b204e9800998ecf8427e 0 restricted/debian-installer/binary-i386/Packages - 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-i386/Packages.gz - 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-ia64/Packages.gz - d41d8cd98f00b204e9800998ecf8427e 0 restricted/debian-installer/binary-ia64/Packages - 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/debian-installer/binary-ia64/Packages.bz2 - 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-powerpc/Packages.gz - 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/debian-installer/binary-powerpc/Packages.bz2 - d41d8cd98f00b204e9800998ecf8427e 0 restricted/debian-installer/binary-powerpc/Packages - 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-sparc/Packages.gz - 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/debian-installer/binary-sparc/Packages.bz2 - d41d8cd98f00b204e9800998ecf8427e 0 restricted/debian-installer/binary-sparc/Packages - f2cd687f11c70abba7940c24bcb4685f 102 restricted/source/Release - 70148e2c94601b4e95d417a778750064 11670 restricted/source/Sources - b25d38c741031508511330eae8abac6f 3580 restricted/source/Sources.gz - a9746d4c9e33047b60053306d53a4f23 3775 restricted/source/Sources.bz2 - 9c26c9c75692283aff056a34c06832be 99 universe/binary-amd64/Release - 84ad9bcb434b1902d86ff7731373d60f 26734222 universe/binary-amd64/Packages - 90ad8bbc89998eebceb5908742485e24 5429539 universe/binary-amd64/Packages.bz2 - f97e4ad162362d0c48fc078c80fa5714 7015632 universe/binary-amd64/Packages.gz - b5c1317d3ae8ece7ebcdea356ebb5bd2 26046136 universe/binary-armel/Packages - 36bbe68ff5d91a3c0f1f023ee1e17225 6835261 universe/binary-armel/Packages.gz - dc4fcf07e1c75ed7aba07e416e052a2b 5286781 universe/binary-armel/Packages.bz2 - 7ba67813445ef78665e958d180efc463 99 universe/binary-armel/Release - 440ac1381a41382a61f28314781d7f70 26807886 universe/binary-i386/Packages - 4534442a923839dc35c16e5da38443b2 98 universe/binary-i386/Release - 2a1b4c6af98dc2cdddd80cb4f4f84925 7039759 universe/binary-i386/Packages.gz - a9d5744f0fb56bc9cbb760e6fae4791b 5447752 universe/binary-i386/Packages.bz2 - dbe5b6e4d60c6e9171c36c80063f106a 6875622 universe/binary-ia64/Packages.gz - d32bc23428d5f818c386ced966d4fe61 98 universe/binary-ia64/Release - e9be03465de48358db19bcc22fda853a 26078621 universe/binary-ia64/Packages - 80143f065ff5a832cbef92c7d28b3e69 5310527 universe/binary-ia64/Packages.bz2 - 728818d0435620d26dc3d3bc40d1f79b 6970013 universe/binary-powerpc/Packages.gz - 49eae894dae7b47ca436d20c5239679a 5394194 universe/binary-powerpc/Packages.bz2 - c2cce270e52324ff855a68c440d67aa6 101 universe/binary-powerpc/Release - 3011b896db892d93991bb90335c41d97 26605550 universe/binary-powerpc/Packages - 5e8ea09bb3da45ab70ba79765ea51a53 26213750 universe/binary-sparc/Packages - da35454d2a5e760d58917f2140e06c51 99 universe/binary-sparc/Release - 38bf210fa330f3a8e32d69f6a860c654 6888044 universe/binary-sparc/Packages.gz - 79a835c2a012e415fd0221769689633a 5330271 universe/binary-sparc/Packages.bz2 - 708a6eac0586dec1a0df7fccf754efbd 10279 universe/debian-installer/binary-amd64/Packages.bz2 - 41c9635c5b62eb6d12335b36bb64a30a 40037 universe/debian-installer/binary-amd64/Packages - f9f9d9fbbfbe5b68b20bbd5c9bf8d8ad 11317 universe/debian-installer/binary-amd64/Packages.gz - c98aa6c4565c550999e13e7d0be801cb 11433 universe/debian-installer/binary-armel/Packages.gz - 927759d7ed4d2212aa2921cc90704518 10385 universe/debian-installer/binary-armel/Packages.bz2 - b1d511c779b4466607678166df24e57a 40286 universe/debian-installer/binary-armel/Packages - 22164611619cb5c20b376c213966b1fe 11295 universe/debian-installer/binary-i386/Packages.gz - 0537826c0b4eed76110ec5fc65945291 39992 universe/debian-installer/binary-i386/Packages - 1daeee7fc0714ff61f7cf949dc3fccbf 10272 universe/debian-installer/binary-i386/Packages.bz2 - a93cad53c636b8c4804096f2cf457ac6 39417 universe/debian-installer/binary-ia64/Packages - 31b79f8461c67c025b1e99bdd3bdfb01 10107 universe/debian-installer/binary-ia64/Packages.bz2 - 087ce5ddf3c4c3d2e13912d88c1d26e4 11132 universe/debian-installer/binary-ia64/Packages.gz - db1ef05501122f801bfcfb173dacd004 40531 universe/debian-installer/binary-powerpc/Packages - c91f2f3e93442829c34ad5c9dc8a5794 10312 universe/debian-installer/binary-powerpc/Packages.bz2 - f10d6b1ba731af4d95713ca71037602e 11362 universe/debian-installer/binary-powerpc/Packages.gz - 32dcceb6bda996b37977c49655ae44b0 10745 universe/debian-installer/binary-sparc/Packages.gz - 0244a354219eab9c3d239a476e499b28 9806 universe/debian-installer/binary-sparc/Packages.bz2 - f021081c462677c5eb85d8f8aad0614f 38126 universe/debian-installer/binary-sparc/Packages - 77ac41ac5ab3874a90dd3428a62dc208 3165115 universe/source/Sources.bz2 - 5fdd4e7e57846a19231d67c83698ea7f 100 universe/source/Release - 20ff3fcb5a8b98cee97a8fd4896b7f71 13888852 universe/source/Sources - ddc2c3af2379e6b5db9e64034e785e43 4005968 universe/source/Sources.gz -SHA1: - 7ae7b9bd7b9e3e9a00c3e0d6e11fb92a4204e809 8595099 main/binary-amd64/Packages - c8f3569f4de5e08299ba17814cb6d54a0e2cec3b 95 main/binary-amd64/Release - 7968e646f3bd4e9ec464922e1a37485413dbacff 1779333 main/binary-amd64/Packages.gz - bec1c81bf8fe1decff797c0a381c65cd35c46fcd 1383205 main/binary-amd64/Packages.bz2 - 7601de3d722e78e552e777f71767b068fb9665c3 1745634 main/binary-armel/Packages.gz - e1de20f6f548086f8ba27c6f5c0253e3432dc34e 95 main/binary-armel/Release - 1ba5ab49bb61c2e0fe34ef7e147cba1b2ce21381 1364526 main/binary-armel/Packages.bz2 - 53e0cee31860baea3b5d7a901317c9243e3e5fad 8473939 main/binary-armel/Packages - 69f0fdfed70fe61502e551f135248d8629885b89 94 main/binary-i386/Release - a75cb84f1ee9d7f317a7052ade84358e7019bce6 1386205 main/binary-i386/Packages.bz2 - e02d6f643910601bcccafe1d89879d900302eba4 1781497 main/binary-i386/Packages.gz - 9869eec1930a5750e5c4628d4db9bad62ecd0985 8598110 main/binary-i386/Packages - 3b08e7a4945326914dd738bf84121762849aa4f7 1749837 main/binary-ia64/Packages.gz - aedeeae95a406e1b9a6782c9156b268a073c443e 94 main/binary-ia64/Release - cc4e3feb05f6d1c0065d6820ee30f3eef9c24cc3 8376166 main/binary-ia64/Packages - 2bfc579fd1dba59cf59050e1aba01ad31fa4f85e 1367515 main/binary-ia64/Packages.bz2 - 82e4685e309ca46d13208ab6b65e6881821b16f7 8452314 main/binary-powerpc/Packages - 96b56a0b3a126ef4ad70a6f77ab33abeed900c3b 1763576 main/binary-powerpc/Packages.gz - 713055823a0a91c3e4d310037274c2a0c61880d7 1376781 main/binary-powerpc/Packages.bz2 - ada8a0a3645c87cb029d513a1af951ec0c8be68f 97 main/binary-powerpc/Release - 0f54881a75bca93e5a0399c3d3cfd12066807d89 95 main/binary-sparc/Release - 38328e905d3bed3c93885d32e3893898820d92ae 8403646 main/binary-sparc/Packages - 5af855acdfc08bc8609ffa85edbca28f837f5bfb 1751944 main/binary-sparc/Packages.gz - 26a9e3789c137c12b1a25d095ccaf37e04ce383a 1369305 main/binary-sparc/Packages.bz2 - 9c6f18b155d2e778c4fb96b1dd31b8012a8efc13 52614 main/debian-installer/binary-amd64/Packages.gz - 4730bced42d2edbf9b8d64cb21449f2937bfbdee 194115 main/debian-installer/binary-amd64/Packages - ca0d953ccce11e2e66161fcade3291db907244e6 41737 main/debian-installer/binary-amd64/Packages.bz2 - ec9013f35737077e6b03df7e08f7d0b90ea02a52 48196 main/debian-installer/binary-armel/Packages.bz2 - 6ec82c03d365c53f9f1a41fb316eb1b3db262b86 240037 main/debian-installer/binary-armel/Packages - deec4dac63930bc10fef7bc6e2fe77af5f19c503 61654 main/debian-installer/binary-armel/Packages.gz - c75a9cbdeb0e7f70ea18d34e1d3e160ecf2017b6 45218 main/debian-installer/binary-i386/Packages.bz2 - 1babace3eaf8b21c6be2623acb7b245e5aa1c66f 218503 main/debian-installer/binary-i386/Packages - d5f0bec30483507d49e9cf9d0f507d3465fc3571 57235 main/debian-installer/binary-i386/Packages.gz - 94b164867413b70fa163323be77d48eae31bb235 187978 main/debian-installer/binary-ia64/Packages - e836fd2d93c75a4f3f38eb63ef7946da2a2b9bf9 40723 main/debian-installer/binary-ia64/Packages.bz2 - 154004bcc1ecd701609b74ca18d43c9cd45786d3 51277 main/debian-installer/binary-ia64/Packages.gz - 84d2cf927fc177a07781c27e5f4f7f9a91582391 57286 main/debian-installer/binary-powerpc/Packages.gz - c779e3b0c28227656bee6fe3e10251550f7064fd 217930 main/debian-installer/binary-powerpc/Packages - 7147267f238a5b4cd938001c82b2f075da0d0ef0 45144 main/debian-installer/binary-powerpc/Packages.bz2 - 60323ae1cba1baad32c37b325e5729ff62d5686a 187015 main/debian-installer/binary-sparc/Packages - 3cdfbfd262eb7ee36aa362be193de347fa616e7b 51128 main/debian-installer/binary-sparc/Packages.gz - 8fbae613d3355087bdc362e50b90628fcd53fdec 40671 main/debian-installer/binary-sparc/Packages.bz2 - 110033d50f7923aa8fe28862600cb6e1e15ecbed 658637 main/source/Sources.bz2 - c1b38d584a15e3b6a325e9bb24225551671a930e 96 main/source/Release - a08ec53806d19f2447c415faaa9524a2f1d508a7 3245836 main/source/Sources - e4e6cc3def7544373c1a94996a0bb5e54f6343b6 833999 main/source/Sources.gz - 077ee491dd77119834677584e5c797386f0067c3 101 multiverse/binary-amd64/Release - 39e7f34d9aa97c50f3b7a43e2256d49d3b0ee215 175917 multiverse/binary-amd64/Packages.bz2 - 76ae3b9445c24d00bc49cbe21b1b0fd820821f97 227377 multiverse/binary-amd64/Packages.gz - 08fca1957fdb78be3b80ac0db4d19fceec0812df 835855 multiverse/binary-amd64/Packages - 5f5ad6b33880ad28fd3e06d320476708ddb5cb6b 207550 multiverse/binary-armel/Packages.gz - cd42148b977ad0060a19c8fb13c4166112769e9d 101 multiverse/binary-armel/Release - 03c40e07d2940af4a728a5538d637406bc784072 753469 multiverse/binary-armel/Packages - 225a272b71fb2e416c476f27ad7ec09a56fb4db5 159689 multiverse/binary-armel/Packages.bz2 - 64af8d4cf482e1b03adacd9b00667fa8d647bd0a 851731 multiverse/binary-i386/Packages - 5316c8a4732585597e96dfe11adce6b760a65cf4 232339 multiverse/binary-i386/Packages.gz - 7dee83d02cab4e00258cc7063f9d27413dc938a0 179690 multiverse/binary-i386/Packages.bz2 - de42412e1076c663f80d37bb13cc0b8b9f9d097b 100 multiverse/binary-i386/Release - e1a973d20bb33b2b30f8c0e30fd65f00d124ad9d 207960 multiverse/binary-ia64/Packages.gz - f5fcc3eb752485e9740864ab66270ed377070af5 100 multiverse/binary-ia64/Release - 8257d383d822e7fff9339233a9f95c19fe67c53f 159999 multiverse/binary-ia64/Packages.bz2 - 2f3a2507f6cc2460beb11abbff443e0f2cf198d9 748797 multiverse/binary-ia64/Packages - f1b69cc124124d079dc51b0acb659b900a6bc87e 212591 multiverse/binary-powerpc/Packages.gz - ac08d9fda1eea8768e8cb9f8b58fa9ea943506ed 103 multiverse/binary-powerpc/Release - 424703252457f85d2b0fb0c9e33673832d1cfa9f 770869 multiverse/binary-powerpc/Packages - 7c27673812abd9266319bd1da36af0bb3690bed7 163220 multiverse/binary-powerpc/Packages.bz2 - 5efdd7234bd01d893aa6b26b8d493fe6d871e6b7 743247 multiverse/binary-sparc/Packages - e1d10955a14fccb1f7a36bd11cef373bd229747b 206433 multiverse/binary-sparc/Packages.gz - 2a749f5831be518b889e1e40d485ffdedc33ea75 101 multiverse/binary-sparc/Release - f4246bb6b984855c886f9d369a4c2dccc0787e33 158888 multiverse/binary-sparc/Packages.bz2 - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 multiverse/debian-installer/binary-amd64/Packages - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 multiverse/debian-installer/binary-amd64/Packages.gz - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 multiverse/debian-installer/binary-amd64/Packages.bz2 - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 multiverse/debian-installer/binary-armel/Packages.bz2 - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 multiverse/debian-installer/binary-armel/Packages - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 multiverse/debian-installer/binary-armel/Packages.gz - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 multiverse/debian-installer/binary-i386/Packages.gz - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 multiverse/debian-installer/binary-i386/Packages.bz2 - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 multiverse/debian-installer/binary-i386/Packages - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 multiverse/debian-installer/binary-ia64/Packages - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 multiverse/debian-installer/binary-ia64/Packages.gz - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 multiverse/debian-installer/binary-ia64/Packages.bz2 - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 multiverse/debian-installer/binary-powerpc/Packages.bz2 - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 multiverse/debian-installer/binary-powerpc/Packages - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 multiverse/debian-installer/binary-powerpc/Packages.gz - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 multiverse/debian-installer/binary-sparc/Packages.bz2 - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 multiverse/debian-installer/binary-sparc/Packages.gz - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 multiverse/debian-installer/binary-sparc/Packages - 03c8d1834b04908b1a661358c65105af4ecc6144 118837 multiverse/source/Sources.bz2 - 50066293103de0c0e254859f8769e183a1c68800 504210 multiverse/source/Sources - 1e06ad4e662efc0134018f3cb598b028d8fb92d9 145577 multiverse/source/Sources.gz - 6123b6f8cb9a3c22c9cc9ea10126b80e37b94728 102 multiverse/source/Release - 4f49a42877a9c6a94abd82362a789eed67ebf600 6149 restricted/binary-amd64/Packages.gz - 85d50a0dba3b242ea890ef74fed0c238be1cfbce 29002 restricted/binary-amd64/Packages - f9fbd359de363fc018e85827f7d6131c59dffc8e 101 restricted/binary-amd64/Release - 67c73a89dd0cb198c686f3ddb61424cb1fca289b 6193 restricted/binary-amd64/Packages.bz2 - 7acf3fb7afe9631f1b84382a4becb19de07abc54 508 restricted/binary-armel/Packages.gz - f478034ddac7e6745a5228fcbbfb7f24a5c2f2c3 564 restricted/binary-armel/Packages.bz2 - 77d75fd4552d29162e4c9efc53785c66bbaf70e7 101 restricted/binary-armel/Release - 5a28100038feaa965140b29a9b40f66fb86e495f 800 restricted/binary-armel/Packages - 7da5efb15ca935a82f1a7ef03eb0ad00da9786e7 6133 restricted/binary-i386/Packages.gz - 4396ba67a008e2a06964f1507e92cbfc8884aa12 100 restricted/binary-i386/Release - fa5b24ebc047661f49c9c009844ee788be57f4cd 28922 restricted/binary-i386/Packages - aa15907469577a5b45e10769cd81fce21011f6a9 6208 restricted/binary-i386/Packages.bz2 - 83604e18eb0a8c2941b7957db1400e838984a047 552 restricted/binary-ia64/Packages.bz2 - 71afe17dbbe5060fc1730e2f72513ddd58ee2436 100 restricted/binary-ia64/Release - b51b94b51bf0d8bee15320f0bb84409183c80dd1 785 restricted/binary-ia64/Packages - 4800105c385bc9460de4d196200915d198095606 497 restricted/binary-ia64/Packages.gz - 83604e18eb0a8c2941b7957db1400e838984a047 552 restricted/binary-powerpc/Packages.bz2 - 4800105c385bc9460de4d196200915d198095606 497 restricted/binary-powerpc/Packages.gz - b51b94b51bf0d8bee15320f0bb84409183c80dd1 785 restricted/binary-powerpc/Packages - 51e31e7b621940e90264478b598885e651c45b30 103 restricted/binary-powerpc/Release - b51b94b51bf0d8bee15320f0bb84409183c80dd1 785 restricted/binary-sparc/Packages - 9cd8cb04e51eb6541605e2bbd029638bff43e783 101 restricted/binary-sparc/Release - 83604e18eb0a8c2941b7957db1400e838984a047 552 restricted/binary-sparc/Packages.bz2 - 4800105c385bc9460de4d196200915d198095606 497 restricted/binary-sparc/Packages.gz - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/debian-installer/binary-amd64/Packages - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/debian-installer/binary-amd64/Packages.bz2 - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-amd64/Packages.gz - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-armel/Packages.gz - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/debian-installer/binary-armel/Packages.bz2 - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/debian-installer/binary-armel/Packages - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/debian-installer/binary-i386/Packages.bz2 - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/debian-installer/binary-i386/Packages - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-i386/Packages.gz - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-ia64/Packages.gz - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/debian-installer/binary-ia64/Packages - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/debian-installer/binary-ia64/Packages.bz2 - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-powerpc/Packages.gz - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/debian-installer/binary-powerpc/Packages.bz2 - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/debian-installer/binary-powerpc/Packages - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-sparc/Packages.gz - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/debian-installer/binary-sparc/Packages.bz2 - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/debian-installer/binary-sparc/Packages - 5b3a4af81100cb227b9238a69b25fc25cdeb42ec 102 restricted/source/Release - 3bfdf4fd932e9908ef8251205567d6d26d283168 11670 restricted/source/Sources - 5c37fbe4a362494efde874d5872e2b1fc15bc606 3580 restricted/source/Sources.gz - 703bf2be8f5d6087fe20aa21e5054d6a8efc5597 3775 restricted/source/Sources.bz2 - f896ad18165f74ab4bcd24c33137ed3b2ce06e18 99 universe/binary-amd64/Release - 1cec7e1bb388d6940969a48e7674739a19d67059 26734222 universe/binary-amd64/Packages - 633ea2a481081d9dddff7ed012ab16cefb28bcc6 5429539 universe/binary-amd64/Packages.bz2 - 3e52fa81f47aa2ad4d89771328a09c983fbc3b1e 7015632 universe/binary-amd64/Packages.gz - 7180e92f118a94925c0ed30925ef3fb09f2bf19d 26046136 universe/binary-armel/Packages - 0a2d7c5144d32242c2677eb479f04437aae4b6b7 6835261 universe/binary-armel/Packages.gz - c4fe43171c7233904fa7bac03ad4ee8cf4c9de72 5286781 universe/binary-armel/Packages.bz2 - 0e727b1255a57024b50aafd0e8b3ed42be198232 99 universe/binary-armel/Release - 22f956546f1332b3b605a05b5c602f9c587f2df9 26807886 universe/binary-i386/Packages - b96285c6cc352c28c5438d3f59d40e354d4517d6 98 universe/binary-i386/Release - 04a0bbbec6affceef68a84e21fbf82550d184a53 7039759 universe/binary-i386/Packages.gz - 1459562af31bbe61c14a43cfaa5c102de07c926d 5447752 universe/binary-i386/Packages.bz2 - e95d276f362fd76e844bb23219de997397df2635 6875622 universe/binary-ia64/Packages.gz - b74031274d253d4c1f23b3b4cd9d2080678e0478 98 universe/binary-ia64/Release - d6800281a9200b9645f74ec39a45bb9f5dc96785 26078621 universe/binary-ia64/Packages - ffbf666fe03528367d8bd54a899031c098f14169 5310527 universe/binary-ia64/Packages.bz2 - 3289e39a84e56c8da45666400b516bfb6ee2de6a 6970013 universe/binary-powerpc/Packages.gz - 4ea38ae66e871822d0cb63353cbe58ed8f14774c 5394194 universe/binary-powerpc/Packages.bz2 - 980ad1e26d7adeada83902d69b1ce9e3bce73011 101 universe/binary-powerpc/Release - a42810bcc05c3dcb5f8d4e5186628a1d95b6024a 26605550 universe/binary-powerpc/Packages - 9ae7cb9ae631b74ec80852e252ec67de5659f538 26213750 universe/binary-sparc/Packages - 18ecb1320ca83fb6bcce7a74480274db15fd1899 99 universe/binary-sparc/Release - 17c0747438ea66d10b1685d5486390c4e88e7dcd 6888044 universe/binary-sparc/Packages.gz - bc6c79da4f8b4e067d42b46fa1615343d5950430 5330271 universe/binary-sparc/Packages.bz2 - 2ba2eba329a282f7d16e4e34ae19947cb0779250 10279 universe/debian-installer/binary-amd64/Packages.bz2 - 4fe4a79666a266de45e96e475844506e5599f70a 40037 universe/debian-installer/binary-amd64/Packages - e6fcf2d30120929d951ce9cf66077a7705e724e3 11317 universe/debian-installer/binary-amd64/Packages.gz - a45ade999c3f36e4c4538939d2f05b4bf96b2dd2 11433 universe/debian-installer/binary-armel/Packages.gz - 157d9031a835d8c3ad957cfc97355ddfa032612b 10385 universe/debian-installer/binary-armel/Packages.bz2 - 5a2d26293b36f9ad73af733fbc102c69c317bc64 40286 universe/debian-installer/binary-armel/Packages - c2e0459dc5efcdb72df3f3e92354852cc72cb97c 11295 universe/debian-installer/binary-i386/Packages.gz - 3b12120229d09fcc698e046f9a494904752c4a1b 39992 universe/debian-installer/binary-i386/Packages - 7da8a850e5cc52cf1c06ee447cea4e4a5dea47a7 10272 universe/debian-installer/binary-i386/Packages.bz2 - 7d82e5982c08664fb41ec0472aa8779641d096ba 39417 universe/debian-installer/binary-ia64/Packages - 681013193075cb571a0c969fa8c2b9cda3f951d6 10107 universe/debian-installer/binary-ia64/Packages.bz2 - e16ecd26921377195839261281ce80343332f1f7 11132 universe/debian-installer/binary-ia64/Packages.gz - cb15233789965d6a47725b8ac97bf392a163ae36 40531 universe/debian-installer/binary-powerpc/Packages - e25fc309c3c071b78cc47e5e36ae20ccdfa7d04e 10312 universe/debian-installer/binary-powerpc/Packages.bz2 - e222ce065a084904998d317d3b95b768c98c60ad 11362 universe/debian-installer/binary-powerpc/Packages.gz - 73ad5adf388ceee09e7abedd1e3f831065f0bad7 10745 universe/debian-installer/binary-sparc/Packages.gz - 61347da1b6402a667bf9aa74ec090132dfab432f 9806 universe/debian-installer/binary-sparc/Packages.bz2 - 5ede4011ad3f86269710bef5e92414f2195ab7ff 38126 universe/debian-installer/binary-sparc/Packages - d4d2ebead2066fa7cf6be60d016bf91f40b4393b 3165115 universe/source/Sources.bz2 - 4c474f118467127abd40ce7f1ebb748d8967ccec 100 universe/source/Release - 77f442df5c7996bc45ac89163c1be5ed5fcb8e7f 13888852 universe/source/Sources - b3d728b8eb46270d797399ce267d77ae9d443b2c 4005968 universe/source/Sources.gz -SHA256: - c2bc6c826107e16cd734fe13dca015ea130ffac0d3b2867475516b916f7f142c 8595099 main/binary-amd64/Packages - ba13d6e582ba2aedd6e530455a9174f841cbac3c74548fca9407abd1982eb17f 95 main/binary-amd64/Release - 9c26460c9e0d2dd1245ab37911f012a9f22efa783c15b90ca500b6456dc57176 1779333 main/binary-amd64/Packages.gz - 74a8f3192b0eda397d65316e0fa6cd34d5358dced41639e07d9f1047971bfef0 1383205 main/binary-amd64/Packages.bz2 - a891c41cd372484d095e843bbcc62690a855c2057a25ccd69a47b21302878c52 1745634 main/binary-armel/Packages.gz - cab89594b24d599cb42c2ef137fee2a6f20859c61085a89da5082d0078a3d351 95 main/binary-armel/Release - b50fbc091488f2614c65dc80567bffeaef2a85bed6b2b6ca1b17625f7db214e4 1364526 main/binary-armel/Packages.bz2 - f081c84051317f5bddc4ba797555ca9c7f5bdce6dfe78e05265acab696615465 8473939 main/binary-armel/Packages - 095f73f9d2fbbc1c1a84426708978959610be17282420ae96f426deb26d54009 94 main/binary-i386/Release - 0e46596202a68caa754dfe0883f46047525309880c492cdd5e2d0970fcf626aa 1386205 main/binary-i386/Packages.bz2 - d9093f83fd940fcaaf6e5388d1265904801ab70806f70c0a6056c8c727157817 1781497 main/binary-i386/Packages.gz - af50b1ab7763966ddbc81989515196615e341f8d502b8b5328cf04373552f751 8598110 main/binary-i386/Packages - 877fe4efcaf5821a7fde85f88bb90e5d2713ef1423f2dc88135f995a3ed8ee94 1749837 main/binary-ia64/Packages.gz - 6238908944ff783171dd50aba49489ec9ae181255a0a41c7880b379c26da83ce 94 main/binary-ia64/Release - 6f98d81f8417329a13ec9671095f95814086a51d8abecfb363b2c4771c749ce7 8376166 main/binary-ia64/Packages - e99488926d74a56ed050a35cf0892bc883e3b17861fd3f3c201ea7c09863f085 1367515 main/binary-ia64/Packages.bz2 - a2205ba53e1ce42240d0bca0690948e9cdd29fe444490ec13f3e8c4650bc288a 8452314 main/binary-powerpc/Packages - a3a36777dad5a62d86252a88bb46015240a704738ade19e824a3212c114a5457 1763576 main/binary-powerpc/Packages.gz - a1419109251400c948912ed3c0e095297f57225790a220a8428aa753fdbed420 1376781 main/binary-powerpc/Packages.bz2 - 2113e8c7599195894548b60f21b6a9df72410349d3889de9bafcb89f60d63668 97 main/binary-powerpc/Release - b29ea32ad6b36ac510bafb61d0a31388b655ffc040d9baa5671de036b5b39243 95 main/binary-sparc/Release - 11daa191617b295bd46f410fd63d19965d80964ab34afb6a5270ac05cdd11c99 8403646 main/binary-sparc/Packages - f477df15508ae627c8b2ffa0030b2c1210c8c708c76f542c998fd965d87788e1 1751944 main/binary-sparc/Packages.gz - d4ce8246990a2c3c289df94daaf187f43e5c3f126c3bd67fc3069a08ccb951d5 1369305 main/binary-sparc/Packages.bz2 - c7832eb191eb7fc19e19c13b2f03a92a221f2a39c2f4847d6eabc2b9d1597e28 52614 main/debian-installer/binary-amd64/Packages.gz - 192aa1d7a500399db73191903731467c8e94e793675ef83d005df00446cdfbd2 194115 main/debian-installer/binary-amd64/Packages - fba371229ca6853dd939abcd34b8f51c78042aa4fd77e13b00cf06fbdc10439d 41737 main/debian-installer/binary-amd64/Packages.bz2 - 241edd87db786d7528fddf8233f16ae0227a5455eb461f036d688305cd872c45 48196 main/debian-installer/binary-armel/Packages.bz2 - 1076ba4a5dc6c97ed5636cb076978b6935b58573d533498a217ee4b2cc2fd206 240037 main/debian-installer/binary-armel/Packages - 48f7c974794f5cb2e6fc2e9b740945a236168335b8f2366c1c10663d23027a4c 61654 main/debian-installer/binary-armel/Packages.gz - e6028d7bf8a3ceaa0f682977bb8642608180eb5a47f5ba8155cda89752b944fd 45218 main/debian-installer/binary-i386/Packages.bz2 - 0e78ab3fb61ab06e16db7c64acf87c3e17346817128733f1af22da51d9bd383b 218503 main/debian-installer/binary-i386/Packages - 777d616b33d466bc8fbd540487e91dce1f51214d60bb1e58677b26b414b3ba9b 57235 main/debian-installer/binary-i386/Packages.gz - 978319f0eee978f26faddd8048ef52e44ae646cca94a4a9713b2e2647a0a517a 187978 main/debian-installer/binary-ia64/Packages - 9b084ce3e5704145ef6adbf3a877b642175b04799199c685b94083129e24fc0a 40723 main/debian-installer/binary-ia64/Packages.bz2 - a8b2aadb6c019e5ede7c5ba4d5c44efe5a8a01c11400882fc4a25496446ad1f4 51277 main/debian-installer/binary-ia64/Packages.gz - 0576fd306950afe1af3981c5c988213de1f474efd087d7a6d648e35dc8e183ad 57286 main/debian-installer/binary-powerpc/Packages.gz - 295c4da5b30407662378f5b9c3cb933d2cdd9fd44d1e5386c081ed2145519688 217930 main/debian-installer/binary-powerpc/Packages - 46bfb47f5006851a8e1fc9cc5039464600acd442375b3679fa77a1201c99a24d 45144 main/debian-installer/binary-powerpc/Packages.bz2 - 3bae8c7b5f41ac0d2de1e91b7a4594cfe6db59072f42c92465834a085260b5ad 187015 main/debian-installer/binary-sparc/Packages - 11f374ea333deae3780bce1bc489de44f6d91e27e07c0846bf58ebbaf911d2b5 51128 main/debian-installer/binary-sparc/Packages.gz - cdb83137b2cfa34b44e958419b7498819cc8a3fe8459b22a1e350284d79bfc67 40671 main/debian-installer/binary-sparc/Packages.bz2 - 4959448f974f28c1c57140d1cb7c2ea9443b6cfb983fc280d96c5fa16e1f484e 658637 main/source/Sources.bz2 - edd3ca70acb2d2f47187631b6f75b628613b4ff59d83ff0d539e5812ae3775c9 96 main/source/Release - ab69451e2ce609d5ae3cc644e1837203b20ee46736dbdab907fc6d5e732744be 3245836 main/source/Sources - 0b74e2f05565d0f3ec543ead0f9ab35878ddacddbd4a761fc892704ca5c7a30a 833999 main/source/Sources.gz - 179c7efbf1c0e2c4b2871d14809c89f88128a0400d033564e5d54741cfe6eb47 101 multiverse/binary-amd64/Release - b59912293d9bdfd815f80409993ddf7f5120aff738367b7b337878f506f37e9d 175917 multiverse/binary-amd64/Packages.bz2 - 460d534bed0e898baa116d7b67d3361233af7113d8e62e9c0cb96e73aac2d433 227377 multiverse/binary-amd64/Packages.gz - 469bb92445c8b279014627a928fffce1431196613617abac86264fe4f120273d 835855 multiverse/binary-amd64/Packages - dbbc32343dcf6e5a83cbb09f2c72f0f99db7a46913ad117b12506c8cf9812036 207550 multiverse/binary-armel/Packages.gz - 10e603226d59054a8d48a6b32cee85767b3cea4a3aaf7ddd0c6bbcb646faaab9 101 multiverse/binary-armel/Release - e6174479f137d0fce925830dbdb0dce6eb23ddd862cc5114a0e94c267c01306b 753469 multiverse/binary-armel/Packages - fc9c79a63e83c7eaf10e09c7fd0c346ff8eb9424d4daed1d748db3e8a097b6ac 159689 multiverse/binary-armel/Packages.bz2 - 71de4e77a4cbd731add593b95a1fa68281d6125b41f5b305fca81bd03162846a 851731 multiverse/binary-i386/Packages - 6c831c512b20b9743d8e99146256efa77849494973a62d211aaeddaf857f5ec8 232339 multiverse/binary-i386/Packages.gz - a93877e59808eac52dec78b8275e6349e7e43ef87ca56c5dac293bfd66627c97 179690 multiverse/binary-i386/Packages.bz2 - 103ca72efb6233287b3efc96e0486599020eb7a56e889ac3948af93eae70d8df 100 multiverse/binary-i386/Release - 4661ffd1f6205fcff50258580236983f8f5682727c7dad08d3038802df23c8c6 207960 multiverse/binary-ia64/Packages.gz - b1537c932c7e3e0f8f2fcae67103559c0e28b332ab324c41a85dca45bf589b4a 100 multiverse/binary-ia64/Release - 5ba3c768600a3539f5b67b8c29f5eec0c23408d2355b22a6ae456973f46eca66 159999 multiverse/binary-ia64/Packages.bz2 - 2d4373e06db5d5e8b30b193b5245511df86546aa07d0b07999f2d9d7ad7e47ba 748797 multiverse/binary-ia64/Packages - 4f7f3ffa8ee9a1be3e366640bd84d9e1efe5ec6c115d222671e3b45fe8ec9400 212591 multiverse/binary-powerpc/Packages.gz - 4ddcaab8c7686ce317ace420f976cd08054d89c69e7bfa52c68a0fd70fdb8700 103 multiverse/binary-powerpc/Release - 0a0ffa9499591369e7894ccb965f065a2a0ccf1c7f087e30f0801225cfa0a78e 770869 multiverse/binary-powerpc/Packages - 25aad62d010a40d3f84c1205b1ea64da898858461911f598c2f1469d91fc0667 163220 multiverse/binary-powerpc/Packages.bz2 - fcdf8b83ce0a4b618a5ad00eda1c6eca18a00ff96c965e38e76e8b5ce1ac93e7 743247 multiverse/binary-sparc/Packages - dc22ee241e137fa896ed780f92f0de389bc817dc39ee40197802112d5175b6f5 206433 multiverse/binary-sparc/Packages.gz - 8be7a7df16dffcc4a2220c4313a5c7599c164aebc98051561c281987ded92cc7 101 multiverse/binary-sparc/Release - f94e77e221b55eee361617c4d69db999394eb6b1096618b042c3248390bd2d7c 158888 multiverse/binary-sparc/Packages.bz2 - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 multiverse/debian-installer/binary-amd64/Packages - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 multiverse/debian-installer/binary-amd64/Packages.gz - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 multiverse/debian-installer/binary-amd64/Packages.bz2 - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 multiverse/debian-installer/binary-armel/Packages.bz2 - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 multiverse/debian-installer/binary-armel/Packages - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 multiverse/debian-installer/binary-armel/Packages.gz - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 multiverse/debian-installer/binary-i386/Packages.gz - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 multiverse/debian-installer/binary-i386/Packages.bz2 - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 multiverse/debian-installer/binary-i386/Packages - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 multiverse/debian-installer/binary-ia64/Packages - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 multiverse/debian-installer/binary-ia64/Packages.gz - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 multiverse/debian-installer/binary-ia64/Packages.bz2 - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 multiverse/debian-installer/binary-powerpc/Packages.bz2 - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 multiverse/debian-installer/binary-powerpc/Packages - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 multiverse/debian-installer/binary-powerpc/Packages.gz - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 multiverse/debian-installer/binary-sparc/Packages.bz2 - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 multiverse/debian-installer/binary-sparc/Packages.gz - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 multiverse/debian-installer/binary-sparc/Packages - c59df461a11de72fab44064559bdf0f1493fb71d0d61c20670bffb431f8e2ed5 118837 multiverse/source/Sources.bz2 - 3d205ae91ab3570049adbfe851c8b3ab3154f094e54b6000c876ef9039dd2c02 504210 multiverse/source/Sources - 3b349aff645051214a77d18dbbddf69bba66aea8b361d9ecef4eaa7ce897396e 145577 multiverse/source/Sources.gz - 42f6c3881336d71362322c67ad19f843f720fbf4c14debd4ed1e9896c8c88368 102 multiverse/source/Release - a29af736e1ed0be3a393ae49da8d59acc3bfdd29a7e03268b3909b24e090bb37 6149 restricted/binary-amd64/Packages.gz - 7e9d838737868748f7b3dc34509a077e6f5b1f21910379b986d556ee2b308d5f 29002 restricted/binary-amd64/Packages - 04354c3017adf5bc36a93eeb9ed5a3f3e68d8192558a390f61f21d9a4ee9af55 101 restricted/binary-amd64/Release - 220c7475ccebc75767fd7deac35b0fde1e03e76b35ab58df9d7964a14db2febc 6193 restricted/binary-amd64/Packages.bz2 - c4d112b6591d08205ac5546a611eb1466b9e39341f7bb8540f91678a850e1fa4 508 restricted/binary-armel/Packages.gz - 9e7aa9da79e68b40a3247baa8e6b3d552b504cd9f46ba984c359ad5633b14e27 564 restricted/binary-armel/Packages.bz2 - 6c485ed27e825538bd420b048fdf44183bfe02e2fa3f0911683b67d4a598cf21 101 restricted/binary-armel/Release - c38b6bb37e32acf7d738fdb6e3a712030d5fbb37aac95f7804f38d23a692a7a5 800 restricted/binary-armel/Packages - 6ca65bb815a59e1e08acb42dfcd996b7cd48f5bf13a7d9b7115972bcc4557193 6133 restricted/binary-i386/Packages.gz - 26c6c737ad3b145710b745b918b661189e292732c2180e9e0eeee96683d8614f 100 restricted/binary-i386/Release - 5a1f3d9cd1dc4eff62b73d9e0cd0bfb96302a8aaba281b07ac99775f0624f162 28922 restricted/binary-i386/Packages - 6c6f1d1a557df1d38d438ba1932d9a05119365316a15ecf94e1eb367afae77ca 6208 restricted/binary-i386/Packages.bz2 - 80fe8677b9905014bb9c3de109d3a44a6f387991a27421d5e5f0abf5bdff426d 552 restricted/binary-ia64/Packages.bz2 - e944219f02b73d2565af6ee644d2941afc7d9a0e0342fb3ac89ec6b54e053775 100 restricted/binary-ia64/Release - f391f7c05313707e5634e4d519ba11da1547789c2ad9208c0de3ec7d46ba0263 785 restricted/binary-ia64/Packages - 38ecfafb509ea9daac5b38cb2f06993d2b57108565af0264760f546422faf1af 497 restricted/binary-ia64/Packages.gz - 80fe8677b9905014bb9c3de109d3a44a6f387991a27421d5e5f0abf5bdff426d 552 restricted/binary-powerpc/Packages.bz2 - 38ecfafb509ea9daac5b38cb2f06993d2b57108565af0264760f546422faf1af 497 restricted/binary-powerpc/Packages.gz - f391f7c05313707e5634e4d519ba11da1547789c2ad9208c0de3ec7d46ba0263 785 restricted/binary-powerpc/Packages - f5fa571a2c002209639eaaec9c66d3c60e3035b3430a7c3e3c8008606705b7d1 103 restricted/binary-powerpc/Release - f391f7c05313707e5634e4d519ba11da1547789c2ad9208c0de3ec7d46ba0263 785 restricted/binary-sparc/Packages - 9ace4eb586e77ba82f4963ff7d3576eabf7aefa07b56def57751730a183c38d5 101 restricted/binary-sparc/Release - 80fe8677b9905014bb9c3de109d3a44a6f387991a27421d5e5f0abf5bdff426d 552 restricted/binary-sparc/Packages.bz2 - 38ecfafb509ea9daac5b38cb2f06993d2b57108565af0264760f546422faf1af 497 restricted/binary-sparc/Packages.gz - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/debian-installer/binary-amd64/Packages - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/debian-installer/binary-amd64/Packages.bz2 - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-amd64/Packages.gz - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-armel/Packages.gz - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/debian-installer/binary-armel/Packages.bz2 - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/debian-installer/binary-armel/Packages - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/debian-installer/binary-i386/Packages.bz2 - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/debian-installer/binary-i386/Packages - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-i386/Packages.gz - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-ia64/Packages.gz - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/debian-installer/binary-ia64/Packages - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/debian-installer/binary-ia64/Packages.bz2 - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-powerpc/Packages.gz - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/debian-installer/binary-powerpc/Packages.bz2 - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/debian-installer/binary-powerpc/Packages - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-sparc/Packages.gz - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/debian-installer/binary-sparc/Packages.bz2 - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/debian-installer/binary-sparc/Packages - 7ebba06ba44cfeeed10cddfe9ce4ee2b35bc42f764158e410ee11a61874dfa06 102 restricted/source/Release - a918c3947ab834297f3d2c497e961f11e48539a5ce77fe0e5b70b0a69e28c1e2 11670 restricted/source/Sources - 77ede22795f344b4373e5bda1d57c6e1f5bae14b56868540031ea378ac1a0a55 3580 restricted/source/Sources.gz - 88712e84fd5593009e38e85ca37a7d0f6923e9c5998def8a2cc30a6a0da6936b 3775 restricted/source/Sources.bz2 - f279288eefc126ef7e8dbae71f662b6fcd208c3a0fa5f920d7f831da167ef09e 99 universe/binary-amd64/Release - 536e97eea0a481c3df2cfc5b4568601a3c8f837f65e837daa0556ca128e25e08 26734222 universe/binary-amd64/Packages - 49d23df9370758b4159051a1814cf01230c59fa9243295105c4bb38c9c5d5484 5429539 universe/binary-amd64/Packages.bz2 - 28742757ae39144b9988ecea862d2f5c23654c9ad88fa609d86c4f3000b00b9f 7015632 universe/binary-amd64/Packages.gz - 7ac3d1dccda5bf50c20574198cc10128f3dd3898d875fb647fd6575f2bf33616 26046136 universe/binary-armel/Packages - ae9406e2a5223576872ba590db52a22d365d2aa67e22f4aeb88d0ffc48d45a3a 6835261 universe/binary-armel/Packages.gz - 3c9303f6b76d9b49e327f9f9ff250cf1dc5ce234643351b700de7ab4ab4a7e01 5286781 universe/binary-armel/Packages.bz2 - 3b7cd3879b7d42d359cfedeff10e8b760d4f39b8c2093c2d1a158f620b08c0d6 99 universe/binary-armel/Release - c5dc922c8f0ac07b8d428b46f795b26aa1cdf5863bae5c148f9aa7bcf5f1c29d 26807886 universe/binary-i386/Packages - a1be5af3be86e137a831343682b75243f78cc32944832c718bf0bd33f8393626 98 universe/binary-i386/Release - 07fa37630e04c1e96fd13815d6670b040b88885c3f8846537f7dddb1774bc231 7039759 universe/binary-i386/Packages.gz - fec57f9f84339bebbcbb6574a359650c46e409be6eade684be2f2665cfd2db8e 5447752 universe/binary-i386/Packages.bz2 - 67105e5d45b3cf36b04ea94025767947bf7623052071743f87a6b6556519c956 6875622 universe/binary-ia64/Packages.gz - 4b2e06335e74dd487721f333d344620362708dcb75bd757a7a727f4b95ae7185 98 universe/binary-ia64/Release - 4a307c3e89fd670d71cf3289a1a89b7bd6de3984c339416464eb1b190a112f64 26078621 universe/binary-ia64/Packages - 08059299d799f5271216b10cd2a0d329c8a8479057ad43b43d0bf9ca43d88642 5310527 universe/binary-ia64/Packages.bz2 - cac2be1cffbede73ef368cdad10fab2f514490fe2e2b4c92eabd0600d28a56c0 6970013 universe/binary-powerpc/Packages.gz - c58c69d1531f019bf8de0120f259abbb3e0a3e0b68e2a5acd9324b9af88e1f52 5394194 universe/binary-powerpc/Packages.bz2 - 9789763a4555391aa2044b6576f1cb2d0c030db712f36fdd817a6ec8ad7dd4e7 101 universe/binary-powerpc/Release - a3c52bdae25bb9ee07edfad21a09fe427503429a465acbf413b3214aff4e00de 26605550 universe/binary-powerpc/Packages - c1ac4277c1690cabd25c329f07f95a4977cc617738e660e4168de382edc46137 26213750 universe/binary-sparc/Packages - afc966573f8c882e8c87379829d946b7db358d2e53b053f2254b60fd62015306 99 universe/binary-sparc/Release - 3578e90cdaa5fc01f35aa19ba18f1653737e1fa092aeaac71119447ca2f30c88 6888044 universe/binary-sparc/Packages.gz - 1236e14d44574622191fdefdb13686a81c644d317631d496933eb5791b2b0ad2 5330271 universe/binary-sparc/Packages.bz2 - 261c00a23103dcba1623fc8fb3c0a29abd243bb913b26d838fd31c9e75999875 10279 universe/debian-installer/binary-amd64/Packages.bz2 - 5fe84f0b1660d6939909d0c0cff5a19d190bd1ff3dc6a02fb0037c93831bff30 40037 universe/debian-installer/binary-amd64/Packages - f2bc0d4f4a0fe36ee1f4d2f81c29a8c651b53b126662c192211daef7bcb01d65 11317 universe/debian-installer/binary-amd64/Packages.gz - 8eddb7cf1f620c0d72c32739504c455bee15e2a1e737c5be84b4a482dbbe1590 11433 universe/debian-installer/binary-armel/Packages.gz - 50d778a6464e556336e03332a16f5c96660babc581339b322d394906d877467d 10385 universe/debian-installer/binary-armel/Packages.bz2 - b06ebdbf67aa0b511416d2c70e80379e6d9fd7e92a83de588792962fe6e17b6b 40286 universe/debian-installer/binary-armel/Packages - d23a3bf578b66bbc38ab358522b3c6af799d7e60b5b7c8052e95559db68b43da 11295 universe/debian-installer/binary-i386/Packages.gz - 0e09478f0c06c6d3724528a4de4863bfb3e2ca06836cd189b9b0d1c009f6a960 39992 universe/debian-installer/binary-i386/Packages - 2e590c3016bc81ab2142d86cc01fcf0ee2b3839d082aa5996f516d4db7b7a776 10272 universe/debian-installer/binary-i386/Packages.bz2 - de3b987eb85a1d196be25021e71eacfa7e94f632730d2a7100f7a67dd1a8c86e 39417 universe/debian-installer/binary-ia64/Packages - 3f0de3953eaceb1b34e0f8fa230dcbc1f0bc5b61dd228f32bc42c699a8c625c8 10107 universe/debian-installer/binary-ia64/Packages.bz2 - 73b7dacc0ca6db43117bcfd0534d964a8333dc4d470d4df20c8b291e68687cb6 11132 universe/debian-installer/binary-ia64/Packages.gz - dd6acbb610466ec2eefa2e1f5190c40770cf8c830fe8301fe250025089531a9f 40531 universe/debian-installer/binary-powerpc/Packages - 4966d98a5627b2f0bc4221b33d2a3189149d528cb151f80522d904cf084e54f4 10312 universe/debian-installer/binary-powerpc/Packages.bz2 - 506b7e32b7766c8fe54090ed9a59696f99b9d294e1561ff28608681a1d71bc05 11362 universe/debian-installer/binary-powerpc/Packages.gz - d529381dbda89ff8d5be006e06b87d34991008e9648d610bbfea5b284266bf4f 10745 universe/debian-installer/binary-sparc/Packages.gz - 820533a6ebc7353ad0e17777efd901342fca412ed15e8dc44c6a00c25d1127b8 9806 universe/debian-installer/binary-sparc/Packages.bz2 - 87bd7ab6ac590d4356d14af50590b265de4a410ac5d661d28e68d0f109b776d8 38126 universe/debian-installer/binary-sparc/Packages - 4dea11c08b8e102cadba97561a53f6364fe6b0092dba63d9cfd4571ef1531f1a 3165115 universe/source/Sources.bz2 - 82a7f64d43cb9618a9139faf0ffe55ddfdd457d985dd2d2dcde43fa8ff7f9d1f 100 universe/source/Release - 49c0202ce6bf54cc6e0eb47bb68f2dc9cf5d42089f95de958fd913504de7cf9c 13888852 universe/source/Sources - f44fd6dc3ad168dd291da2b4390b2d5474a634b1d90abe6534cca53144e4447a 4005968 universe/source/Sources.gz diff -Nru update-manager-17.10.11/tests/aptroot-cache-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release.gpg update-manager-0.156.14.15/tests/aptroot-cache-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release.gpg --- update-manager-17.10.11/tests/aptroot-cache-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release.gpg 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-cache-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release.gpg 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQBL2cDzQJdur0N9BbURAmk2AJ9ungOjKn0ektAH87KhRIHht+1cDQCfck7P -ZoIb2P0v2PEqa4Az8KnIIW4= -=b/mY ------END PGP SIGNATURE----- diff -Nru update-manager-17.10.11/tests/aptroot-cache-test/var/lib/dpkg/status update-manager-0.156.14.15/tests/aptroot-cache-test/var/lib/dpkg/status --- update-manager-17.10.11/tests/aptroot-cache-test/var/lib/dpkg/status 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-cache-test/var/lib/dpkg/status 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -Package: package-one -Status: install ok installed -Priority: optional -Section: misc -Installed-Size: 1024 -Maintainer: Ubuntu Developers -Architecture: all -Version: 0.1 -Description: an example package - -Package: package-two -Status: install ok installed -Priority: optional -Section: misc -Installed-Size: 1024 -Maintainer: Ubuntu Developers -Architecture: all -Version: 0.1 -Description: an example package - -Package: package-three -Status: install ok installed -Priority: optional -Section: misc -Installed-Size: 1024 -Maintainer: Ubuntu Developers -Architecture: all -Version: 0.1 -Description: an example package - -Package: package-four -Status: install ok installed -Priority: optional -Section: misc -Installed-Size: 1024 -Maintainer: Ubuntu Developers -Architecture: all -Version: 0.1 -Description: an example package - diff -Nru update-manager-17.10.11/tests/aptroot-cache-test/var/lib/dpkg/status-minus-three update-manager-0.156.14.15/tests/aptroot-cache-test/var/lib/dpkg/status-minus-three --- update-manager-17.10.11/tests/aptroot-cache-test/var/lib/dpkg/status-minus-three 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-cache-test/var/lib/dpkg/status-minus-three 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -Package: package-one -Status: install ok installed -Priority: optional -Section: misc -Installed-Size: 1024 -Maintainer: Ubuntu Developers -Architecture: all -Version: 0.1 -Description: an example package - -Package: package-two -Status: install ok installed -Priority: optional -Section: misc -Installed-Size: 1024 -Maintainer: Ubuntu Developers -Architecture: all -Version: 0.1 -Description: an example package - -Package: package-three -Status: purge ok not-installed -Priority: optional -Section: misc -Maintainer: Ubuntu Developers -Architecture: all -Version: 0.1 -Description: an example package - -Package: package-four -Status: install ok installed -Priority: optional -Section: misc -Installed-Size: 1024 -Maintainer: Ubuntu Developers -Architecture: all -Version: 0.1 -Description: an example package - diff -Nru update-manager-17.10.11/tests/aptroot-changelog/etc/apt/sources.list update-manager-0.156.14.15/tests/aptroot-changelog/etc/apt/sources.list --- update-manager-17.10.11/tests/aptroot-changelog/etc/apt/sources.list 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-changelog/etc/apt/sources.list 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -deb http://archive.ubuntu.com/ubuntu lucid main - Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/tests/aptroot-changelog/etc/apt/trusted.gpg and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/tests/aptroot-changelog/etc/apt/trusted.gpg differ Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/tests/aptroot-changelog/var/cache/apt/pkgcache.bin and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/tests/aptroot-changelog/var/cache/apt/pkgcache.bin differ Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/tests/aptroot-changelog/var/cache/apt/srcpkgcache.bin and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/tests/aptroot-changelog/var/cache/apt/srcpkgcache.bin differ diff -Nru update-manager-17.10.11/tests/aptroot-changelog/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_main_binary-amd64_Packages update-manager-0.156.14.15/tests/aptroot-changelog/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_main_binary-amd64_Packages --- update-manager-17.10.11/tests/aptroot-changelog/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_main_binary-amd64_Packages 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-changelog/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_main_binary-amd64_Packages 1970-01-01 00:00:00.000000000 +0000 @@ -1,93 +0,0 @@ -Package: apt -Priority: important -Section: admin -Installed-Size: 5488 -Maintainer: Ubuntu Core Developers -Original-Maintainer: APT Development Team -Architecture: all -Version: 0.7.25.3ubuntu7 -Replaces: libapt-pkg-dev (<< 0.3.7), libapt-pkg-doc (<< 0.3.7) -Provides: libapt-pkg-libc6.10-6-4.8 -Depends: libc6 (>= 2.8), libgcc1 (>= 1:4.1.1), libstdc++6 (>= 4.4.0) -Recommends: ubuntu-keyring -Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt -Filename: pool/main/a/apt/apt_0.7.25.3ubuntu7_amd64.deb -Size: 1817332 -MD5sum: e4e56d2597d1ae396d30d20684632719 -SHA1: baeeaa983f8f0224bb6748279611b1b2b323e49b -SHA256: 863feb4e20cdb33d81cd59417a494c8cc369800f86f0a42d428e1aed872fc247 -Description: Advanced front-end for dpkg - This is Debian's next generation front-end for the dpkg package manager. - It provides the apt-get utility and APT dselect method that provides a - simpler, safer way to install and upgrade packages. - . - APT features complete installation ordering, multiple source capability - and several other unique features, see the Users Guide in apt-doc. -Bugs: https://bugs.launchpad.net/ubuntu/+filebug -Build-Essential: yes -Origin: Ubuntu -Supported: 5y -Task: minimal - -Package: gcc -Priority: optional -Section: devel -Installed-Size: 41 -Maintainer: Ubuntu Developers -Original-Maintainer: Debian GCC Maintainers -Architecture: amd64 -Source: gcc-defaults (1.117ubuntu1) -Version: 4:4.7.0-5ubuntu1 -Provides: c-compiler -Depends: cpp (>= 4:4.7.0-5ubuntu1), gcc-4.7 (>= 4.7.0-1~) -Recommends: libc6-dev | libc-dev -Suggests: gcc-multilib, make, manpages-dev, autoconf, automake1.9, libtool, flex, bison, gdb, gcc-doc -Conflicts: gcc-doc (<< 1:2.95.3) -Filename: pool/main/g/gcc-defaults/gcc_4.7.0-5ubuntu1_i386.deb -Size: 5126 -MD5sum: 3a2e22f626ebb337801fcebb511f30b9 -SHA1: 6d67686eb8fbea95ae20288cd31d78802a225167 -SHA256: a18efe8e76f1b44d89e875e6ec8993b6221471035611d7283c0f103cd8352014 -Description-en: GNU C compiler - This is the GNU C compiler, a fairly portable optimizing compiler for C. - . - This is a dependency package providing the default GNU C compiler. -Description-md5: c7efd71c7c651a9ac8b2adf36b137790 -Bugs: https://bugs.launchpad.net/ubuntu/+filebug -Build-Essential: yes -Origin: Ubuntu -Supported: 5y -Task: ubuntu-desktop, ubuntu-usb, edubuntu-desktop, edubuntu-usb, xubuntu-desktop, mythbuntu-frontend, mythbuntu-desktop, mythbuntu-backend-slave, mythbuntu-backend-master, ubuntustudio-desktop - -Package: libgtk2.0-dev -Priority: optional -Section: libdevel -Installed-Size: 16102 -Maintainer: Ubuntu Desktop Team -Original-Maintainer: Debian GNOME Maintainers -Architecture: amd64 -Source: gtk+2.0 -Version: 2.24.11-0ubuntu1 -Replaces: gir-repository-dev -Depends: libgtk2.0-0 (= 2.24.11-0ubuntu1), libgtk2.0-common, libglib2.0-dev (>= 2.27.3), libgdk-pixbuf2.0-dev (>= 2.21.0), libpango1.0-dev (>= 1.20), libatk1.0-dev (>= 1.29.2), libcairo2-dev (>= 1.6.4-6.1), libx11-dev (>= 2:1.0.0-6), libxext-dev (>= 1:1.0.1-2), libxinerama-dev (>= 1:1.0.1-4.1), libxi-dev (>= 1:1.0.1-4), libxrandr-dev (>= 1:1.2.99), libxcursor-dev, libxfixes-dev (>= 1:3.0.0-3), libxcomposite-dev (>= 1:0.2.0-3), libxdamage-dev (>= 1:1.0.1-3), pkg-config (>= 0.26-1), libxml2-utils, gir1.2-gtk-2.0 -Recommends: python (>= 2.4), debhelper -Suggests: libgtk2.0-doc -Breaks: gir1.0-gtk-2.0 -Filename: pool/main/g/gtk+2.0/libgtk2.0-dev_2.24.11-0ubuntu1_i386.deb -Size: 3670306 -MD5sum: 5606624d0ab5c2a5c96873e01f3cfd89 -SHA1: 80506fd67e86639d4b0189ef97ed7b9669485367 -SHA256: c778e104e50da9a2250da61379c96d7b5c718aace6f87df7d2e44136afed5a0e -Description-en: development files for the GTK+ library - GTK+ is a multi-platform toolkit for creating graphical user - interfaces. Offering a complete set of widgets, GTK+ is suitable - for projects ranging from small one-off tools to complete application - suites. - . - This package contains the header files and static libraries which are - needed for developing GTK+ applications. -Homepage: http://www.gtk.org/ -Description-md5: af1caa5ba73fd17300b1f1bca4680e0d -Bugs: https://bugs.launchpad.net/ubuntu/+filebug -Origin: Ubuntu -Supported: 5y diff -Nru update-manager-17.10.11/tests/aptroot-changelog/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release update-manager-0.156.14.15/tests/aptroot-changelog/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release --- update-manager-17.10.11/tests/aptroot-changelog/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-changelog/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release 1970-01-01 00:00:00.000000000 +0000 @@ -1,564 +0,0 @@ -Origin: Ubuntu -Label: Ubuntu -Suite: lucid -Version: 10.04 -Codename: lucid -Date: Thu, 29 Apr 2010 17:24:55 UTC -Architectures: amd64 armel i386 ia64 powerpc sparc -Components: main restricted universe multiverse -Description: Ubuntu Lucid 10.04 -MD5Sum: - 337c25a09805813b85fd45f38934de85 8595099 main/binary-amd64/Packages - cab26f8b56e0dc62da3bd4276242bb98 95 main/binary-amd64/Release - 9cf597f8375941099e5cbe5cb62eb46c 1779333 main/binary-amd64/Packages.gz - f9f2c23454c2e8d6b87cc65fc475900f 1383205 main/binary-amd64/Packages.bz2 - 09580d75756d0f4cd0343f53691c3a4b 1745634 main/binary-armel/Packages.gz - 0f3bb1f3481bbe12becbcb62876f4d06 95 main/binary-armel/Release - 56211cfabf8b74c999889e0d8c4b5cb4 1364526 main/binary-armel/Packages.bz2 - 2262cb384a0410cb32fa089ab85c1861 8473939 main/binary-armel/Packages - 02ee6eaffeb82c5a0051d495243c0165 94 main/binary-i386/Release - fbfcc35c9e642741a40a63a8cb0d5b39 1386205 main/binary-i386/Packages.bz2 - 502b8fbc56a4bcdd272e11d727e2de0b 1781497 main/binary-i386/Packages.gz - ecb6df4bd14586805082f2aa058307f8 8598110 main/binary-i386/Packages - 00a198754dfa49cf90bee9533b1cb3c9 1749837 main/binary-ia64/Packages.gz - debc1f8d004805ca20a9e0c0cb7e53f4 94 main/binary-ia64/Release - b0ff38246c5ee190d6e92a0618467695 8376166 main/binary-ia64/Packages - 2ca54f3877e5863651c58cd8465119a2 1367515 main/binary-ia64/Packages.bz2 - 34aede40849ea57b327c2486d2c604bf 8452314 main/binary-powerpc/Packages - 9745d87928ef9bb7ba56b5a0cd72b508 1763576 main/binary-powerpc/Packages.gz - 76753ca0dafa51daf2af2311887e4cf6 1376781 main/binary-powerpc/Packages.bz2 - fa9ebe24d4041f3d0482a84bc4a77daa 97 main/binary-powerpc/Release - 8945d7fb7db49e988aadf9ec07afee20 95 main/binary-sparc/Release - 0870b5da7fc4473f0ab009b946b2b23e 8403646 main/binary-sparc/Packages - a29f3f6b2a7b3c6db5c8759715b9d22f 1751944 main/binary-sparc/Packages.gz - 84f6441e0c5b84f31a2518e7edff0584 1369305 main/binary-sparc/Packages.bz2 - 512891c937587bb661cbd1b2c28127b1 52614 main/debian-installer/binary-amd64/Packages.gz - e3d4e27e3e9dd92e3cd67932f7a02f95 194115 main/debian-installer/binary-amd64/Packages - b0d4d9417d54a61753c9ab72b9c4a426 41737 main/debian-installer/binary-amd64/Packages.bz2 - e381d0db9e08775e40c5e53c5a0c1bb6 48196 main/debian-installer/binary-armel/Packages.bz2 - 920b2c4e97595fe2e5322ee84623a520 240037 main/debian-installer/binary-armel/Packages - 6824f830e30eac71b098ad2f987849eb 61654 main/debian-installer/binary-armel/Packages.gz - 4b783ed689041e93ce244976fc8bf104 45218 main/debian-installer/binary-i386/Packages.bz2 - 0c109aedf9e30668918c04891ade055b 218503 main/debian-installer/binary-i386/Packages - b428375f81f26fabcd60909ebc8ded6a 57235 main/debian-installer/binary-i386/Packages.gz - fabcbe9f726b90890909f02d4770d93b 187978 main/debian-installer/binary-ia64/Packages - e180f619659319ef54443880dfca9a8d 40723 main/debian-installer/binary-ia64/Packages.bz2 - f77338adedabfa027e6fafee0a1f22c4 51277 main/debian-installer/binary-ia64/Packages.gz - 6956168dbe8aecb361ac8fb2c3523333 57286 main/debian-installer/binary-powerpc/Packages.gz - 69fb2151b4ef63421dc434f25a9d82d8 217930 main/debian-installer/binary-powerpc/Packages - 19629074b8fed56f077a64e583ff4357 45144 main/debian-installer/binary-powerpc/Packages.bz2 - 61e472da5f878fa1aa2bfec7e40c52e6 187015 main/debian-installer/binary-sparc/Packages - 639835fb68050e9d17fd633d7e122ae2 51128 main/debian-installer/binary-sparc/Packages.gz - a2a3b00bc22d6b16347bee3b27c6d350 40671 main/debian-installer/binary-sparc/Packages.bz2 - 3111853af865b457b47cc0d4866b4907 658637 main/source/Sources.bz2 - 0ac7ebf71aaa9cc50104689189546e14 96 main/source/Release - 258a409d99f5c2001ab3976e8172efab 3245836 main/source/Sources - 6cd4edf935e55c59d1528f7c2389083a 833999 main/source/Sources.gz - fe9ce1ec5e6f46e8552d1b22b7678b1f 101 multiverse/binary-amd64/Release - b95a2dbb67c58328150461c5233927be 175917 multiverse/binary-amd64/Packages.bz2 - 8e550e7fce8fd780b5b2728f0b2b35e4 227377 multiverse/binary-amd64/Packages.gz - dc30e52e09fee6aec7ddd0f6a2c30f98 835855 multiverse/binary-amd64/Packages - e574e8b9b78a7064fbc451235e79e052 207550 multiverse/binary-armel/Packages.gz - b531c1ee652cdf66f9af846e8ba1e271 101 multiverse/binary-armel/Release - 5ea29c69cbd7e6a5ab7dd35ecf305031 753469 multiverse/binary-armel/Packages - 77c3148ae352ac14c388af94c82c71c9 159689 multiverse/binary-armel/Packages.bz2 - 7a1bb639c034b4d2db39a1795cfba84c 851731 multiverse/binary-i386/Packages - 52682ca95aa197a2402c3e3c00098210 232339 multiverse/binary-i386/Packages.gz - dd95741316cdfa7cd4f5c66d6635d621 179690 multiverse/binary-i386/Packages.bz2 - 7d71f89143cdceb5a51b2cb7bbe94067 100 multiverse/binary-i386/Release - 0b1026b97ba81845e4848a9034fd0b18 207960 multiverse/binary-ia64/Packages.gz - f30e9a2f48494f92475ad13ea866ae12 100 multiverse/binary-ia64/Release - d7035ec9075e53ded70494f76b75a782 159999 multiverse/binary-ia64/Packages.bz2 - 169b24bce02afc4be82ab11df2d1d5d9 748797 multiverse/binary-ia64/Packages - 5f781b642b28d798cdb9aa37ff63840d 212591 multiverse/binary-powerpc/Packages.gz - dbb7a4112d6a1a78208926da5fd1b1ea 103 multiverse/binary-powerpc/Release - 7e645fa0e439526e1bb697490c2d0385 770869 multiverse/binary-powerpc/Packages - 242c17c74ecbe8ea7c8b5b8ab4212ec1 163220 multiverse/binary-powerpc/Packages.bz2 - 9b4e85b0281d1678f2b7a101913ef5f3 743247 multiverse/binary-sparc/Packages - 5d97ce26cb71152fc164ff2ecbe26764 206433 multiverse/binary-sparc/Packages.gz - 50605cf89a99830ba3954051d8b999d3 101 multiverse/binary-sparc/Release - 453a96aa6e35699e51daced713c1064d 158888 multiverse/binary-sparc/Packages.bz2 - d41d8cd98f00b204e9800998ecf8427e 0 multiverse/debian-installer/binary-amd64/Packages - 4a4dd3598707603b3f76a2378a4504aa 20 multiverse/debian-installer/binary-amd64/Packages.gz - 4059d198768f9f8dc9372dc1c54bc3c3 14 multiverse/debian-installer/binary-amd64/Packages.bz2 - 4059d198768f9f8dc9372dc1c54bc3c3 14 multiverse/debian-installer/binary-armel/Packages.bz2 - d41d8cd98f00b204e9800998ecf8427e 0 multiverse/debian-installer/binary-armel/Packages - 4a4dd3598707603b3f76a2378a4504aa 20 multiverse/debian-installer/binary-armel/Packages.gz - 4a4dd3598707603b3f76a2378a4504aa 20 multiverse/debian-installer/binary-i386/Packages.gz - 4059d198768f9f8dc9372dc1c54bc3c3 14 multiverse/debian-installer/binary-i386/Packages.bz2 - d41d8cd98f00b204e9800998ecf8427e 0 multiverse/debian-installer/binary-i386/Packages - d41d8cd98f00b204e9800998ecf8427e 0 multiverse/debian-installer/binary-ia64/Packages - 4a4dd3598707603b3f76a2378a4504aa 20 multiverse/debian-installer/binary-ia64/Packages.gz - 4059d198768f9f8dc9372dc1c54bc3c3 14 multiverse/debian-installer/binary-ia64/Packages.bz2 - 4059d198768f9f8dc9372dc1c54bc3c3 14 multiverse/debian-installer/binary-powerpc/Packages.bz2 - d41d8cd98f00b204e9800998ecf8427e 0 multiverse/debian-installer/binary-powerpc/Packages - 4a4dd3598707603b3f76a2378a4504aa 20 multiverse/debian-installer/binary-powerpc/Packages.gz - 4059d198768f9f8dc9372dc1c54bc3c3 14 multiverse/debian-installer/binary-sparc/Packages.bz2 - 4a4dd3598707603b3f76a2378a4504aa 20 multiverse/debian-installer/binary-sparc/Packages.gz - d41d8cd98f00b204e9800998ecf8427e 0 multiverse/debian-installer/binary-sparc/Packages - 959a79dfcd36a637e33a4c4a4272ddc2 118837 multiverse/source/Sources.bz2 - c4f25c5713edb0775f5ee874de7ecf8b 504210 multiverse/source/Sources - 7e7a923c60e6990894afafdf5f56c441 145577 multiverse/source/Sources.gz - de076a69842b27e8305a41cc2a1b5494 102 multiverse/source/Release - 2a58b5f9f401ce3b497ff037f03c57a9 6149 restricted/binary-amd64/Packages.gz - 9ada66fa37a2c5307c191ca31c54b6ba 29002 restricted/binary-amd64/Packages - 1c91fce3fe0f345f6a78dafde1ae5838 101 restricted/binary-amd64/Release - 80a06e61bc510cd48c1ea29f40459aa2 6193 restricted/binary-amd64/Packages.bz2 - 5a748a5b7452fe41791c9a6bd758a5a9 508 restricted/binary-armel/Packages.gz - 73798a2780cb27b88a78b3afa3b89064 564 restricted/binary-armel/Packages.bz2 - 0d98b95cb712acfb81ccdeb02a92c2b0 101 restricted/binary-armel/Release - e86508f46fea90bd580672fdbcdc09d1 800 restricted/binary-armel/Packages - c55cc3ce43bf43370f87585e99966088 6133 restricted/binary-i386/Packages.gz - 59773390a87a4cc9fbbb5ac926c4d210 100 restricted/binary-i386/Release - ce51522712c441e2e7502731b2e5e619 28922 restricted/binary-i386/Packages - 4d8fcb65027b852b5cf9f4932e895b40 6208 restricted/binary-i386/Packages.bz2 - b9f1ed2ebbfa6a5a69fccdf1d3ab14c3 552 restricted/binary-ia64/Packages.bz2 - 3fee0239ecc6f0dfb0d4a17a6d324025 100 restricted/binary-ia64/Release - 050afda3c921cb575e3342477e8ceb72 785 restricted/binary-ia64/Packages - 292e9bdd78f19a5f9f6c57a6b97735f2 497 restricted/binary-ia64/Packages.gz - b9f1ed2ebbfa6a5a69fccdf1d3ab14c3 552 restricted/binary-powerpc/Packages.bz2 - 292e9bdd78f19a5f9f6c57a6b97735f2 497 restricted/binary-powerpc/Packages.gz - 050afda3c921cb575e3342477e8ceb72 785 restricted/binary-powerpc/Packages - 5de3bdb3711e7e2ffae99c84a7c21fd9 103 restricted/binary-powerpc/Release - 050afda3c921cb575e3342477e8ceb72 785 restricted/binary-sparc/Packages - 779a982005aebbee2673f8b84ca2e58e 101 restricted/binary-sparc/Release - b9f1ed2ebbfa6a5a69fccdf1d3ab14c3 552 restricted/binary-sparc/Packages.bz2 - 292e9bdd78f19a5f9f6c57a6b97735f2 497 restricted/binary-sparc/Packages.gz - d41d8cd98f00b204e9800998ecf8427e 0 restricted/debian-installer/binary-amd64/Packages - 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/debian-installer/binary-amd64/Packages.bz2 - 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-amd64/Packages.gz - 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-armel/Packages.gz - 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/debian-installer/binary-armel/Packages.bz2 - d41d8cd98f00b204e9800998ecf8427e 0 restricted/debian-installer/binary-armel/Packages - 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/debian-installer/binary-i386/Packages.bz2 - d41d8cd98f00b204e9800998ecf8427e 0 restricted/debian-installer/binary-i386/Packages - 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-i386/Packages.gz - 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-ia64/Packages.gz - d41d8cd98f00b204e9800998ecf8427e 0 restricted/debian-installer/binary-ia64/Packages - 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/debian-installer/binary-ia64/Packages.bz2 - 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-powerpc/Packages.gz - 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/debian-installer/binary-powerpc/Packages.bz2 - d41d8cd98f00b204e9800998ecf8427e 0 restricted/debian-installer/binary-powerpc/Packages - 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-sparc/Packages.gz - 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/debian-installer/binary-sparc/Packages.bz2 - d41d8cd98f00b204e9800998ecf8427e 0 restricted/debian-installer/binary-sparc/Packages - f2cd687f11c70abba7940c24bcb4685f 102 restricted/source/Release - 70148e2c94601b4e95d417a778750064 11670 restricted/source/Sources - b25d38c741031508511330eae8abac6f 3580 restricted/source/Sources.gz - a9746d4c9e33047b60053306d53a4f23 3775 restricted/source/Sources.bz2 - 9c26c9c75692283aff056a34c06832be 99 universe/binary-amd64/Release - 84ad9bcb434b1902d86ff7731373d60f 26734222 universe/binary-amd64/Packages - 90ad8bbc89998eebceb5908742485e24 5429539 universe/binary-amd64/Packages.bz2 - f97e4ad162362d0c48fc078c80fa5714 7015632 universe/binary-amd64/Packages.gz - b5c1317d3ae8ece7ebcdea356ebb5bd2 26046136 universe/binary-armel/Packages - 36bbe68ff5d91a3c0f1f023ee1e17225 6835261 universe/binary-armel/Packages.gz - dc4fcf07e1c75ed7aba07e416e052a2b 5286781 universe/binary-armel/Packages.bz2 - 7ba67813445ef78665e958d180efc463 99 universe/binary-armel/Release - 440ac1381a41382a61f28314781d7f70 26807886 universe/binary-i386/Packages - 4534442a923839dc35c16e5da38443b2 98 universe/binary-i386/Release - 2a1b4c6af98dc2cdddd80cb4f4f84925 7039759 universe/binary-i386/Packages.gz - a9d5744f0fb56bc9cbb760e6fae4791b 5447752 universe/binary-i386/Packages.bz2 - dbe5b6e4d60c6e9171c36c80063f106a 6875622 universe/binary-ia64/Packages.gz - d32bc23428d5f818c386ced966d4fe61 98 universe/binary-ia64/Release - e9be03465de48358db19bcc22fda853a 26078621 universe/binary-ia64/Packages - 80143f065ff5a832cbef92c7d28b3e69 5310527 universe/binary-ia64/Packages.bz2 - 728818d0435620d26dc3d3bc40d1f79b 6970013 universe/binary-powerpc/Packages.gz - 49eae894dae7b47ca436d20c5239679a 5394194 universe/binary-powerpc/Packages.bz2 - c2cce270e52324ff855a68c440d67aa6 101 universe/binary-powerpc/Release - 3011b896db892d93991bb90335c41d97 26605550 universe/binary-powerpc/Packages - 5e8ea09bb3da45ab70ba79765ea51a53 26213750 universe/binary-sparc/Packages - da35454d2a5e760d58917f2140e06c51 99 universe/binary-sparc/Release - 38bf210fa330f3a8e32d69f6a860c654 6888044 universe/binary-sparc/Packages.gz - 79a835c2a012e415fd0221769689633a 5330271 universe/binary-sparc/Packages.bz2 - 708a6eac0586dec1a0df7fccf754efbd 10279 universe/debian-installer/binary-amd64/Packages.bz2 - 41c9635c5b62eb6d12335b36bb64a30a 40037 universe/debian-installer/binary-amd64/Packages - f9f9d9fbbfbe5b68b20bbd5c9bf8d8ad 11317 universe/debian-installer/binary-amd64/Packages.gz - c98aa6c4565c550999e13e7d0be801cb 11433 universe/debian-installer/binary-armel/Packages.gz - 927759d7ed4d2212aa2921cc90704518 10385 universe/debian-installer/binary-armel/Packages.bz2 - b1d511c779b4466607678166df24e57a 40286 universe/debian-installer/binary-armel/Packages - 22164611619cb5c20b376c213966b1fe 11295 universe/debian-installer/binary-i386/Packages.gz - 0537826c0b4eed76110ec5fc65945291 39992 universe/debian-installer/binary-i386/Packages - 1daeee7fc0714ff61f7cf949dc3fccbf 10272 universe/debian-installer/binary-i386/Packages.bz2 - a93cad53c636b8c4804096f2cf457ac6 39417 universe/debian-installer/binary-ia64/Packages - 31b79f8461c67c025b1e99bdd3bdfb01 10107 universe/debian-installer/binary-ia64/Packages.bz2 - 087ce5ddf3c4c3d2e13912d88c1d26e4 11132 universe/debian-installer/binary-ia64/Packages.gz - db1ef05501122f801bfcfb173dacd004 40531 universe/debian-installer/binary-powerpc/Packages - c91f2f3e93442829c34ad5c9dc8a5794 10312 universe/debian-installer/binary-powerpc/Packages.bz2 - f10d6b1ba731af4d95713ca71037602e 11362 universe/debian-installer/binary-powerpc/Packages.gz - 32dcceb6bda996b37977c49655ae44b0 10745 universe/debian-installer/binary-sparc/Packages.gz - 0244a354219eab9c3d239a476e499b28 9806 universe/debian-installer/binary-sparc/Packages.bz2 - f021081c462677c5eb85d8f8aad0614f 38126 universe/debian-installer/binary-sparc/Packages - 77ac41ac5ab3874a90dd3428a62dc208 3165115 universe/source/Sources.bz2 - 5fdd4e7e57846a19231d67c83698ea7f 100 universe/source/Release - 20ff3fcb5a8b98cee97a8fd4896b7f71 13888852 universe/source/Sources - ddc2c3af2379e6b5db9e64034e785e43 4005968 universe/source/Sources.gz -SHA1: - 7ae7b9bd7b9e3e9a00c3e0d6e11fb92a4204e809 8595099 main/binary-amd64/Packages - c8f3569f4de5e08299ba17814cb6d54a0e2cec3b 95 main/binary-amd64/Release - 7968e646f3bd4e9ec464922e1a37485413dbacff 1779333 main/binary-amd64/Packages.gz - bec1c81bf8fe1decff797c0a381c65cd35c46fcd 1383205 main/binary-amd64/Packages.bz2 - 7601de3d722e78e552e777f71767b068fb9665c3 1745634 main/binary-armel/Packages.gz - e1de20f6f548086f8ba27c6f5c0253e3432dc34e 95 main/binary-armel/Release - 1ba5ab49bb61c2e0fe34ef7e147cba1b2ce21381 1364526 main/binary-armel/Packages.bz2 - 53e0cee31860baea3b5d7a901317c9243e3e5fad 8473939 main/binary-armel/Packages - 69f0fdfed70fe61502e551f135248d8629885b89 94 main/binary-i386/Release - a75cb84f1ee9d7f317a7052ade84358e7019bce6 1386205 main/binary-i386/Packages.bz2 - e02d6f643910601bcccafe1d89879d900302eba4 1781497 main/binary-i386/Packages.gz - 9869eec1930a5750e5c4628d4db9bad62ecd0985 8598110 main/binary-i386/Packages - 3b08e7a4945326914dd738bf84121762849aa4f7 1749837 main/binary-ia64/Packages.gz - aedeeae95a406e1b9a6782c9156b268a073c443e 94 main/binary-ia64/Release - cc4e3feb05f6d1c0065d6820ee30f3eef9c24cc3 8376166 main/binary-ia64/Packages - 2bfc579fd1dba59cf59050e1aba01ad31fa4f85e 1367515 main/binary-ia64/Packages.bz2 - 82e4685e309ca46d13208ab6b65e6881821b16f7 8452314 main/binary-powerpc/Packages - 96b56a0b3a126ef4ad70a6f77ab33abeed900c3b 1763576 main/binary-powerpc/Packages.gz - 713055823a0a91c3e4d310037274c2a0c61880d7 1376781 main/binary-powerpc/Packages.bz2 - ada8a0a3645c87cb029d513a1af951ec0c8be68f 97 main/binary-powerpc/Release - 0f54881a75bca93e5a0399c3d3cfd12066807d89 95 main/binary-sparc/Release - 38328e905d3bed3c93885d32e3893898820d92ae 8403646 main/binary-sparc/Packages - 5af855acdfc08bc8609ffa85edbca28f837f5bfb 1751944 main/binary-sparc/Packages.gz - 26a9e3789c137c12b1a25d095ccaf37e04ce383a 1369305 main/binary-sparc/Packages.bz2 - 9c6f18b155d2e778c4fb96b1dd31b8012a8efc13 52614 main/debian-installer/binary-amd64/Packages.gz - 4730bced42d2edbf9b8d64cb21449f2937bfbdee 194115 main/debian-installer/binary-amd64/Packages - ca0d953ccce11e2e66161fcade3291db907244e6 41737 main/debian-installer/binary-amd64/Packages.bz2 - ec9013f35737077e6b03df7e08f7d0b90ea02a52 48196 main/debian-installer/binary-armel/Packages.bz2 - 6ec82c03d365c53f9f1a41fb316eb1b3db262b86 240037 main/debian-installer/binary-armel/Packages - deec4dac63930bc10fef7bc6e2fe77af5f19c503 61654 main/debian-installer/binary-armel/Packages.gz - c75a9cbdeb0e7f70ea18d34e1d3e160ecf2017b6 45218 main/debian-installer/binary-i386/Packages.bz2 - 1babace3eaf8b21c6be2623acb7b245e5aa1c66f 218503 main/debian-installer/binary-i386/Packages - d5f0bec30483507d49e9cf9d0f507d3465fc3571 57235 main/debian-installer/binary-i386/Packages.gz - 94b164867413b70fa163323be77d48eae31bb235 187978 main/debian-installer/binary-ia64/Packages - e836fd2d93c75a4f3f38eb63ef7946da2a2b9bf9 40723 main/debian-installer/binary-ia64/Packages.bz2 - 154004bcc1ecd701609b74ca18d43c9cd45786d3 51277 main/debian-installer/binary-ia64/Packages.gz - 84d2cf927fc177a07781c27e5f4f7f9a91582391 57286 main/debian-installer/binary-powerpc/Packages.gz - c779e3b0c28227656bee6fe3e10251550f7064fd 217930 main/debian-installer/binary-powerpc/Packages - 7147267f238a5b4cd938001c82b2f075da0d0ef0 45144 main/debian-installer/binary-powerpc/Packages.bz2 - 60323ae1cba1baad32c37b325e5729ff62d5686a 187015 main/debian-installer/binary-sparc/Packages - 3cdfbfd262eb7ee36aa362be193de347fa616e7b 51128 main/debian-installer/binary-sparc/Packages.gz - 8fbae613d3355087bdc362e50b90628fcd53fdec 40671 main/debian-installer/binary-sparc/Packages.bz2 - 110033d50f7923aa8fe28862600cb6e1e15ecbed 658637 main/source/Sources.bz2 - c1b38d584a15e3b6a325e9bb24225551671a930e 96 main/source/Release - a08ec53806d19f2447c415faaa9524a2f1d508a7 3245836 main/source/Sources - e4e6cc3def7544373c1a94996a0bb5e54f6343b6 833999 main/source/Sources.gz - 077ee491dd77119834677584e5c797386f0067c3 101 multiverse/binary-amd64/Release - 39e7f34d9aa97c50f3b7a43e2256d49d3b0ee215 175917 multiverse/binary-amd64/Packages.bz2 - 76ae3b9445c24d00bc49cbe21b1b0fd820821f97 227377 multiverse/binary-amd64/Packages.gz - 08fca1957fdb78be3b80ac0db4d19fceec0812df 835855 multiverse/binary-amd64/Packages - 5f5ad6b33880ad28fd3e06d320476708ddb5cb6b 207550 multiverse/binary-armel/Packages.gz - cd42148b977ad0060a19c8fb13c4166112769e9d 101 multiverse/binary-armel/Release - 03c40e07d2940af4a728a5538d637406bc784072 753469 multiverse/binary-armel/Packages - 225a272b71fb2e416c476f27ad7ec09a56fb4db5 159689 multiverse/binary-armel/Packages.bz2 - 64af8d4cf482e1b03adacd9b00667fa8d647bd0a 851731 multiverse/binary-i386/Packages - 5316c8a4732585597e96dfe11adce6b760a65cf4 232339 multiverse/binary-i386/Packages.gz - 7dee83d02cab4e00258cc7063f9d27413dc938a0 179690 multiverse/binary-i386/Packages.bz2 - de42412e1076c663f80d37bb13cc0b8b9f9d097b 100 multiverse/binary-i386/Release - e1a973d20bb33b2b30f8c0e30fd65f00d124ad9d 207960 multiverse/binary-ia64/Packages.gz - f5fcc3eb752485e9740864ab66270ed377070af5 100 multiverse/binary-ia64/Release - 8257d383d822e7fff9339233a9f95c19fe67c53f 159999 multiverse/binary-ia64/Packages.bz2 - 2f3a2507f6cc2460beb11abbff443e0f2cf198d9 748797 multiverse/binary-ia64/Packages - f1b69cc124124d079dc51b0acb659b900a6bc87e 212591 multiverse/binary-powerpc/Packages.gz - ac08d9fda1eea8768e8cb9f8b58fa9ea943506ed 103 multiverse/binary-powerpc/Release - 424703252457f85d2b0fb0c9e33673832d1cfa9f 770869 multiverse/binary-powerpc/Packages - 7c27673812abd9266319bd1da36af0bb3690bed7 163220 multiverse/binary-powerpc/Packages.bz2 - 5efdd7234bd01d893aa6b26b8d493fe6d871e6b7 743247 multiverse/binary-sparc/Packages - e1d10955a14fccb1f7a36bd11cef373bd229747b 206433 multiverse/binary-sparc/Packages.gz - 2a749f5831be518b889e1e40d485ffdedc33ea75 101 multiverse/binary-sparc/Release - f4246bb6b984855c886f9d369a4c2dccc0787e33 158888 multiverse/binary-sparc/Packages.bz2 - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 multiverse/debian-installer/binary-amd64/Packages - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 multiverse/debian-installer/binary-amd64/Packages.gz - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 multiverse/debian-installer/binary-amd64/Packages.bz2 - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 multiverse/debian-installer/binary-armel/Packages.bz2 - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 multiverse/debian-installer/binary-armel/Packages - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 multiverse/debian-installer/binary-armel/Packages.gz - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 multiverse/debian-installer/binary-i386/Packages.gz - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 multiverse/debian-installer/binary-i386/Packages.bz2 - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 multiverse/debian-installer/binary-i386/Packages - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 multiverse/debian-installer/binary-ia64/Packages - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 multiverse/debian-installer/binary-ia64/Packages.gz - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 multiverse/debian-installer/binary-ia64/Packages.bz2 - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 multiverse/debian-installer/binary-powerpc/Packages.bz2 - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 multiverse/debian-installer/binary-powerpc/Packages - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 multiverse/debian-installer/binary-powerpc/Packages.gz - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 multiverse/debian-installer/binary-sparc/Packages.bz2 - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 multiverse/debian-installer/binary-sparc/Packages.gz - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 multiverse/debian-installer/binary-sparc/Packages - 03c8d1834b04908b1a661358c65105af4ecc6144 118837 multiverse/source/Sources.bz2 - 50066293103de0c0e254859f8769e183a1c68800 504210 multiverse/source/Sources - 1e06ad4e662efc0134018f3cb598b028d8fb92d9 145577 multiverse/source/Sources.gz - 6123b6f8cb9a3c22c9cc9ea10126b80e37b94728 102 multiverse/source/Release - 4f49a42877a9c6a94abd82362a789eed67ebf600 6149 restricted/binary-amd64/Packages.gz - 85d50a0dba3b242ea890ef74fed0c238be1cfbce 29002 restricted/binary-amd64/Packages - f9fbd359de363fc018e85827f7d6131c59dffc8e 101 restricted/binary-amd64/Release - 67c73a89dd0cb198c686f3ddb61424cb1fca289b 6193 restricted/binary-amd64/Packages.bz2 - 7acf3fb7afe9631f1b84382a4becb19de07abc54 508 restricted/binary-armel/Packages.gz - f478034ddac7e6745a5228fcbbfb7f24a5c2f2c3 564 restricted/binary-armel/Packages.bz2 - 77d75fd4552d29162e4c9efc53785c66bbaf70e7 101 restricted/binary-armel/Release - 5a28100038feaa965140b29a9b40f66fb86e495f 800 restricted/binary-armel/Packages - 7da5efb15ca935a82f1a7ef03eb0ad00da9786e7 6133 restricted/binary-i386/Packages.gz - 4396ba67a008e2a06964f1507e92cbfc8884aa12 100 restricted/binary-i386/Release - fa5b24ebc047661f49c9c009844ee788be57f4cd 28922 restricted/binary-i386/Packages - aa15907469577a5b45e10769cd81fce21011f6a9 6208 restricted/binary-i386/Packages.bz2 - 83604e18eb0a8c2941b7957db1400e838984a047 552 restricted/binary-ia64/Packages.bz2 - 71afe17dbbe5060fc1730e2f72513ddd58ee2436 100 restricted/binary-ia64/Release - b51b94b51bf0d8bee15320f0bb84409183c80dd1 785 restricted/binary-ia64/Packages - 4800105c385bc9460de4d196200915d198095606 497 restricted/binary-ia64/Packages.gz - 83604e18eb0a8c2941b7957db1400e838984a047 552 restricted/binary-powerpc/Packages.bz2 - 4800105c385bc9460de4d196200915d198095606 497 restricted/binary-powerpc/Packages.gz - b51b94b51bf0d8bee15320f0bb84409183c80dd1 785 restricted/binary-powerpc/Packages - 51e31e7b621940e90264478b598885e651c45b30 103 restricted/binary-powerpc/Release - b51b94b51bf0d8bee15320f0bb84409183c80dd1 785 restricted/binary-sparc/Packages - 9cd8cb04e51eb6541605e2bbd029638bff43e783 101 restricted/binary-sparc/Release - 83604e18eb0a8c2941b7957db1400e838984a047 552 restricted/binary-sparc/Packages.bz2 - 4800105c385bc9460de4d196200915d198095606 497 restricted/binary-sparc/Packages.gz - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/debian-installer/binary-amd64/Packages - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/debian-installer/binary-amd64/Packages.bz2 - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-amd64/Packages.gz - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-armel/Packages.gz - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/debian-installer/binary-armel/Packages.bz2 - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/debian-installer/binary-armel/Packages - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/debian-installer/binary-i386/Packages.bz2 - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/debian-installer/binary-i386/Packages - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-i386/Packages.gz - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-ia64/Packages.gz - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/debian-installer/binary-ia64/Packages - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/debian-installer/binary-ia64/Packages.bz2 - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-powerpc/Packages.gz - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/debian-installer/binary-powerpc/Packages.bz2 - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/debian-installer/binary-powerpc/Packages - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-sparc/Packages.gz - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/debian-installer/binary-sparc/Packages.bz2 - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/debian-installer/binary-sparc/Packages - 5b3a4af81100cb227b9238a69b25fc25cdeb42ec 102 restricted/source/Release - 3bfdf4fd932e9908ef8251205567d6d26d283168 11670 restricted/source/Sources - 5c37fbe4a362494efde874d5872e2b1fc15bc606 3580 restricted/source/Sources.gz - 703bf2be8f5d6087fe20aa21e5054d6a8efc5597 3775 restricted/source/Sources.bz2 - f896ad18165f74ab4bcd24c33137ed3b2ce06e18 99 universe/binary-amd64/Release - 1cec7e1bb388d6940969a48e7674739a19d67059 26734222 universe/binary-amd64/Packages - 633ea2a481081d9dddff7ed012ab16cefb28bcc6 5429539 universe/binary-amd64/Packages.bz2 - 3e52fa81f47aa2ad4d89771328a09c983fbc3b1e 7015632 universe/binary-amd64/Packages.gz - 7180e92f118a94925c0ed30925ef3fb09f2bf19d 26046136 universe/binary-armel/Packages - 0a2d7c5144d32242c2677eb479f04437aae4b6b7 6835261 universe/binary-armel/Packages.gz - c4fe43171c7233904fa7bac03ad4ee8cf4c9de72 5286781 universe/binary-armel/Packages.bz2 - 0e727b1255a57024b50aafd0e8b3ed42be198232 99 universe/binary-armel/Release - 22f956546f1332b3b605a05b5c602f9c587f2df9 26807886 universe/binary-i386/Packages - b96285c6cc352c28c5438d3f59d40e354d4517d6 98 universe/binary-i386/Release - 04a0bbbec6affceef68a84e21fbf82550d184a53 7039759 universe/binary-i386/Packages.gz - 1459562af31bbe61c14a43cfaa5c102de07c926d 5447752 universe/binary-i386/Packages.bz2 - e95d276f362fd76e844bb23219de997397df2635 6875622 universe/binary-ia64/Packages.gz - b74031274d253d4c1f23b3b4cd9d2080678e0478 98 universe/binary-ia64/Release - d6800281a9200b9645f74ec39a45bb9f5dc96785 26078621 universe/binary-ia64/Packages - ffbf666fe03528367d8bd54a899031c098f14169 5310527 universe/binary-ia64/Packages.bz2 - 3289e39a84e56c8da45666400b516bfb6ee2de6a 6970013 universe/binary-powerpc/Packages.gz - 4ea38ae66e871822d0cb63353cbe58ed8f14774c 5394194 universe/binary-powerpc/Packages.bz2 - 980ad1e26d7adeada83902d69b1ce9e3bce73011 101 universe/binary-powerpc/Release - a42810bcc05c3dcb5f8d4e5186628a1d95b6024a 26605550 universe/binary-powerpc/Packages - 9ae7cb9ae631b74ec80852e252ec67de5659f538 26213750 universe/binary-sparc/Packages - 18ecb1320ca83fb6bcce7a74480274db15fd1899 99 universe/binary-sparc/Release - 17c0747438ea66d10b1685d5486390c4e88e7dcd 6888044 universe/binary-sparc/Packages.gz - bc6c79da4f8b4e067d42b46fa1615343d5950430 5330271 universe/binary-sparc/Packages.bz2 - 2ba2eba329a282f7d16e4e34ae19947cb0779250 10279 universe/debian-installer/binary-amd64/Packages.bz2 - 4fe4a79666a266de45e96e475844506e5599f70a 40037 universe/debian-installer/binary-amd64/Packages - e6fcf2d30120929d951ce9cf66077a7705e724e3 11317 universe/debian-installer/binary-amd64/Packages.gz - a45ade999c3f36e4c4538939d2f05b4bf96b2dd2 11433 universe/debian-installer/binary-armel/Packages.gz - 157d9031a835d8c3ad957cfc97355ddfa032612b 10385 universe/debian-installer/binary-armel/Packages.bz2 - 5a2d26293b36f9ad73af733fbc102c69c317bc64 40286 universe/debian-installer/binary-armel/Packages - c2e0459dc5efcdb72df3f3e92354852cc72cb97c 11295 universe/debian-installer/binary-i386/Packages.gz - 3b12120229d09fcc698e046f9a494904752c4a1b 39992 universe/debian-installer/binary-i386/Packages - 7da8a850e5cc52cf1c06ee447cea4e4a5dea47a7 10272 universe/debian-installer/binary-i386/Packages.bz2 - 7d82e5982c08664fb41ec0472aa8779641d096ba 39417 universe/debian-installer/binary-ia64/Packages - 681013193075cb571a0c969fa8c2b9cda3f951d6 10107 universe/debian-installer/binary-ia64/Packages.bz2 - e16ecd26921377195839261281ce80343332f1f7 11132 universe/debian-installer/binary-ia64/Packages.gz - cb15233789965d6a47725b8ac97bf392a163ae36 40531 universe/debian-installer/binary-powerpc/Packages - e25fc309c3c071b78cc47e5e36ae20ccdfa7d04e 10312 universe/debian-installer/binary-powerpc/Packages.bz2 - e222ce065a084904998d317d3b95b768c98c60ad 11362 universe/debian-installer/binary-powerpc/Packages.gz - 73ad5adf388ceee09e7abedd1e3f831065f0bad7 10745 universe/debian-installer/binary-sparc/Packages.gz - 61347da1b6402a667bf9aa74ec090132dfab432f 9806 universe/debian-installer/binary-sparc/Packages.bz2 - 5ede4011ad3f86269710bef5e92414f2195ab7ff 38126 universe/debian-installer/binary-sparc/Packages - d4d2ebead2066fa7cf6be60d016bf91f40b4393b 3165115 universe/source/Sources.bz2 - 4c474f118467127abd40ce7f1ebb748d8967ccec 100 universe/source/Release - 77f442df5c7996bc45ac89163c1be5ed5fcb8e7f 13888852 universe/source/Sources - b3d728b8eb46270d797399ce267d77ae9d443b2c 4005968 universe/source/Sources.gz -SHA256: - c2bc6c826107e16cd734fe13dca015ea130ffac0d3b2867475516b916f7f142c 8595099 main/binary-amd64/Packages - ba13d6e582ba2aedd6e530455a9174f841cbac3c74548fca9407abd1982eb17f 95 main/binary-amd64/Release - 9c26460c9e0d2dd1245ab37911f012a9f22efa783c15b90ca500b6456dc57176 1779333 main/binary-amd64/Packages.gz - 74a8f3192b0eda397d65316e0fa6cd34d5358dced41639e07d9f1047971bfef0 1383205 main/binary-amd64/Packages.bz2 - a891c41cd372484d095e843bbcc62690a855c2057a25ccd69a47b21302878c52 1745634 main/binary-armel/Packages.gz - cab89594b24d599cb42c2ef137fee2a6f20859c61085a89da5082d0078a3d351 95 main/binary-armel/Release - b50fbc091488f2614c65dc80567bffeaef2a85bed6b2b6ca1b17625f7db214e4 1364526 main/binary-armel/Packages.bz2 - f081c84051317f5bddc4ba797555ca9c7f5bdce6dfe78e05265acab696615465 8473939 main/binary-armel/Packages - 095f73f9d2fbbc1c1a84426708978959610be17282420ae96f426deb26d54009 94 main/binary-i386/Release - 0e46596202a68caa754dfe0883f46047525309880c492cdd5e2d0970fcf626aa 1386205 main/binary-i386/Packages.bz2 - d9093f83fd940fcaaf6e5388d1265904801ab70806f70c0a6056c8c727157817 1781497 main/binary-i386/Packages.gz - af50b1ab7763966ddbc81989515196615e341f8d502b8b5328cf04373552f751 8598110 main/binary-i386/Packages - 877fe4efcaf5821a7fde85f88bb90e5d2713ef1423f2dc88135f995a3ed8ee94 1749837 main/binary-ia64/Packages.gz - 6238908944ff783171dd50aba49489ec9ae181255a0a41c7880b379c26da83ce 94 main/binary-ia64/Release - 6f98d81f8417329a13ec9671095f95814086a51d8abecfb363b2c4771c749ce7 8376166 main/binary-ia64/Packages - e99488926d74a56ed050a35cf0892bc883e3b17861fd3f3c201ea7c09863f085 1367515 main/binary-ia64/Packages.bz2 - a2205ba53e1ce42240d0bca0690948e9cdd29fe444490ec13f3e8c4650bc288a 8452314 main/binary-powerpc/Packages - a3a36777dad5a62d86252a88bb46015240a704738ade19e824a3212c114a5457 1763576 main/binary-powerpc/Packages.gz - a1419109251400c948912ed3c0e095297f57225790a220a8428aa753fdbed420 1376781 main/binary-powerpc/Packages.bz2 - 2113e8c7599195894548b60f21b6a9df72410349d3889de9bafcb89f60d63668 97 main/binary-powerpc/Release - b29ea32ad6b36ac510bafb61d0a31388b655ffc040d9baa5671de036b5b39243 95 main/binary-sparc/Release - 11daa191617b295bd46f410fd63d19965d80964ab34afb6a5270ac05cdd11c99 8403646 main/binary-sparc/Packages - f477df15508ae627c8b2ffa0030b2c1210c8c708c76f542c998fd965d87788e1 1751944 main/binary-sparc/Packages.gz - d4ce8246990a2c3c289df94daaf187f43e5c3f126c3bd67fc3069a08ccb951d5 1369305 main/binary-sparc/Packages.bz2 - c7832eb191eb7fc19e19c13b2f03a92a221f2a39c2f4847d6eabc2b9d1597e28 52614 main/debian-installer/binary-amd64/Packages.gz - 192aa1d7a500399db73191903731467c8e94e793675ef83d005df00446cdfbd2 194115 main/debian-installer/binary-amd64/Packages - fba371229ca6853dd939abcd34b8f51c78042aa4fd77e13b00cf06fbdc10439d 41737 main/debian-installer/binary-amd64/Packages.bz2 - 241edd87db786d7528fddf8233f16ae0227a5455eb461f036d688305cd872c45 48196 main/debian-installer/binary-armel/Packages.bz2 - 1076ba4a5dc6c97ed5636cb076978b6935b58573d533498a217ee4b2cc2fd206 240037 main/debian-installer/binary-armel/Packages - 48f7c974794f5cb2e6fc2e9b740945a236168335b8f2366c1c10663d23027a4c 61654 main/debian-installer/binary-armel/Packages.gz - e6028d7bf8a3ceaa0f682977bb8642608180eb5a47f5ba8155cda89752b944fd 45218 main/debian-installer/binary-i386/Packages.bz2 - 0e78ab3fb61ab06e16db7c64acf87c3e17346817128733f1af22da51d9bd383b 218503 main/debian-installer/binary-i386/Packages - 777d616b33d466bc8fbd540487e91dce1f51214d60bb1e58677b26b414b3ba9b 57235 main/debian-installer/binary-i386/Packages.gz - 978319f0eee978f26faddd8048ef52e44ae646cca94a4a9713b2e2647a0a517a 187978 main/debian-installer/binary-ia64/Packages - 9b084ce3e5704145ef6adbf3a877b642175b04799199c685b94083129e24fc0a 40723 main/debian-installer/binary-ia64/Packages.bz2 - a8b2aadb6c019e5ede7c5ba4d5c44efe5a8a01c11400882fc4a25496446ad1f4 51277 main/debian-installer/binary-ia64/Packages.gz - 0576fd306950afe1af3981c5c988213de1f474efd087d7a6d648e35dc8e183ad 57286 main/debian-installer/binary-powerpc/Packages.gz - 295c4da5b30407662378f5b9c3cb933d2cdd9fd44d1e5386c081ed2145519688 217930 main/debian-installer/binary-powerpc/Packages - 46bfb47f5006851a8e1fc9cc5039464600acd442375b3679fa77a1201c99a24d 45144 main/debian-installer/binary-powerpc/Packages.bz2 - 3bae8c7b5f41ac0d2de1e91b7a4594cfe6db59072f42c92465834a085260b5ad 187015 main/debian-installer/binary-sparc/Packages - 11f374ea333deae3780bce1bc489de44f6d91e27e07c0846bf58ebbaf911d2b5 51128 main/debian-installer/binary-sparc/Packages.gz - cdb83137b2cfa34b44e958419b7498819cc8a3fe8459b22a1e350284d79bfc67 40671 main/debian-installer/binary-sparc/Packages.bz2 - 4959448f974f28c1c57140d1cb7c2ea9443b6cfb983fc280d96c5fa16e1f484e 658637 main/source/Sources.bz2 - edd3ca70acb2d2f47187631b6f75b628613b4ff59d83ff0d539e5812ae3775c9 96 main/source/Release - ab69451e2ce609d5ae3cc644e1837203b20ee46736dbdab907fc6d5e732744be 3245836 main/source/Sources - 0b74e2f05565d0f3ec543ead0f9ab35878ddacddbd4a761fc892704ca5c7a30a 833999 main/source/Sources.gz - 179c7efbf1c0e2c4b2871d14809c89f88128a0400d033564e5d54741cfe6eb47 101 multiverse/binary-amd64/Release - b59912293d9bdfd815f80409993ddf7f5120aff738367b7b337878f506f37e9d 175917 multiverse/binary-amd64/Packages.bz2 - 460d534bed0e898baa116d7b67d3361233af7113d8e62e9c0cb96e73aac2d433 227377 multiverse/binary-amd64/Packages.gz - 469bb92445c8b279014627a928fffce1431196613617abac86264fe4f120273d 835855 multiverse/binary-amd64/Packages - dbbc32343dcf6e5a83cbb09f2c72f0f99db7a46913ad117b12506c8cf9812036 207550 multiverse/binary-armel/Packages.gz - 10e603226d59054a8d48a6b32cee85767b3cea4a3aaf7ddd0c6bbcb646faaab9 101 multiverse/binary-armel/Release - e6174479f137d0fce925830dbdb0dce6eb23ddd862cc5114a0e94c267c01306b 753469 multiverse/binary-armel/Packages - fc9c79a63e83c7eaf10e09c7fd0c346ff8eb9424d4daed1d748db3e8a097b6ac 159689 multiverse/binary-armel/Packages.bz2 - 71de4e77a4cbd731add593b95a1fa68281d6125b41f5b305fca81bd03162846a 851731 multiverse/binary-i386/Packages - 6c831c512b20b9743d8e99146256efa77849494973a62d211aaeddaf857f5ec8 232339 multiverse/binary-i386/Packages.gz - a93877e59808eac52dec78b8275e6349e7e43ef87ca56c5dac293bfd66627c97 179690 multiverse/binary-i386/Packages.bz2 - 103ca72efb6233287b3efc96e0486599020eb7a56e889ac3948af93eae70d8df 100 multiverse/binary-i386/Release - 4661ffd1f6205fcff50258580236983f8f5682727c7dad08d3038802df23c8c6 207960 multiverse/binary-ia64/Packages.gz - b1537c932c7e3e0f8f2fcae67103559c0e28b332ab324c41a85dca45bf589b4a 100 multiverse/binary-ia64/Release - 5ba3c768600a3539f5b67b8c29f5eec0c23408d2355b22a6ae456973f46eca66 159999 multiverse/binary-ia64/Packages.bz2 - 2d4373e06db5d5e8b30b193b5245511df86546aa07d0b07999f2d9d7ad7e47ba 748797 multiverse/binary-ia64/Packages - 4f7f3ffa8ee9a1be3e366640bd84d9e1efe5ec6c115d222671e3b45fe8ec9400 212591 multiverse/binary-powerpc/Packages.gz - 4ddcaab8c7686ce317ace420f976cd08054d89c69e7bfa52c68a0fd70fdb8700 103 multiverse/binary-powerpc/Release - 0a0ffa9499591369e7894ccb965f065a2a0ccf1c7f087e30f0801225cfa0a78e 770869 multiverse/binary-powerpc/Packages - 25aad62d010a40d3f84c1205b1ea64da898858461911f598c2f1469d91fc0667 163220 multiverse/binary-powerpc/Packages.bz2 - fcdf8b83ce0a4b618a5ad00eda1c6eca18a00ff96c965e38e76e8b5ce1ac93e7 743247 multiverse/binary-sparc/Packages - dc22ee241e137fa896ed780f92f0de389bc817dc39ee40197802112d5175b6f5 206433 multiverse/binary-sparc/Packages.gz - 8be7a7df16dffcc4a2220c4313a5c7599c164aebc98051561c281987ded92cc7 101 multiverse/binary-sparc/Release - f94e77e221b55eee361617c4d69db999394eb6b1096618b042c3248390bd2d7c 158888 multiverse/binary-sparc/Packages.bz2 - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 multiverse/debian-installer/binary-amd64/Packages - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 multiverse/debian-installer/binary-amd64/Packages.gz - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 multiverse/debian-installer/binary-amd64/Packages.bz2 - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 multiverse/debian-installer/binary-armel/Packages.bz2 - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 multiverse/debian-installer/binary-armel/Packages - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 multiverse/debian-installer/binary-armel/Packages.gz - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 multiverse/debian-installer/binary-i386/Packages.gz - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 multiverse/debian-installer/binary-i386/Packages.bz2 - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 multiverse/debian-installer/binary-i386/Packages - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 multiverse/debian-installer/binary-ia64/Packages - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 multiverse/debian-installer/binary-ia64/Packages.gz - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 multiverse/debian-installer/binary-ia64/Packages.bz2 - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 multiverse/debian-installer/binary-powerpc/Packages.bz2 - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 multiverse/debian-installer/binary-powerpc/Packages - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 multiverse/debian-installer/binary-powerpc/Packages.gz - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 multiverse/debian-installer/binary-sparc/Packages.bz2 - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 multiverse/debian-installer/binary-sparc/Packages.gz - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 multiverse/debian-installer/binary-sparc/Packages - c59df461a11de72fab44064559bdf0f1493fb71d0d61c20670bffb431f8e2ed5 118837 multiverse/source/Sources.bz2 - 3d205ae91ab3570049adbfe851c8b3ab3154f094e54b6000c876ef9039dd2c02 504210 multiverse/source/Sources - 3b349aff645051214a77d18dbbddf69bba66aea8b361d9ecef4eaa7ce897396e 145577 multiverse/source/Sources.gz - 42f6c3881336d71362322c67ad19f843f720fbf4c14debd4ed1e9896c8c88368 102 multiverse/source/Release - a29af736e1ed0be3a393ae49da8d59acc3bfdd29a7e03268b3909b24e090bb37 6149 restricted/binary-amd64/Packages.gz - 7e9d838737868748f7b3dc34509a077e6f5b1f21910379b986d556ee2b308d5f 29002 restricted/binary-amd64/Packages - 04354c3017adf5bc36a93eeb9ed5a3f3e68d8192558a390f61f21d9a4ee9af55 101 restricted/binary-amd64/Release - 220c7475ccebc75767fd7deac35b0fde1e03e76b35ab58df9d7964a14db2febc 6193 restricted/binary-amd64/Packages.bz2 - c4d112b6591d08205ac5546a611eb1466b9e39341f7bb8540f91678a850e1fa4 508 restricted/binary-armel/Packages.gz - 9e7aa9da79e68b40a3247baa8e6b3d552b504cd9f46ba984c359ad5633b14e27 564 restricted/binary-armel/Packages.bz2 - 6c485ed27e825538bd420b048fdf44183bfe02e2fa3f0911683b67d4a598cf21 101 restricted/binary-armel/Release - c38b6bb37e32acf7d738fdb6e3a712030d5fbb37aac95f7804f38d23a692a7a5 800 restricted/binary-armel/Packages - 6ca65bb815a59e1e08acb42dfcd996b7cd48f5bf13a7d9b7115972bcc4557193 6133 restricted/binary-i386/Packages.gz - 26c6c737ad3b145710b745b918b661189e292732c2180e9e0eeee96683d8614f 100 restricted/binary-i386/Release - 5a1f3d9cd1dc4eff62b73d9e0cd0bfb96302a8aaba281b07ac99775f0624f162 28922 restricted/binary-i386/Packages - 6c6f1d1a557df1d38d438ba1932d9a05119365316a15ecf94e1eb367afae77ca 6208 restricted/binary-i386/Packages.bz2 - 80fe8677b9905014bb9c3de109d3a44a6f387991a27421d5e5f0abf5bdff426d 552 restricted/binary-ia64/Packages.bz2 - e944219f02b73d2565af6ee644d2941afc7d9a0e0342fb3ac89ec6b54e053775 100 restricted/binary-ia64/Release - f391f7c05313707e5634e4d519ba11da1547789c2ad9208c0de3ec7d46ba0263 785 restricted/binary-ia64/Packages - 38ecfafb509ea9daac5b38cb2f06993d2b57108565af0264760f546422faf1af 497 restricted/binary-ia64/Packages.gz - 80fe8677b9905014bb9c3de109d3a44a6f387991a27421d5e5f0abf5bdff426d 552 restricted/binary-powerpc/Packages.bz2 - 38ecfafb509ea9daac5b38cb2f06993d2b57108565af0264760f546422faf1af 497 restricted/binary-powerpc/Packages.gz - f391f7c05313707e5634e4d519ba11da1547789c2ad9208c0de3ec7d46ba0263 785 restricted/binary-powerpc/Packages - f5fa571a2c002209639eaaec9c66d3c60e3035b3430a7c3e3c8008606705b7d1 103 restricted/binary-powerpc/Release - f391f7c05313707e5634e4d519ba11da1547789c2ad9208c0de3ec7d46ba0263 785 restricted/binary-sparc/Packages - 9ace4eb586e77ba82f4963ff7d3576eabf7aefa07b56def57751730a183c38d5 101 restricted/binary-sparc/Release - 80fe8677b9905014bb9c3de109d3a44a6f387991a27421d5e5f0abf5bdff426d 552 restricted/binary-sparc/Packages.bz2 - 38ecfafb509ea9daac5b38cb2f06993d2b57108565af0264760f546422faf1af 497 restricted/binary-sparc/Packages.gz - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/debian-installer/binary-amd64/Packages - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/debian-installer/binary-amd64/Packages.bz2 - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-amd64/Packages.gz - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-armel/Packages.gz - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/debian-installer/binary-armel/Packages.bz2 - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/debian-installer/binary-armel/Packages - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/debian-installer/binary-i386/Packages.bz2 - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/debian-installer/binary-i386/Packages - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-i386/Packages.gz - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-ia64/Packages.gz - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/debian-installer/binary-ia64/Packages - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/debian-installer/binary-ia64/Packages.bz2 - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-powerpc/Packages.gz - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/debian-installer/binary-powerpc/Packages.bz2 - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/debian-installer/binary-powerpc/Packages - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-sparc/Packages.gz - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/debian-installer/binary-sparc/Packages.bz2 - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/debian-installer/binary-sparc/Packages - 7ebba06ba44cfeeed10cddfe9ce4ee2b35bc42f764158e410ee11a61874dfa06 102 restricted/source/Release - a918c3947ab834297f3d2c497e961f11e48539a5ce77fe0e5b70b0a69e28c1e2 11670 restricted/source/Sources - 77ede22795f344b4373e5bda1d57c6e1f5bae14b56868540031ea378ac1a0a55 3580 restricted/source/Sources.gz - 88712e84fd5593009e38e85ca37a7d0f6923e9c5998def8a2cc30a6a0da6936b 3775 restricted/source/Sources.bz2 - f279288eefc126ef7e8dbae71f662b6fcd208c3a0fa5f920d7f831da167ef09e 99 universe/binary-amd64/Release - 536e97eea0a481c3df2cfc5b4568601a3c8f837f65e837daa0556ca128e25e08 26734222 universe/binary-amd64/Packages - 49d23df9370758b4159051a1814cf01230c59fa9243295105c4bb38c9c5d5484 5429539 universe/binary-amd64/Packages.bz2 - 28742757ae39144b9988ecea862d2f5c23654c9ad88fa609d86c4f3000b00b9f 7015632 universe/binary-amd64/Packages.gz - 7ac3d1dccda5bf50c20574198cc10128f3dd3898d875fb647fd6575f2bf33616 26046136 universe/binary-armel/Packages - ae9406e2a5223576872ba590db52a22d365d2aa67e22f4aeb88d0ffc48d45a3a 6835261 universe/binary-armel/Packages.gz - 3c9303f6b76d9b49e327f9f9ff250cf1dc5ce234643351b700de7ab4ab4a7e01 5286781 universe/binary-armel/Packages.bz2 - 3b7cd3879b7d42d359cfedeff10e8b760d4f39b8c2093c2d1a158f620b08c0d6 99 universe/binary-armel/Release - c5dc922c8f0ac07b8d428b46f795b26aa1cdf5863bae5c148f9aa7bcf5f1c29d 26807886 universe/binary-i386/Packages - a1be5af3be86e137a831343682b75243f78cc32944832c718bf0bd33f8393626 98 universe/binary-i386/Release - 07fa37630e04c1e96fd13815d6670b040b88885c3f8846537f7dddb1774bc231 7039759 universe/binary-i386/Packages.gz - fec57f9f84339bebbcbb6574a359650c46e409be6eade684be2f2665cfd2db8e 5447752 universe/binary-i386/Packages.bz2 - 67105e5d45b3cf36b04ea94025767947bf7623052071743f87a6b6556519c956 6875622 universe/binary-ia64/Packages.gz - 4b2e06335e74dd487721f333d344620362708dcb75bd757a7a727f4b95ae7185 98 universe/binary-ia64/Release - 4a307c3e89fd670d71cf3289a1a89b7bd6de3984c339416464eb1b190a112f64 26078621 universe/binary-ia64/Packages - 08059299d799f5271216b10cd2a0d329c8a8479057ad43b43d0bf9ca43d88642 5310527 universe/binary-ia64/Packages.bz2 - cac2be1cffbede73ef368cdad10fab2f514490fe2e2b4c92eabd0600d28a56c0 6970013 universe/binary-powerpc/Packages.gz - c58c69d1531f019bf8de0120f259abbb3e0a3e0b68e2a5acd9324b9af88e1f52 5394194 universe/binary-powerpc/Packages.bz2 - 9789763a4555391aa2044b6576f1cb2d0c030db712f36fdd817a6ec8ad7dd4e7 101 universe/binary-powerpc/Release - a3c52bdae25bb9ee07edfad21a09fe427503429a465acbf413b3214aff4e00de 26605550 universe/binary-powerpc/Packages - c1ac4277c1690cabd25c329f07f95a4977cc617738e660e4168de382edc46137 26213750 universe/binary-sparc/Packages - afc966573f8c882e8c87379829d946b7db358d2e53b053f2254b60fd62015306 99 universe/binary-sparc/Release - 3578e90cdaa5fc01f35aa19ba18f1653737e1fa092aeaac71119447ca2f30c88 6888044 universe/binary-sparc/Packages.gz - 1236e14d44574622191fdefdb13686a81c644d317631d496933eb5791b2b0ad2 5330271 universe/binary-sparc/Packages.bz2 - 261c00a23103dcba1623fc8fb3c0a29abd243bb913b26d838fd31c9e75999875 10279 universe/debian-installer/binary-amd64/Packages.bz2 - 5fe84f0b1660d6939909d0c0cff5a19d190bd1ff3dc6a02fb0037c93831bff30 40037 universe/debian-installer/binary-amd64/Packages - f2bc0d4f4a0fe36ee1f4d2f81c29a8c651b53b126662c192211daef7bcb01d65 11317 universe/debian-installer/binary-amd64/Packages.gz - 8eddb7cf1f620c0d72c32739504c455bee15e2a1e737c5be84b4a482dbbe1590 11433 universe/debian-installer/binary-armel/Packages.gz - 50d778a6464e556336e03332a16f5c96660babc581339b322d394906d877467d 10385 universe/debian-installer/binary-armel/Packages.bz2 - b06ebdbf67aa0b511416d2c70e80379e6d9fd7e92a83de588792962fe6e17b6b 40286 universe/debian-installer/binary-armel/Packages - d23a3bf578b66bbc38ab358522b3c6af799d7e60b5b7c8052e95559db68b43da 11295 universe/debian-installer/binary-i386/Packages.gz - 0e09478f0c06c6d3724528a4de4863bfb3e2ca06836cd189b9b0d1c009f6a960 39992 universe/debian-installer/binary-i386/Packages - 2e590c3016bc81ab2142d86cc01fcf0ee2b3839d082aa5996f516d4db7b7a776 10272 universe/debian-installer/binary-i386/Packages.bz2 - de3b987eb85a1d196be25021e71eacfa7e94f632730d2a7100f7a67dd1a8c86e 39417 universe/debian-installer/binary-ia64/Packages - 3f0de3953eaceb1b34e0f8fa230dcbc1f0bc5b61dd228f32bc42c699a8c625c8 10107 universe/debian-installer/binary-ia64/Packages.bz2 - 73b7dacc0ca6db43117bcfd0534d964a8333dc4d470d4df20c8b291e68687cb6 11132 universe/debian-installer/binary-ia64/Packages.gz - dd6acbb610466ec2eefa2e1f5190c40770cf8c830fe8301fe250025089531a9f 40531 universe/debian-installer/binary-powerpc/Packages - 4966d98a5627b2f0bc4221b33d2a3189149d528cb151f80522d904cf084e54f4 10312 universe/debian-installer/binary-powerpc/Packages.bz2 - 506b7e32b7766c8fe54090ed9a59696f99b9d294e1561ff28608681a1d71bc05 11362 universe/debian-installer/binary-powerpc/Packages.gz - d529381dbda89ff8d5be006e06b87d34991008e9648d610bbfea5b284266bf4f 10745 universe/debian-installer/binary-sparc/Packages.gz - 820533a6ebc7353ad0e17777efd901342fca412ed15e8dc44c6a00c25d1127b8 9806 universe/debian-installer/binary-sparc/Packages.bz2 - 87bd7ab6ac590d4356d14af50590b265de4a410ac5d661d28e68d0f109b776d8 38126 universe/debian-installer/binary-sparc/Packages - 4dea11c08b8e102cadba97561a53f6364fe6b0092dba63d9cfd4571ef1531f1a 3165115 universe/source/Sources.bz2 - 82a7f64d43cb9618a9139faf0ffe55ddfdd457d985dd2d2dcde43fa8ff7f9d1f 100 universe/source/Release - 49c0202ce6bf54cc6e0eb47bb68f2dc9cf5d42089f95de958fd913504de7cf9c 13888852 universe/source/Sources - f44fd6dc3ad168dd291da2b4390b2d5474a634b1d90abe6534cca53144e4447a 4005968 universe/source/Sources.gz diff -Nru update-manager-17.10.11/tests/aptroot-changelog/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release.gpg update-manager-0.156.14.15/tests/aptroot-changelog/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release.gpg --- update-manager-17.10.11/tests/aptroot-changelog/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release.gpg 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-changelog/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release.gpg 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQBL2cDzQJdur0N9BbURAmk2AJ9ungOjKn0ektAH87KhRIHht+1cDQCfck7P -ZoIb2P0v2PEqa4Az8KnIIW4= -=b/mY ------END PGP SIGNATURE----- diff -Nru update-manager-17.10.11/tests/aptroot-changelog/var/lib/dpkg/status update-manager-0.156.14.15/tests/aptroot-changelog/var/lib/dpkg/status --- update-manager-17.10.11/tests/aptroot-changelog/var/lib/dpkg/status 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-changelog/var/lib/dpkg/status 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -Package: apt -Status: install ok installed -Priority: important -Section: admin -Installed-Size: 3005 -Maintainer: Ubuntu Developers -Architecture: all -Version: 0.1 -Description: a example package with no source entry - -Package: gcc -Status: install ok installed -Priority: optional -Section: devel -Installed-Size: 3005 -Maintainer: Ubuntu Developers -Architecture: amd64 -Version: 0.1 -Description: an example package with source entry - -Package: libgtk2.0-dev -Status: install ok installed -Priority: optional -Section: libdevel -Installed-Size: 3005 -Maintainer: Ubuntu Desktop Team -Architecture: amd64 -Version: 0.1 -Description: an example package with srcver == binver - diff -Nru update-manager-17.10.11/tests/aptroot-grouping-test/etc/apt/sources.list update-manager-0.156.14.15/tests/aptroot-grouping-test/etc/apt/sources.list --- update-manager-17.10.11/tests/aptroot-grouping-test/etc/apt/sources.list 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-grouping-test/etc/apt/sources.list 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -deb http://archive.ubuntu.com/ubuntu lucid main -deb http://archive.ubuntu.com/ubuntu lucid-security main Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/tests/aptroot-grouping-test/etc/apt/trusted.gpg and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/tests/aptroot-grouping-test/etc/apt/trusted.gpg differ Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/tests/aptroot-grouping-test/var/cache/apt/pkgcache.bin and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/tests/aptroot-grouping-test/var/cache/apt/pkgcache.bin differ Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/tests/aptroot-grouping-test/var/cache/apt/srcpkgcache.bin and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/tests/aptroot-grouping-test/var/cache/apt/srcpkgcache.bin differ diff -Nru update-manager-17.10.11/tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_main_binary-amd64_Packages update-manager-0.156.14.15/tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_main_binary-amd64_Packages --- update-manager-17.10.11/tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_main_binary-amd64_Packages 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_main_binary-amd64_Packages 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -Package: installed-app -Priority: optional -Section: admin -Installed-Size: 1 -Maintainer: Foo -Architecture: all -Version: 2 -Size: 1 -Depends: installed-pkg-multiple-deps -Suggests: installed-pkg-single-dep -Description: just an app -Origin: Ubuntu - -Package: installed-app-with-subitems -Priority: optional -Section: admin -Installed-Size: 1 -Maintainer: Foo -Architecture: all -Version: 2 -Size: 1 -Recommends: intermediate, installed-pkg-multiple-deps -Description: app with subitems -Origin: Ubuntu - -Package: intermediate -Priority: optional -Section: admin -Installed-Size: 1 -Maintainer: Foo -Architecture: all -Version: 0 -Size: 1 -Description: intermediate pkg -Origin: Ubuntu - -Package: installed-pkg -Priority: optional -Section: admin -Installed-Size: 1 -Maintainer: Foo -Architecture: all -Version: 2 -Size: 1 -Description: just a pkg -Origin: Ubuntu - -Package: installed-pkg-multiple-deps -Priority: optional -Section: admin -Installed-Size: 1 -Maintainer: Foo -Architecture: all -Version: 2 -Size: 1 -Description: pkg with multiple deps -Origin: Ubuntu - -Package: installed-pkg-single-dep -Priority: optional -Section: admin -Installed-Size: 1 -Maintainer: Foo -Architecture: all -Version: 2 -Size: 1 -Description: pkg with single dep -Origin: Ubuntu - -Package: ubuntu-minimal -Priority: optional -Section: admin -Installed-Size: 1 -Maintainer: Foo -Architecture: all -Version: 2 -Size: 1 -Recommends: base-pkg -Description: meta package -Origin: Ubuntu diff -Nru update-manager-17.10.11/tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release update-manager-0.156.14.15/tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release --- update-manager-17.10.11/tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -Origin: Ubuntu -Label: Ubuntu -Suite: lucid -Version: 10.04 -Codename: lucid -Date: Thu, 29 Apr 2010 17:24:55 UTC -Architectures: amd64 armel i386 ia64 powerpc sparc -Components: main restricted universe multiverse -Description: Ubuntu Lucid 10.04 diff -Nru update-manager-17.10.11/tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release.gpg update-manager-0.156.14.15/tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release.gpg --- update-manager-17.10.11/tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release.gpg 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release.gpg 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQBL2cDzQJdur0N9BbURAmk2AJ9ungOjKn0ektAH87KhRIHht+1cDQCfck7P -ZoIb2P0v2PEqa4Az8KnIIW4= -=b/mY ------END PGP SIGNATURE----- diff -Nru update-manager-17.10.11/tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid-security_main_binary-amd64_Packages update-manager-0.156.14.15/tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid-security_main_binary-amd64_Packages --- update-manager-17.10.11/tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid-security_main_binary-amd64_Packages 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid-security_main_binary-amd64_Packages 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -Package: base-pkg -Priority: optional -Section: admin -Installed-Size: 1 -Maintainer: Foo -Architecture: all -Version: 2 -Size: 1 -Description: a base package -Origin: Ubuntu diff -Nru update-manager-17.10.11/tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid-security_Release update-manager-0.156.14.15/tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid-security_Release --- update-manager-17.10.11/tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid-security_Release 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid-security_Release 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -Origin: Ubuntu -Label: Ubuntu -Suite: lucid-security -Version: 10.04 -Codename: lucid -Date: Thu, 29 Apr 2010 17:24:55 UTC -Architectures: amd64 armel i386 ia64 powerpc sparc -Components: main restricted universe multiverse -Description: Ubuntu Lucid 10.04 diff -Nru update-manager-17.10.11/tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid-security_Release.gpg update-manager-0.156.14.15/tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid-security_Release.gpg --- update-manager-17.10.11/tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid-security_Release.gpg 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-grouping-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid-security_Release.gpg 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQBL2cDzQJdur0N9BbURAmk2AJ9ungOjKn0ektAH87KhRIHht+1cDQCfck7P -ZoIb2P0v2PEqa4Az8KnIIW4= -=b/mY ------END PGP SIGNATURE----- diff -Nru update-manager-17.10.11/tests/aptroot-grouping-test/var/lib/dpkg/status update-manager-0.156.14.15/tests/aptroot-grouping-test/var/lib/dpkg/status --- update-manager-17.10.11/tests/aptroot-grouping-test/var/lib/dpkg/status 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-grouping-test/var/lib/dpkg/status 1970-01-01 00:00:00.000000000 +0000 @@ -1,82 +0,0 @@ -Package: base-pkg -Status: install ok installed -Priority: optional -Section: admin -Installed-Size: 1 -Maintainer: Ubuntu Developers -Architecture: all -Version: 0.1 -Description: a base package - -Package: installed-app -Status: install ok installed -Priority: optional -Section: admin -Installed-Size: 1 -Maintainer: Ubuntu Developers -Architecture: all -Version: 0.1 -Description: an installed app - -Package: installed-app-with-subitems -Status: install ok installed -Priority: optional -Section: admin -Installed-Size: 1 -Maintainer: Ubuntu Developers -Architecture: all -Version: 0.1 -Description: an installed app with subitems - -Package: intermediate -Status: install ok installed -Priority: optional -Section: admin -Installed-Size: 1 -Maintainer: Ubuntu Developers -Architecture: all -Version: 0.1 -Depends: installed-pkg-single-dep -Description: an intermediate pkg - -Package: installed-pkg -Status: install ok installed -Priority: optional -Section: admin -Installed-Size: 1 -Maintainer: Ubuntu Developers -Architecture: all -Version: 0.1 -Description: an installed package - -Package: not-updatable -Status: install ok installed -Priority: optional -Section: admin -Installed-Size: 1 -Maintainer: Ubuntu Developers -Architecture: all -Version: 0.1 -Depends: installed-pkg-single-dep -Description: extra pkg - to confirm we only look at updatable pkgs when calculating groupings - -Package: installed-pkg-multiple-deps -Status: install ok installed -Priority: optional -Section: admin -Installed-Size: 1 -Maintainer: Ubuntu Developers -Architecture: all -Version: 0.1 -Description: an installed package that multiple apps depend on - -Package: installed-pkg-single-dep -Status: install ok installed -Priority: optional -Section: admin -Installed-Size: 1 -Maintainer: Ubuntu Developers -Architecture: all -Version: 0.1 -Description: an installed package that only one app depends on diff -Nru update-manager-17.10.11/tests/aptroot-update-list-test/etc/apt/sources.list update-manager-0.156.14.15/tests/aptroot-update-list-test/etc/apt/sources.list --- update-manager-17.10.11/tests/aptroot-update-list-test/etc/apt/sources.list 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-update-list-test/etc/apt/sources.list 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -deb http://archive.ubuntu.com/ubuntu lucid main - Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/tests/aptroot-update-list-test/etc/apt/trusted.gpg and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/tests/aptroot-update-list-test/etc/apt/trusted.gpg differ Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/tests/aptroot-update-list-test/var/cache/apt/pkgcache.bin and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/tests/aptroot-update-list-test/var/cache/apt/pkgcache.bin differ Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/tests/aptroot-update-list-test/var/cache/apt/srcpkgcache.bin and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/tests/aptroot-update-list-test/var/cache/apt/srcpkgcache.bin differ diff -Nru update-manager-17.10.11/tests/aptroot-update-list-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_main_binary-amd64_Packages update-manager-0.156.14.15/tests/aptroot-update-list-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_main_binary-amd64_Packages --- update-manager-17.10.11/tests/aptroot-update-list-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_main_binary-amd64_Packages 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-update-list-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_main_binary-amd64_Packages 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -Package: apt -Priority: important -Section: admin -Installed-Size: 5488 -Maintainer: Ubuntu Core Developers -Original-Maintainer: APT Development Team -Architecture: all -Version: 0.7.25.3ubuntu7 -Replaces: libapt-pkg-dev (<< 0.3.7), libapt-pkg-doc (<< 0.3.7) -Provides: libapt-pkg-libc6.10-6-4.8 -Recommends: ubuntu-keyring -Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt -Filename: pool/main/a/apt/apt_0.7.25.3ubuntu7_amd64.deb -Size: 1817332 -MD5sum: e4e56d2597d1ae396d30d20684632719 -SHA1: baeeaa983f8f0224bb6748279611b1b2b323e49b -SHA256: 863feb4e20cdb33d81cd59417a494c8cc369800f86f0a42d428e1aed872fc247 -Description: Advanced front-end for dpkg - This is Debian's next generation front-end for the dpkg package manager. - It provides the apt-get utility and APT dselect method that provides a - simpler, safer way to install and upgrade packages. - . - APT features complete installation ordering, multiple source capability - and several other unique features, see the Users Guide in apt-doc. -Bugs: https://bugs.launchpad.net/ubuntu/+filebug -Build-Essential: yes -Origin: Ubuntu -Supported: 5y -Task: minimal - -Package: zsh -Priority: optional -Section: shells -Installed-Size: 12992 -Maintainer: Ubuntu Developers -Original-Maintainer: Clint Adams -Architecture: all -Version: 4.3.10-5ubuntu3 -Suggests: zsh-doc -Conflicts: pdksh (<< 5.2.14-18) -Filename: pool/main/z/zsh/zsh_4.3.10-5ubuntu3_amd64.deb -Size: 4414350 -MD5sum: ba1c2a6832e13cee567ada772db2a432 -SHA1: c065f4ba97e1a05320951019c60196e83794a9af -SHA256: 61495a50dcfc6d1faba7cbb635df04bbb07661cca0a18e2028a11b16e893c958 -Description: A shell with lots of features - Zsh is a UNIX command interpreter (shell) usable as an - interactive login shell and as a shell script command - processor. Of the standard shells, zsh most closely resembles - ksh but includes many enhancements. Zsh has command-line editing, - built-in spelling correction, programmable command completion, - shell functions (with autoloading), a history mechanism, and a - host of other features. -Homepage: http://www.zsh.org/ -Bugs: https://bugs.launchpad.net/ubuntu/+filebug -Origin: Ubuntu -Supported: 5y -Phased-Update-Percentage: 10 - -Package: zsh-dev -Priority: optional -Section: libdevel -Installed-Size: 348 -Maintainer: Ubuntu Developers -Original-Maintainer: Clint Adams -Architecture: amd64 -Source: zsh -Version: 4.3.10-5ubuntu3 -Filename: pool/main/z/zsh/zsh-dev_4.3.10-5ubuntu3_amd64.deb -Size: 79682 -MD5sum: 307bcd1994a2eb0d01cc06856a75fb52 -SHA1: 9e8d41855b62ba018341882099e3849e550aa55c -SHA256: 5c615269c6a41ed44923edc696ab77c5c4e4b9c0ece17c0e3d767db80bfb65cc -Description: A shell with lots of features (development files) - Zsh is a UNIX command interpreter (shell) usable as an - interactive login shell and as a shell script command - processor. Of the standard shells, zsh most closely resembles - ksh but includes many enhancements. Zsh has command-line editing, - built-in spelling correction, programmable command completion, - shell functions (with autoloading), a history mechanism, and a - host of other features. - . - This package contains headers and scripts necessary to compile - third-party modules. -Homepage: http://www.zsh.org/ -Bugs: https://bugs.launchpad.net/ubuntu/+filebug -Origin: Ubuntu -Supported: 18m -Phased-Update-Percentage: 10 diff -Nru update-manager-17.10.11/tests/aptroot-update-list-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release update-manager-0.156.14.15/tests/aptroot-update-list-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release --- update-manager-17.10.11/tests/aptroot-update-list-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-update-list-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release 1970-01-01 00:00:00.000000000 +0000 @@ -1,564 +0,0 @@ -Origin: Ubuntu -Label: Ubuntu -Suite: lucid -Version: 10.04 -Codename: lucid -Date: Thu, 29 Apr 2010 17:24:55 UTC -Architectures: amd64 armel i386 ia64 powerpc sparc -Components: main restricted universe multiverse -Description: Ubuntu Lucid 10.04 -MD5Sum: - 337c25a09805813b85fd45f38934de85 8595099 main/binary-amd64/Packages - cab26f8b56e0dc62da3bd4276242bb98 95 main/binary-amd64/Release - 9cf597f8375941099e5cbe5cb62eb46c 1779333 main/binary-amd64/Packages.gz - f9f2c23454c2e8d6b87cc65fc475900f 1383205 main/binary-amd64/Packages.bz2 - 09580d75756d0f4cd0343f53691c3a4b 1745634 main/binary-armel/Packages.gz - 0f3bb1f3481bbe12becbcb62876f4d06 95 main/binary-armel/Release - 56211cfabf8b74c999889e0d8c4b5cb4 1364526 main/binary-armel/Packages.bz2 - 2262cb384a0410cb32fa089ab85c1861 8473939 main/binary-armel/Packages - 02ee6eaffeb82c5a0051d495243c0165 94 main/binary-i386/Release - fbfcc35c9e642741a40a63a8cb0d5b39 1386205 main/binary-i386/Packages.bz2 - 502b8fbc56a4bcdd272e11d727e2de0b 1781497 main/binary-i386/Packages.gz - ecb6df4bd14586805082f2aa058307f8 8598110 main/binary-i386/Packages - 00a198754dfa49cf90bee9533b1cb3c9 1749837 main/binary-ia64/Packages.gz - debc1f8d004805ca20a9e0c0cb7e53f4 94 main/binary-ia64/Release - b0ff38246c5ee190d6e92a0618467695 8376166 main/binary-ia64/Packages - 2ca54f3877e5863651c58cd8465119a2 1367515 main/binary-ia64/Packages.bz2 - 34aede40849ea57b327c2486d2c604bf 8452314 main/binary-powerpc/Packages - 9745d87928ef9bb7ba56b5a0cd72b508 1763576 main/binary-powerpc/Packages.gz - 76753ca0dafa51daf2af2311887e4cf6 1376781 main/binary-powerpc/Packages.bz2 - fa9ebe24d4041f3d0482a84bc4a77daa 97 main/binary-powerpc/Release - 8945d7fb7db49e988aadf9ec07afee20 95 main/binary-sparc/Release - 0870b5da7fc4473f0ab009b946b2b23e 8403646 main/binary-sparc/Packages - a29f3f6b2a7b3c6db5c8759715b9d22f 1751944 main/binary-sparc/Packages.gz - 84f6441e0c5b84f31a2518e7edff0584 1369305 main/binary-sparc/Packages.bz2 - 512891c937587bb661cbd1b2c28127b1 52614 main/debian-installer/binary-amd64/Packages.gz - e3d4e27e3e9dd92e3cd67932f7a02f95 194115 main/debian-installer/binary-amd64/Packages - b0d4d9417d54a61753c9ab72b9c4a426 41737 main/debian-installer/binary-amd64/Packages.bz2 - e381d0db9e08775e40c5e53c5a0c1bb6 48196 main/debian-installer/binary-armel/Packages.bz2 - 920b2c4e97595fe2e5322ee84623a520 240037 main/debian-installer/binary-armel/Packages - 6824f830e30eac71b098ad2f987849eb 61654 main/debian-installer/binary-armel/Packages.gz - 4b783ed689041e93ce244976fc8bf104 45218 main/debian-installer/binary-i386/Packages.bz2 - 0c109aedf9e30668918c04891ade055b 218503 main/debian-installer/binary-i386/Packages - b428375f81f26fabcd60909ebc8ded6a 57235 main/debian-installer/binary-i386/Packages.gz - fabcbe9f726b90890909f02d4770d93b 187978 main/debian-installer/binary-ia64/Packages - e180f619659319ef54443880dfca9a8d 40723 main/debian-installer/binary-ia64/Packages.bz2 - f77338adedabfa027e6fafee0a1f22c4 51277 main/debian-installer/binary-ia64/Packages.gz - 6956168dbe8aecb361ac8fb2c3523333 57286 main/debian-installer/binary-powerpc/Packages.gz - 69fb2151b4ef63421dc434f25a9d82d8 217930 main/debian-installer/binary-powerpc/Packages - 19629074b8fed56f077a64e583ff4357 45144 main/debian-installer/binary-powerpc/Packages.bz2 - 61e472da5f878fa1aa2bfec7e40c52e6 187015 main/debian-installer/binary-sparc/Packages - 639835fb68050e9d17fd633d7e122ae2 51128 main/debian-installer/binary-sparc/Packages.gz - a2a3b00bc22d6b16347bee3b27c6d350 40671 main/debian-installer/binary-sparc/Packages.bz2 - 3111853af865b457b47cc0d4866b4907 658637 main/source/Sources.bz2 - 0ac7ebf71aaa9cc50104689189546e14 96 main/source/Release - 258a409d99f5c2001ab3976e8172efab 3245836 main/source/Sources - 6cd4edf935e55c59d1528f7c2389083a 833999 main/source/Sources.gz - fe9ce1ec5e6f46e8552d1b22b7678b1f 101 multiverse/binary-amd64/Release - b95a2dbb67c58328150461c5233927be 175917 multiverse/binary-amd64/Packages.bz2 - 8e550e7fce8fd780b5b2728f0b2b35e4 227377 multiverse/binary-amd64/Packages.gz - dc30e52e09fee6aec7ddd0f6a2c30f98 835855 multiverse/binary-amd64/Packages - e574e8b9b78a7064fbc451235e79e052 207550 multiverse/binary-armel/Packages.gz - b531c1ee652cdf66f9af846e8ba1e271 101 multiverse/binary-armel/Release - 5ea29c69cbd7e6a5ab7dd35ecf305031 753469 multiverse/binary-armel/Packages - 77c3148ae352ac14c388af94c82c71c9 159689 multiverse/binary-armel/Packages.bz2 - 7a1bb639c034b4d2db39a1795cfba84c 851731 multiverse/binary-i386/Packages - 52682ca95aa197a2402c3e3c00098210 232339 multiverse/binary-i386/Packages.gz - dd95741316cdfa7cd4f5c66d6635d621 179690 multiverse/binary-i386/Packages.bz2 - 7d71f89143cdceb5a51b2cb7bbe94067 100 multiverse/binary-i386/Release - 0b1026b97ba81845e4848a9034fd0b18 207960 multiverse/binary-ia64/Packages.gz - f30e9a2f48494f92475ad13ea866ae12 100 multiverse/binary-ia64/Release - d7035ec9075e53ded70494f76b75a782 159999 multiverse/binary-ia64/Packages.bz2 - 169b24bce02afc4be82ab11df2d1d5d9 748797 multiverse/binary-ia64/Packages - 5f781b642b28d798cdb9aa37ff63840d 212591 multiverse/binary-powerpc/Packages.gz - dbb7a4112d6a1a78208926da5fd1b1ea 103 multiverse/binary-powerpc/Release - 7e645fa0e439526e1bb697490c2d0385 770869 multiverse/binary-powerpc/Packages - 242c17c74ecbe8ea7c8b5b8ab4212ec1 163220 multiverse/binary-powerpc/Packages.bz2 - 9b4e85b0281d1678f2b7a101913ef5f3 743247 multiverse/binary-sparc/Packages - 5d97ce26cb71152fc164ff2ecbe26764 206433 multiverse/binary-sparc/Packages.gz - 50605cf89a99830ba3954051d8b999d3 101 multiverse/binary-sparc/Release - 453a96aa6e35699e51daced713c1064d 158888 multiverse/binary-sparc/Packages.bz2 - d41d8cd98f00b204e9800998ecf8427e 0 multiverse/debian-installer/binary-amd64/Packages - 4a4dd3598707603b3f76a2378a4504aa 20 multiverse/debian-installer/binary-amd64/Packages.gz - 4059d198768f9f8dc9372dc1c54bc3c3 14 multiverse/debian-installer/binary-amd64/Packages.bz2 - 4059d198768f9f8dc9372dc1c54bc3c3 14 multiverse/debian-installer/binary-armel/Packages.bz2 - d41d8cd98f00b204e9800998ecf8427e 0 multiverse/debian-installer/binary-armel/Packages - 4a4dd3598707603b3f76a2378a4504aa 20 multiverse/debian-installer/binary-armel/Packages.gz - 4a4dd3598707603b3f76a2378a4504aa 20 multiverse/debian-installer/binary-i386/Packages.gz - 4059d198768f9f8dc9372dc1c54bc3c3 14 multiverse/debian-installer/binary-i386/Packages.bz2 - d41d8cd98f00b204e9800998ecf8427e 0 multiverse/debian-installer/binary-i386/Packages - d41d8cd98f00b204e9800998ecf8427e 0 multiverse/debian-installer/binary-ia64/Packages - 4a4dd3598707603b3f76a2378a4504aa 20 multiverse/debian-installer/binary-ia64/Packages.gz - 4059d198768f9f8dc9372dc1c54bc3c3 14 multiverse/debian-installer/binary-ia64/Packages.bz2 - 4059d198768f9f8dc9372dc1c54bc3c3 14 multiverse/debian-installer/binary-powerpc/Packages.bz2 - d41d8cd98f00b204e9800998ecf8427e 0 multiverse/debian-installer/binary-powerpc/Packages - 4a4dd3598707603b3f76a2378a4504aa 20 multiverse/debian-installer/binary-powerpc/Packages.gz - 4059d198768f9f8dc9372dc1c54bc3c3 14 multiverse/debian-installer/binary-sparc/Packages.bz2 - 4a4dd3598707603b3f76a2378a4504aa 20 multiverse/debian-installer/binary-sparc/Packages.gz - d41d8cd98f00b204e9800998ecf8427e 0 multiverse/debian-installer/binary-sparc/Packages - 959a79dfcd36a637e33a4c4a4272ddc2 118837 multiverse/source/Sources.bz2 - c4f25c5713edb0775f5ee874de7ecf8b 504210 multiverse/source/Sources - 7e7a923c60e6990894afafdf5f56c441 145577 multiverse/source/Sources.gz - de076a69842b27e8305a41cc2a1b5494 102 multiverse/source/Release - 2a58b5f9f401ce3b497ff037f03c57a9 6149 restricted/binary-amd64/Packages.gz - 9ada66fa37a2c5307c191ca31c54b6ba 29002 restricted/binary-amd64/Packages - 1c91fce3fe0f345f6a78dafde1ae5838 101 restricted/binary-amd64/Release - 80a06e61bc510cd48c1ea29f40459aa2 6193 restricted/binary-amd64/Packages.bz2 - 5a748a5b7452fe41791c9a6bd758a5a9 508 restricted/binary-armel/Packages.gz - 73798a2780cb27b88a78b3afa3b89064 564 restricted/binary-armel/Packages.bz2 - 0d98b95cb712acfb81ccdeb02a92c2b0 101 restricted/binary-armel/Release - e86508f46fea90bd580672fdbcdc09d1 800 restricted/binary-armel/Packages - c55cc3ce43bf43370f87585e99966088 6133 restricted/binary-i386/Packages.gz - 59773390a87a4cc9fbbb5ac926c4d210 100 restricted/binary-i386/Release - ce51522712c441e2e7502731b2e5e619 28922 restricted/binary-i386/Packages - 4d8fcb65027b852b5cf9f4932e895b40 6208 restricted/binary-i386/Packages.bz2 - b9f1ed2ebbfa6a5a69fccdf1d3ab14c3 552 restricted/binary-ia64/Packages.bz2 - 3fee0239ecc6f0dfb0d4a17a6d324025 100 restricted/binary-ia64/Release - 050afda3c921cb575e3342477e8ceb72 785 restricted/binary-ia64/Packages - 292e9bdd78f19a5f9f6c57a6b97735f2 497 restricted/binary-ia64/Packages.gz - b9f1ed2ebbfa6a5a69fccdf1d3ab14c3 552 restricted/binary-powerpc/Packages.bz2 - 292e9bdd78f19a5f9f6c57a6b97735f2 497 restricted/binary-powerpc/Packages.gz - 050afda3c921cb575e3342477e8ceb72 785 restricted/binary-powerpc/Packages - 5de3bdb3711e7e2ffae99c84a7c21fd9 103 restricted/binary-powerpc/Release - 050afda3c921cb575e3342477e8ceb72 785 restricted/binary-sparc/Packages - 779a982005aebbee2673f8b84ca2e58e 101 restricted/binary-sparc/Release - b9f1ed2ebbfa6a5a69fccdf1d3ab14c3 552 restricted/binary-sparc/Packages.bz2 - 292e9bdd78f19a5f9f6c57a6b97735f2 497 restricted/binary-sparc/Packages.gz - d41d8cd98f00b204e9800998ecf8427e 0 restricted/debian-installer/binary-amd64/Packages - 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/debian-installer/binary-amd64/Packages.bz2 - 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-amd64/Packages.gz - 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-armel/Packages.gz - 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/debian-installer/binary-armel/Packages.bz2 - d41d8cd98f00b204e9800998ecf8427e 0 restricted/debian-installer/binary-armel/Packages - 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/debian-installer/binary-i386/Packages.bz2 - d41d8cd98f00b204e9800998ecf8427e 0 restricted/debian-installer/binary-i386/Packages - 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-i386/Packages.gz - 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-ia64/Packages.gz - d41d8cd98f00b204e9800998ecf8427e 0 restricted/debian-installer/binary-ia64/Packages - 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/debian-installer/binary-ia64/Packages.bz2 - 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-powerpc/Packages.gz - 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/debian-installer/binary-powerpc/Packages.bz2 - d41d8cd98f00b204e9800998ecf8427e 0 restricted/debian-installer/binary-powerpc/Packages - 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-sparc/Packages.gz - 4059d198768f9f8dc9372dc1c54bc3c3 14 restricted/debian-installer/binary-sparc/Packages.bz2 - d41d8cd98f00b204e9800998ecf8427e 0 restricted/debian-installer/binary-sparc/Packages - f2cd687f11c70abba7940c24bcb4685f 102 restricted/source/Release - 70148e2c94601b4e95d417a778750064 11670 restricted/source/Sources - b25d38c741031508511330eae8abac6f 3580 restricted/source/Sources.gz - a9746d4c9e33047b60053306d53a4f23 3775 restricted/source/Sources.bz2 - 9c26c9c75692283aff056a34c06832be 99 universe/binary-amd64/Release - 84ad9bcb434b1902d86ff7731373d60f 26734222 universe/binary-amd64/Packages - 90ad8bbc89998eebceb5908742485e24 5429539 universe/binary-amd64/Packages.bz2 - f97e4ad162362d0c48fc078c80fa5714 7015632 universe/binary-amd64/Packages.gz - b5c1317d3ae8ece7ebcdea356ebb5bd2 26046136 universe/binary-armel/Packages - 36bbe68ff5d91a3c0f1f023ee1e17225 6835261 universe/binary-armel/Packages.gz - dc4fcf07e1c75ed7aba07e416e052a2b 5286781 universe/binary-armel/Packages.bz2 - 7ba67813445ef78665e958d180efc463 99 universe/binary-armel/Release - 440ac1381a41382a61f28314781d7f70 26807886 universe/binary-i386/Packages - 4534442a923839dc35c16e5da38443b2 98 universe/binary-i386/Release - 2a1b4c6af98dc2cdddd80cb4f4f84925 7039759 universe/binary-i386/Packages.gz - a9d5744f0fb56bc9cbb760e6fae4791b 5447752 universe/binary-i386/Packages.bz2 - dbe5b6e4d60c6e9171c36c80063f106a 6875622 universe/binary-ia64/Packages.gz - d32bc23428d5f818c386ced966d4fe61 98 universe/binary-ia64/Release - e9be03465de48358db19bcc22fda853a 26078621 universe/binary-ia64/Packages - 80143f065ff5a832cbef92c7d28b3e69 5310527 universe/binary-ia64/Packages.bz2 - 728818d0435620d26dc3d3bc40d1f79b 6970013 universe/binary-powerpc/Packages.gz - 49eae894dae7b47ca436d20c5239679a 5394194 universe/binary-powerpc/Packages.bz2 - c2cce270e52324ff855a68c440d67aa6 101 universe/binary-powerpc/Release - 3011b896db892d93991bb90335c41d97 26605550 universe/binary-powerpc/Packages - 5e8ea09bb3da45ab70ba79765ea51a53 26213750 universe/binary-sparc/Packages - da35454d2a5e760d58917f2140e06c51 99 universe/binary-sparc/Release - 38bf210fa330f3a8e32d69f6a860c654 6888044 universe/binary-sparc/Packages.gz - 79a835c2a012e415fd0221769689633a 5330271 universe/binary-sparc/Packages.bz2 - 708a6eac0586dec1a0df7fccf754efbd 10279 universe/debian-installer/binary-amd64/Packages.bz2 - 41c9635c5b62eb6d12335b36bb64a30a 40037 universe/debian-installer/binary-amd64/Packages - f9f9d9fbbfbe5b68b20bbd5c9bf8d8ad 11317 universe/debian-installer/binary-amd64/Packages.gz - c98aa6c4565c550999e13e7d0be801cb 11433 universe/debian-installer/binary-armel/Packages.gz - 927759d7ed4d2212aa2921cc90704518 10385 universe/debian-installer/binary-armel/Packages.bz2 - b1d511c779b4466607678166df24e57a 40286 universe/debian-installer/binary-armel/Packages - 22164611619cb5c20b376c213966b1fe 11295 universe/debian-installer/binary-i386/Packages.gz - 0537826c0b4eed76110ec5fc65945291 39992 universe/debian-installer/binary-i386/Packages - 1daeee7fc0714ff61f7cf949dc3fccbf 10272 universe/debian-installer/binary-i386/Packages.bz2 - a93cad53c636b8c4804096f2cf457ac6 39417 universe/debian-installer/binary-ia64/Packages - 31b79f8461c67c025b1e99bdd3bdfb01 10107 universe/debian-installer/binary-ia64/Packages.bz2 - 087ce5ddf3c4c3d2e13912d88c1d26e4 11132 universe/debian-installer/binary-ia64/Packages.gz - db1ef05501122f801bfcfb173dacd004 40531 universe/debian-installer/binary-powerpc/Packages - c91f2f3e93442829c34ad5c9dc8a5794 10312 universe/debian-installer/binary-powerpc/Packages.bz2 - f10d6b1ba731af4d95713ca71037602e 11362 universe/debian-installer/binary-powerpc/Packages.gz - 32dcceb6bda996b37977c49655ae44b0 10745 universe/debian-installer/binary-sparc/Packages.gz - 0244a354219eab9c3d239a476e499b28 9806 universe/debian-installer/binary-sparc/Packages.bz2 - f021081c462677c5eb85d8f8aad0614f 38126 universe/debian-installer/binary-sparc/Packages - 77ac41ac5ab3874a90dd3428a62dc208 3165115 universe/source/Sources.bz2 - 5fdd4e7e57846a19231d67c83698ea7f 100 universe/source/Release - 20ff3fcb5a8b98cee97a8fd4896b7f71 13888852 universe/source/Sources - ddc2c3af2379e6b5db9e64034e785e43 4005968 universe/source/Sources.gz -SHA1: - 7ae7b9bd7b9e3e9a00c3e0d6e11fb92a4204e809 8595099 main/binary-amd64/Packages - c8f3569f4de5e08299ba17814cb6d54a0e2cec3b 95 main/binary-amd64/Release - 7968e646f3bd4e9ec464922e1a37485413dbacff 1779333 main/binary-amd64/Packages.gz - bec1c81bf8fe1decff797c0a381c65cd35c46fcd 1383205 main/binary-amd64/Packages.bz2 - 7601de3d722e78e552e777f71767b068fb9665c3 1745634 main/binary-armel/Packages.gz - e1de20f6f548086f8ba27c6f5c0253e3432dc34e 95 main/binary-armel/Release - 1ba5ab49bb61c2e0fe34ef7e147cba1b2ce21381 1364526 main/binary-armel/Packages.bz2 - 53e0cee31860baea3b5d7a901317c9243e3e5fad 8473939 main/binary-armel/Packages - 69f0fdfed70fe61502e551f135248d8629885b89 94 main/binary-i386/Release - a75cb84f1ee9d7f317a7052ade84358e7019bce6 1386205 main/binary-i386/Packages.bz2 - e02d6f643910601bcccafe1d89879d900302eba4 1781497 main/binary-i386/Packages.gz - 9869eec1930a5750e5c4628d4db9bad62ecd0985 8598110 main/binary-i386/Packages - 3b08e7a4945326914dd738bf84121762849aa4f7 1749837 main/binary-ia64/Packages.gz - aedeeae95a406e1b9a6782c9156b268a073c443e 94 main/binary-ia64/Release - cc4e3feb05f6d1c0065d6820ee30f3eef9c24cc3 8376166 main/binary-ia64/Packages - 2bfc579fd1dba59cf59050e1aba01ad31fa4f85e 1367515 main/binary-ia64/Packages.bz2 - 82e4685e309ca46d13208ab6b65e6881821b16f7 8452314 main/binary-powerpc/Packages - 96b56a0b3a126ef4ad70a6f77ab33abeed900c3b 1763576 main/binary-powerpc/Packages.gz - 713055823a0a91c3e4d310037274c2a0c61880d7 1376781 main/binary-powerpc/Packages.bz2 - ada8a0a3645c87cb029d513a1af951ec0c8be68f 97 main/binary-powerpc/Release - 0f54881a75bca93e5a0399c3d3cfd12066807d89 95 main/binary-sparc/Release - 38328e905d3bed3c93885d32e3893898820d92ae 8403646 main/binary-sparc/Packages - 5af855acdfc08bc8609ffa85edbca28f837f5bfb 1751944 main/binary-sparc/Packages.gz - 26a9e3789c137c12b1a25d095ccaf37e04ce383a 1369305 main/binary-sparc/Packages.bz2 - 9c6f18b155d2e778c4fb96b1dd31b8012a8efc13 52614 main/debian-installer/binary-amd64/Packages.gz - 4730bced42d2edbf9b8d64cb21449f2937bfbdee 194115 main/debian-installer/binary-amd64/Packages - ca0d953ccce11e2e66161fcade3291db907244e6 41737 main/debian-installer/binary-amd64/Packages.bz2 - ec9013f35737077e6b03df7e08f7d0b90ea02a52 48196 main/debian-installer/binary-armel/Packages.bz2 - 6ec82c03d365c53f9f1a41fb316eb1b3db262b86 240037 main/debian-installer/binary-armel/Packages - deec4dac63930bc10fef7bc6e2fe77af5f19c503 61654 main/debian-installer/binary-armel/Packages.gz - c75a9cbdeb0e7f70ea18d34e1d3e160ecf2017b6 45218 main/debian-installer/binary-i386/Packages.bz2 - 1babace3eaf8b21c6be2623acb7b245e5aa1c66f 218503 main/debian-installer/binary-i386/Packages - d5f0bec30483507d49e9cf9d0f507d3465fc3571 57235 main/debian-installer/binary-i386/Packages.gz - 94b164867413b70fa163323be77d48eae31bb235 187978 main/debian-installer/binary-ia64/Packages - e836fd2d93c75a4f3f38eb63ef7946da2a2b9bf9 40723 main/debian-installer/binary-ia64/Packages.bz2 - 154004bcc1ecd701609b74ca18d43c9cd45786d3 51277 main/debian-installer/binary-ia64/Packages.gz - 84d2cf927fc177a07781c27e5f4f7f9a91582391 57286 main/debian-installer/binary-powerpc/Packages.gz - c779e3b0c28227656bee6fe3e10251550f7064fd 217930 main/debian-installer/binary-powerpc/Packages - 7147267f238a5b4cd938001c82b2f075da0d0ef0 45144 main/debian-installer/binary-powerpc/Packages.bz2 - 60323ae1cba1baad32c37b325e5729ff62d5686a 187015 main/debian-installer/binary-sparc/Packages - 3cdfbfd262eb7ee36aa362be193de347fa616e7b 51128 main/debian-installer/binary-sparc/Packages.gz - 8fbae613d3355087bdc362e50b90628fcd53fdec 40671 main/debian-installer/binary-sparc/Packages.bz2 - 110033d50f7923aa8fe28862600cb6e1e15ecbed 658637 main/source/Sources.bz2 - c1b38d584a15e3b6a325e9bb24225551671a930e 96 main/source/Release - a08ec53806d19f2447c415faaa9524a2f1d508a7 3245836 main/source/Sources - e4e6cc3def7544373c1a94996a0bb5e54f6343b6 833999 main/source/Sources.gz - 077ee491dd77119834677584e5c797386f0067c3 101 multiverse/binary-amd64/Release - 39e7f34d9aa97c50f3b7a43e2256d49d3b0ee215 175917 multiverse/binary-amd64/Packages.bz2 - 76ae3b9445c24d00bc49cbe21b1b0fd820821f97 227377 multiverse/binary-amd64/Packages.gz - 08fca1957fdb78be3b80ac0db4d19fceec0812df 835855 multiverse/binary-amd64/Packages - 5f5ad6b33880ad28fd3e06d320476708ddb5cb6b 207550 multiverse/binary-armel/Packages.gz - cd42148b977ad0060a19c8fb13c4166112769e9d 101 multiverse/binary-armel/Release - 03c40e07d2940af4a728a5538d637406bc784072 753469 multiverse/binary-armel/Packages - 225a272b71fb2e416c476f27ad7ec09a56fb4db5 159689 multiverse/binary-armel/Packages.bz2 - 64af8d4cf482e1b03adacd9b00667fa8d647bd0a 851731 multiverse/binary-i386/Packages - 5316c8a4732585597e96dfe11adce6b760a65cf4 232339 multiverse/binary-i386/Packages.gz - 7dee83d02cab4e00258cc7063f9d27413dc938a0 179690 multiverse/binary-i386/Packages.bz2 - de42412e1076c663f80d37bb13cc0b8b9f9d097b 100 multiverse/binary-i386/Release - e1a973d20bb33b2b30f8c0e30fd65f00d124ad9d 207960 multiverse/binary-ia64/Packages.gz - f5fcc3eb752485e9740864ab66270ed377070af5 100 multiverse/binary-ia64/Release - 8257d383d822e7fff9339233a9f95c19fe67c53f 159999 multiverse/binary-ia64/Packages.bz2 - 2f3a2507f6cc2460beb11abbff443e0f2cf198d9 748797 multiverse/binary-ia64/Packages - f1b69cc124124d079dc51b0acb659b900a6bc87e 212591 multiverse/binary-powerpc/Packages.gz - ac08d9fda1eea8768e8cb9f8b58fa9ea943506ed 103 multiverse/binary-powerpc/Release - 424703252457f85d2b0fb0c9e33673832d1cfa9f 770869 multiverse/binary-powerpc/Packages - 7c27673812abd9266319bd1da36af0bb3690bed7 163220 multiverse/binary-powerpc/Packages.bz2 - 5efdd7234bd01d893aa6b26b8d493fe6d871e6b7 743247 multiverse/binary-sparc/Packages - e1d10955a14fccb1f7a36bd11cef373bd229747b 206433 multiverse/binary-sparc/Packages.gz - 2a749f5831be518b889e1e40d485ffdedc33ea75 101 multiverse/binary-sparc/Release - f4246bb6b984855c886f9d369a4c2dccc0787e33 158888 multiverse/binary-sparc/Packages.bz2 - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 multiverse/debian-installer/binary-amd64/Packages - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 multiverse/debian-installer/binary-amd64/Packages.gz - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 multiverse/debian-installer/binary-amd64/Packages.bz2 - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 multiverse/debian-installer/binary-armel/Packages.bz2 - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 multiverse/debian-installer/binary-armel/Packages - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 multiverse/debian-installer/binary-armel/Packages.gz - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 multiverse/debian-installer/binary-i386/Packages.gz - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 multiverse/debian-installer/binary-i386/Packages.bz2 - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 multiverse/debian-installer/binary-i386/Packages - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 multiverse/debian-installer/binary-ia64/Packages - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 multiverse/debian-installer/binary-ia64/Packages.gz - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 multiverse/debian-installer/binary-ia64/Packages.bz2 - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 multiverse/debian-installer/binary-powerpc/Packages.bz2 - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 multiverse/debian-installer/binary-powerpc/Packages - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 multiverse/debian-installer/binary-powerpc/Packages.gz - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 multiverse/debian-installer/binary-sparc/Packages.bz2 - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 multiverse/debian-installer/binary-sparc/Packages.gz - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 multiverse/debian-installer/binary-sparc/Packages - 03c8d1834b04908b1a661358c65105af4ecc6144 118837 multiverse/source/Sources.bz2 - 50066293103de0c0e254859f8769e183a1c68800 504210 multiverse/source/Sources - 1e06ad4e662efc0134018f3cb598b028d8fb92d9 145577 multiverse/source/Sources.gz - 6123b6f8cb9a3c22c9cc9ea10126b80e37b94728 102 multiverse/source/Release - 4f49a42877a9c6a94abd82362a789eed67ebf600 6149 restricted/binary-amd64/Packages.gz - 85d50a0dba3b242ea890ef74fed0c238be1cfbce 29002 restricted/binary-amd64/Packages - f9fbd359de363fc018e85827f7d6131c59dffc8e 101 restricted/binary-amd64/Release - 67c73a89dd0cb198c686f3ddb61424cb1fca289b 6193 restricted/binary-amd64/Packages.bz2 - 7acf3fb7afe9631f1b84382a4becb19de07abc54 508 restricted/binary-armel/Packages.gz - f478034ddac7e6745a5228fcbbfb7f24a5c2f2c3 564 restricted/binary-armel/Packages.bz2 - 77d75fd4552d29162e4c9efc53785c66bbaf70e7 101 restricted/binary-armel/Release - 5a28100038feaa965140b29a9b40f66fb86e495f 800 restricted/binary-armel/Packages - 7da5efb15ca935a82f1a7ef03eb0ad00da9786e7 6133 restricted/binary-i386/Packages.gz - 4396ba67a008e2a06964f1507e92cbfc8884aa12 100 restricted/binary-i386/Release - fa5b24ebc047661f49c9c009844ee788be57f4cd 28922 restricted/binary-i386/Packages - aa15907469577a5b45e10769cd81fce21011f6a9 6208 restricted/binary-i386/Packages.bz2 - 83604e18eb0a8c2941b7957db1400e838984a047 552 restricted/binary-ia64/Packages.bz2 - 71afe17dbbe5060fc1730e2f72513ddd58ee2436 100 restricted/binary-ia64/Release - b51b94b51bf0d8bee15320f0bb84409183c80dd1 785 restricted/binary-ia64/Packages - 4800105c385bc9460de4d196200915d198095606 497 restricted/binary-ia64/Packages.gz - 83604e18eb0a8c2941b7957db1400e838984a047 552 restricted/binary-powerpc/Packages.bz2 - 4800105c385bc9460de4d196200915d198095606 497 restricted/binary-powerpc/Packages.gz - b51b94b51bf0d8bee15320f0bb84409183c80dd1 785 restricted/binary-powerpc/Packages - 51e31e7b621940e90264478b598885e651c45b30 103 restricted/binary-powerpc/Release - b51b94b51bf0d8bee15320f0bb84409183c80dd1 785 restricted/binary-sparc/Packages - 9cd8cb04e51eb6541605e2bbd029638bff43e783 101 restricted/binary-sparc/Release - 83604e18eb0a8c2941b7957db1400e838984a047 552 restricted/binary-sparc/Packages.bz2 - 4800105c385bc9460de4d196200915d198095606 497 restricted/binary-sparc/Packages.gz - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/debian-installer/binary-amd64/Packages - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/debian-installer/binary-amd64/Packages.bz2 - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-amd64/Packages.gz - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-armel/Packages.gz - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/debian-installer/binary-armel/Packages.bz2 - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/debian-installer/binary-armel/Packages - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/debian-installer/binary-i386/Packages.bz2 - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/debian-installer/binary-i386/Packages - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-i386/Packages.gz - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-ia64/Packages.gz - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/debian-installer/binary-ia64/Packages - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/debian-installer/binary-ia64/Packages.bz2 - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-powerpc/Packages.gz - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/debian-installer/binary-powerpc/Packages.bz2 - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/debian-installer/binary-powerpc/Packages - a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-sparc/Packages.gz - 64a543afbb5f4bf728636bdcbbe7a2ed0804adc2 14 restricted/debian-installer/binary-sparc/Packages.bz2 - da39a3ee5e6b4b0d3255bfef95601890afd80709 0 restricted/debian-installer/binary-sparc/Packages - 5b3a4af81100cb227b9238a69b25fc25cdeb42ec 102 restricted/source/Release - 3bfdf4fd932e9908ef8251205567d6d26d283168 11670 restricted/source/Sources - 5c37fbe4a362494efde874d5872e2b1fc15bc606 3580 restricted/source/Sources.gz - 703bf2be8f5d6087fe20aa21e5054d6a8efc5597 3775 restricted/source/Sources.bz2 - f896ad18165f74ab4bcd24c33137ed3b2ce06e18 99 universe/binary-amd64/Release - 1cec7e1bb388d6940969a48e7674739a19d67059 26734222 universe/binary-amd64/Packages - 633ea2a481081d9dddff7ed012ab16cefb28bcc6 5429539 universe/binary-amd64/Packages.bz2 - 3e52fa81f47aa2ad4d89771328a09c983fbc3b1e 7015632 universe/binary-amd64/Packages.gz - 7180e92f118a94925c0ed30925ef3fb09f2bf19d 26046136 universe/binary-armel/Packages - 0a2d7c5144d32242c2677eb479f04437aae4b6b7 6835261 universe/binary-armel/Packages.gz - c4fe43171c7233904fa7bac03ad4ee8cf4c9de72 5286781 universe/binary-armel/Packages.bz2 - 0e727b1255a57024b50aafd0e8b3ed42be198232 99 universe/binary-armel/Release - 22f956546f1332b3b605a05b5c602f9c587f2df9 26807886 universe/binary-i386/Packages - b96285c6cc352c28c5438d3f59d40e354d4517d6 98 universe/binary-i386/Release - 04a0bbbec6affceef68a84e21fbf82550d184a53 7039759 universe/binary-i386/Packages.gz - 1459562af31bbe61c14a43cfaa5c102de07c926d 5447752 universe/binary-i386/Packages.bz2 - e95d276f362fd76e844bb23219de997397df2635 6875622 universe/binary-ia64/Packages.gz - b74031274d253d4c1f23b3b4cd9d2080678e0478 98 universe/binary-ia64/Release - d6800281a9200b9645f74ec39a45bb9f5dc96785 26078621 universe/binary-ia64/Packages - ffbf666fe03528367d8bd54a899031c098f14169 5310527 universe/binary-ia64/Packages.bz2 - 3289e39a84e56c8da45666400b516bfb6ee2de6a 6970013 universe/binary-powerpc/Packages.gz - 4ea38ae66e871822d0cb63353cbe58ed8f14774c 5394194 universe/binary-powerpc/Packages.bz2 - 980ad1e26d7adeada83902d69b1ce9e3bce73011 101 universe/binary-powerpc/Release - a42810bcc05c3dcb5f8d4e5186628a1d95b6024a 26605550 universe/binary-powerpc/Packages - 9ae7cb9ae631b74ec80852e252ec67de5659f538 26213750 universe/binary-sparc/Packages - 18ecb1320ca83fb6bcce7a74480274db15fd1899 99 universe/binary-sparc/Release - 17c0747438ea66d10b1685d5486390c4e88e7dcd 6888044 universe/binary-sparc/Packages.gz - bc6c79da4f8b4e067d42b46fa1615343d5950430 5330271 universe/binary-sparc/Packages.bz2 - 2ba2eba329a282f7d16e4e34ae19947cb0779250 10279 universe/debian-installer/binary-amd64/Packages.bz2 - 4fe4a79666a266de45e96e475844506e5599f70a 40037 universe/debian-installer/binary-amd64/Packages - e6fcf2d30120929d951ce9cf66077a7705e724e3 11317 universe/debian-installer/binary-amd64/Packages.gz - a45ade999c3f36e4c4538939d2f05b4bf96b2dd2 11433 universe/debian-installer/binary-armel/Packages.gz - 157d9031a835d8c3ad957cfc97355ddfa032612b 10385 universe/debian-installer/binary-armel/Packages.bz2 - 5a2d26293b36f9ad73af733fbc102c69c317bc64 40286 universe/debian-installer/binary-armel/Packages - c2e0459dc5efcdb72df3f3e92354852cc72cb97c 11295 universe/debian-installer/binary-i386/Packages.gz - 3b12120229d09fcc698e046f9a494904752c4a1b 39992 universe/debian-installer/binary-i386/Packages - 7da8a850e5cc52cf1c06ee447cea4e4a5dea47a7 10272 universe/debian-installer/binary-i386/Packages.bz2 - 7d82e5982c08664fb41ec0472aa8779641d096ba 39417 universe/debian-installer/binary-ia64/Packages - 681013193075cb571a0c969fa8c2b9cda3f951d6 10107 universe/debian-installer/binary-ia64/Packages.bz2 - e16ecd26921377195839261281ce80343332f1f7 11132 universe/debian-installer/binary-ia64/Packages.gz - cb15233789965d6a47725b8ac97bf392a163ae36 40531 universe/debian-installer/binary-powerpc/Packages - e25fc309c3c071b78cc47e5e36ae20ccdfa7d04e 10312 universe/debian-installer/binary-powerpc/Packages.bz2 - e222ce065a084904998d317d3b95b768c98c60ad 11362 universe/debian-installer/binary-powerpc/Packages.gz - 73ad5adf388ceee09e7abedd1e3f831065f0bad7 10745 universe/debian-installer/binary-sparc/Packages.gz - 61347da1b6402a667bf9aa74ec090132dfab432f 9806 universe/debian-installer/binary-sparc/Packages.bz2 - 5ede4011ad3f86269710bef5e92414f2195ab7ff 38126 universe/debian-installer/binary-sparc/Packages - d4d2ebead2066fa7cf6be60d016bf91f40b4393b 3165115 universe/source/Sources.bz2 - 4c474f118467127abd40ce7f1ebb748d8967ccec 100 universe/source/Release - 77f442df5c7996bc45ac89163c1be5ed5fcb8e7f 13888852 universe/source/Sources - b3d728b8eb46270d797399ce267d77ae9d443b2c 4005968 universe/source/Sources.gz -SHA256: - c2bc6c826107e16cd734fe13dca015ea130ffac0d3b2867475516b916f7f142c 8595099 main/binary-amd64/Packages - ba13d6e582ba2aedd6e530455a9174f841cbac3c74548fca9407abd1982eb17f 95 main/binary-amd64/Release - 9c26460c9e0d2dd1245ab37911f012a9f22efa783c15b90ca500b6456dc57176 1779333 main/binary-amd64/Packages.gz - 74a8f3192b0eda397d65316e0fa6cd34d5358dced41639e07d9f1047971bfef0 1383205 main/binary-amd64/Packages.bz2 - a891c41cd372484d095e843bbcc62690a855c2057a25ccd69a47b21302878c52 1745634 main/binary-armel/Packages.gz - cab89594b24d599cb42c2ef137fee2a6f20859c61085a89da5082d0078a3d351 95 main/binary-armel/Release - b50fbc091488f2614c65dc80567bffeaef2a85bed6b2b6ca1b17625f7db214e4 1364526 main/binary-armel/Packages.bz2 - f081c84051317f5bddc4ba797555ca9c7f5bdce6dfe78e05265acab696615465 8473939 main/binary-armel/Packages - 095f73f9d2fbbc1c1a84426708978959610be17282420ae96f426deb26d54009 94 main/binary-i386/Release - 0e46596202a68caa754dfe0883f46047525309880c492cdd5e2d0970fcf626aa 1386205 main/binary-i386/Packages.bz2 - d9093f83fd940fcaaf6e5388d1265904801ab70806f70c0a6056c8c727157817 1781497 main/binary-i386/Packages.gz - af50b1ab7763966ddbc81989515196615e341f8d502b8b5328cf04373552f751 8598110 main/binary-i386/Packages - 877fe4efcaf5821a7fde85f88bb90e5d2713ef1423f2dc88135f995a3ed8ee94 1749837 main/binary-ia64/Packages.gz - 6238908944ff783171dd50aba49489ec9ae181255a0a41c7880b379c26da83ce 94 main/binary-ia64/Release - 6f98d81f8417329a13ec9671095f95814086a51d8abecfb363b2c4771c749ce7 8376166 main/binary-ia64/Packages - e99488926d74a56ed050a35cf0892bc883e3b17861fd3f3c201ea7c09863f085 1367515 main/binary-ia64/Packages.bz2 - a2205ba53e1ce42240d0bca0690948e9cdd29fe444490ec13f3e8c4650bc288a 8452314 main/binary-powerpc/Packages - a3a36777dad5a62d86252a88bb46015240a704738ade19e824a3212c114a5457 1763576 main/binary-powerpc/Packages.gz - a1419109251400c948912ed3c0e095297f57225790a220a8428aa753fdbed420 1376781 main/binary-powerpc/Packages.bz2 - 2113e8c7599195894548b60f21b6a9df72410349d3889de9bafcb89f60d63668 97 main/binary-powerpc/Release - b29ea32ad6b36ac510bafb61d0a31388b655ffc040d9baa5671de036b5b39243 95 main/binary-sparc/Release - 11daa191617b295bd46f410fd63d19965d80964ab34afb6a5270ac05cdd11c99 8403646 main/binary-sparc/Packages - f477df15508ae627c8b2ffa0030b2c1210c8c708c76f542c998fd965d87788e1 1751944 main/binary-sparc/Packages.gz - d4ce8246990a2c3c289df94daaf187f43e5c3f126c3bd67fc3069a08ccb951d5 1369305 main/binary-sparc/Packages.bz2 - c7832eb191eb7fc19e19c13b2f03a92a221f2a39c2f4847d6eabc2b9d1597e28 52614 main/debian-installer/binary-amd64/Packages.gz - 192aa1d7a500399db73191903731467c8e94e793675ef83d005df00446cdfbd2 194115 main/debian-installer/binary-amd64/Packages - fba371229ca6853dd939abcd34b8f51c78042aa4fd77e13b00cf06fbdc10439d 41737 main/debian-installer/binary-amd64/Packages.bz2 - 241edd87db786d7528fddf8233f16ae0227a5455eb461f036d688305cd872c45 48196 main/debian-installer/binary-armel/Packages.bz2 - 1076ba4a5dc6c97ed5636cb076978b6935b58573d533498a217ee4b2cc2fd206 240037 main/debian-installer/binary-armel/Packages - 48f7c974794f5cb2e6fc2e9b740945a236168335b8f2366c1c10663d23027a4c 61654 main/debian-installer/binary-armel/Packages.gz - e6028d7bf8a3ceaa0f682977bb8642608180eb5a47f5ba8155cda89752b944fd 45218 main/debian-installer/binary-i386/Packages.bz2 - 0e78ab3fb61ab06e16db7c64acf87c3e17346817128733f1af22da51d9bd383b 218503 main/debian-installer/binary-i386/Packages - 777d616b33d466bc8fbd540487e91dce1f51214d60bb1e58677b26b414b3ba9b 57235 main/debian-installer/binary-i386/Packages.gz - 978319f0eee978f26faddd8048ef52e44ae646cca94a4a9713b2e2647a0a517a 187978 main/debian-installer/binary-ia64/Packages - 9b084ce3e5704145ef6adbf3a877b642175b04799199c685b94083129e24fc0a 40723 main/debian-installer/binary-ia64/Packages.bz2 - a8b2aadb6c019e5ede7c5ba4d5c44efe5a8a01c11400882fc4a25496446ad1f4 51277 main/debian-installer/binary-ia64/Packages.gz - 0576fd306950afe1af3981c5c988213de1f474efd087d7a6d648e35dc8e183ad 57286 main/debian-installer/binary-powerpc/Packages.gz - 295c4da5b30407662378f5b9c3cb933d2cdd9fd44d1e5386c081ed2145519688 217930 main/debian-installer/binary-powerpc/Packages - 46bfb47f5006851a8e1fc9cc5039464600acd442375b3679fa77a1201c99a24d 45144 main/debian-installer/binary-powerpc/Packages.bz2 - 3bae8c7b5f41ac0d2de1e91b7a4594cfe6db59072f42c92465834a085260b5ad 187015 main/debian-installer/binary-sparc/Packages - 11f374ea333deae3780bce1bc489de44f6d91e27e07c0846bf58ebbaf911d2b5 51128 main/debian-installer/binary-sparc/Packages.gz - cdb83137b2cfa34b44e958419b7498819cc8a3fe8459b22a1e350284d79bfc67 40671 main/debian-installer/binary-sparc/Packages.bz2 - 4959448f974f28c1c57140d1cb7c2ea9443b6cfb983fc280d96c5fa16e1f484e 658637 main/source/Sources.bz2 - edd3ca70acb2d2f47187631b6f75b628613b4ff59d83ff0d539e5812ae3775c9 96 main/source/Release - ab69451e2ce609d5ae3cc644e1837203b20ee46736dbdab907fc6d5e732744be 3245836 main/source/Sources - 0b74e2f05565d0f3ec543ead0f9ab35878ddacddbd4a761fc892704ca5c7a30a 833999 main/source/Sources.gz - 179c7efbf1c0e2c4b2871d14809c89f88128a0400d033564e5d54741cfe6eb47 101 multiverse/binary-amd64/Release - b59912293d9bdfd815f80409993ddf7f5120aff738367b7b337878f506f37e9d 175917 multiverse/binary-amd64/Packages.bz2 - 460d534bed0e898baa116d7b67d3361233af7113d8e62e9c0cb96e73aac2d433 227377 multiverse/binary-amd64/Packages.gz - 469bb92445c8b279014627a928fffce1431196613617abac86264fe4f120273d 835855 multiverse/binary-amd64/Packages - dbbc32343dcf6e5a83cbb09f2c72f0f99db7a46913ad117b12506c8cf9812036 207550 multiverse/binary-armel/Packages.gz - 10e603226d59054a8d48a6b32cee85767b3cea4a3aaf7ddd0c6bbcb646faaab9 101 multiverse/binary-armel/Release - e6174479f137d0fce925830dbdb0dce6eb23ddd862cc5114a0e94c267c01306b 753469 multiverse/binary-armel/Packages - fc9c79a63e83c7eaf10e09c7fd0c346ff8eb9424d4daed1d748db3e8a097b6ac 159689 multiverse/binary-armel/Packages.bz2 - 71de4e77a4cbd731add593b95a1fa68281d6125b41f5b305fca81bd03162846a 851731 multiverse/binary-i386/Packages - 6c831c512b20b9743d8e99146256efa77849494973a62d211aaeddaf857f5ec8 232339 multiverse/binary-i386/Packages.gz - a93877e59808eac52dec78b8275e6349e7e43ef87ca56c5dac293bfd66627c97 179690 multiverse/binary-i386/Packages.bz2 - 103ca72efb6233287b3efc96e0486599020eb7a56e889ac3948af93eae70d8df 100 multiverse/binary-i386/Release - 4661ffd1f6205fcff50258580236983f8f5682727c7dad08d3038802df23c8c6 207960 multiverse/binary-ia64/Packages.gz - b1537c932c7e3e0f8f2fcae67103559c0e28b332ab324c41a85dca45bf589b4a 100 multiverse/binary-ia64/Release - 5ba3c768600a3539f5b67b8c29f5eec0c23408d2355b22a6ae456973f46eca66 159999 multiverse/binary-ia64/Packages.bz2 - 2d4373e06db5d5e8b30b193b5245511df86546aa07d0b07999f2d9d7ad7e47ba 748797 multiverse/binary-ia64/Packages - 4f7f3ffa8ee9a1be3e366640bd84d9e1efe5ec6c115d222671e3b45fe8ec9400 212591 multiverse/binary-powerpc/Packages.gz - 4ddcaab8c7686ce317ace420f976cd08054d89c69e7bfa52c68a0fd70fdb8700 103 multiverse/binary-powerpc/Release - 0a0ffa9499591369e7894ccb965f065a2a0ccf1c7f087e30f0801225cfa0a78e 770869 multiverse/binary-powerpc/Packages - 25aad62d010a40d3f84c1205b1ea64da898858461911f598c2f1469d91fc0667 163220 multiverse/binary-powerpc/Packages.bz2 - fcdf8b83ce0a4b618a5ad00eda1c6eca18a00ff96c965e38e76e8b5ce1ac93e7 743247 multiverse/binary-sparc/Packages - dc22ee241e137fa896ed780f92f0de389bc817dc39ee40197802112d5175b6f5 206433 multiverse/binary-sparc/Packages.gz - 8be7a7df16dffcc4a2220c4313a5c7599c164aebc98051561c281987ded92cc7 101 multiverse/binary-sparc/Release - f94e77e221b55eee361617c4d69db999394eb6b1096618b042c3248390bd2d7c 158888 multiverse/binary-sparc/Packages.bz2 - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 multiverse/debian-installer/binary-amd64/Packages - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 multiverse/debian-installer/binary-amd64/Packages.gz - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 multiverse/debian-installer/binary-amd64/Packages.bz2 - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 multiverse/debian-installer/binary-armel/Packages.bz2 - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 multiverse/debian-installer/binary-armel/Packages - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 multiverse/debian-installer/binary-armel/Packages.gz - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 multiverse/debian-installer/binary-i386/Packages.gz - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 multiverse/debian-installer/binary-i386/Packages.bz2 - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 multiverse/debian-installer/binary-i386/Packages - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 multiverse/debian-installer/binary-ia64/Packages - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 multiverse/debian-installer/binary-ia64/Packages.gz - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 multiverse/debian-installer/binary-ia64/Packages.bz2 - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 multiverse/debian-installer/binary-powerpc/Packages.bz2 - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 multiverse/debian-installer/binary-powerpc/Packages - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 multiverse/debian-installer/binary-powerpc/Packages.gz - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 multiverse/debian-installer/binary-sparc/Packages.bz2 - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 multiverse/debian-installer/binary-sparc/Packages.gz - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 multiverse/debian-installer/binary-sparc/Packages - c59df461a11de72fab44064559bdf0f1493fb71d0d61c20670bffb431f8e2ed5 118837 multiverse/source/Sources.bz2 - 3d205ae91ab3570049adbfe851c8b3ab3154f094e54b6000c876ef9039dd2c02 504210 multiverse/source/Sources - 3b349aff645051214a77d18dbbddf69bba66aea8b361d9ecef4eaa7ce897396e 145577 multiverse/source/Sources.gz - 42f6c3881336d71362322c67ad19f843f720fbf4c14debd4ed1e9896c8c88368 102 multiverse/source/Release - a29af736e1ed0be3a393ae49da8d59acc3bfdd29a7e03268b3909b24e090bb37 6149 restricted/binary-amd64/Packages.gz - 7e9d838737868748f7b3dc34509a077e6f5b1f21910379b986d556ee2b308d5f 29002 restricted/binary-amd64/Packages - 04354c3017adf5bc36a93eeb9ed5a3f3e68d8192558a390f61f21d9a4ee9af55 101 restricted/binary-amd64/Release - 220c7475ccebc75767fd7deac35b0fde1e03e76b35ab58df9d7964a14db2febc 6193 restricted/binary-amd64/Packages.bz2 - c4d112b6591d08205ac5546a611eb1466b9e39341f7bb8540f91678a850e1fa4 508 restricted/binary-armel/Packages.gz - 9e7aa9da79e68b40a3247baa8e6b3d552b504cd9f46ba984c359ad5633b14e27 564 restricted/binary-armel/Packages.bz2 - 6c485ed27e825538bd420b048fdf44183bfe02e2fa3f0911683b67d4a598cf21 101 restricted/binary-armel/Release - c38b6bb37e32acf7d738fdb6e3a712030d5fbb37aac95f7804f38d23a692a7a5 800 restricted/binary-armel/Packages - 6ca65bb815a59e1e08acb42dfcd996b7cd48f5bf13a7d9b7115972bcc4557193 6133 restricted/binary-i386/Packages.gz - 26c6c737ad3b145710b745b918b661189e292732c2180e9e0eeee96683d8614f 100 restricted/binary-i386/Release - 5a1f3d9cd1dc4eff62b73d9e0cd0bfb96302a8aaba281b07ac99775f0624f162 28922 restricted/binary-i386/Packages - 6c6f1d1a557df1d38d438ba1932d9a05119365316a15ecf94e1eb367afae77ca 6208 restricted/binary-i386/Packages.bz2 - 80fe8677b9905014bb9c3de109d3a44a6f387991a27421d5e5f0abf5bdff426d 552 restricted/binary-ia64/Packages.bz2 - e944219f02b73d2565af6ee644d2941afc7d9a0e0342fb3ac89ec6b54e053775 100 restricted/binary-ia64/Release - f391f7c05313707e5634e4d519ba11da1547789c2ad9208c0de3ec7d46ba0263 785 restricted/binary-ia64/Packages - 38ecfafb509ea9daac5b38cb2f06993d2b57108565af0264760f546422faf1af 497 restricted/binary-ia64/Packages.gz - 80fe8677b9905014bb9c3de109d3a44a6f387991a27421d5e5f0abf5bdff426d 552 restricted/binary-powerpc/Packages.bz2 - 38ecfafb509ea9daac5b38cb2f06993d2b57108565af0264760f546422faf1af 497 restricted/binary-powerpc/Packages.gz - f391f7c05313707e5634e4d519ba11da1547789c2ad9208c0de3ec7d46ba0263 785 restricted/binary-powerpc/Packages - f5fa571a2c002209639eaaec9c66d3c60e3035b3430a7c3e3c8008606705b7d1 103 restricted/binary-powerpc/Release - f391f7c05313707e5634e4d519ba11da1547789c2ad9208c0de3ec7d46ba0263 785 restricted/binary-sparc/Packages - 9ace4eb586e77ba82f4963ff7d3576eabf7aefa07b56def57751730a183c38d5 101 restricted/binary-sparc/Release - 80fe8677b9905014bb9c3de109d3a44a6f387991a27421d5e5f0abf5bdff426d 552 restricted/binary-sparc/Packages.bz2 - 38ecfafb509ea9daac5b38cb2f06993d2b57108565af0264760f546422faf1af 497 restricted/binary-sparc/Packages.gz - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/debian-installer/binary-amd64/Packages - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/debian-installer/binary-amd64/Packages.bz2 - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-amd64/Packages.gz - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-armel/Packages.gz - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/debian-installer/binary-armel/Packages.bz2 - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/debian-installer/binary-armel/Packages - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/debian-installer/binary-i386/Packages.bz2 - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/debian-installer/binary-i386/Packages - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-i386/Packages.gz - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-ia64/Packages.gz - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/debian-installer/binary-ia64/Packages - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/debian-installer/binary-ia64/Packages.bz2 - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-powerpc/Packages.gz - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/debian-installer/binary-powerpc/Packages.bz2 - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/debian-installer/binary-powerpc/Packages - f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-sparc/Packages.gz - d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 14 restricted/debian-installer/binary-sparc/Packages.bz2 - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 restricted/debian-installer/binary-sparc/Packages - 7ebba06ba44cfeeed10cddfe9ce4ee2b35bc42f764158e410ee11a61874dfa06 102 restricted/source/Release - a918c3947ab834297f3d2c497e961f11e48539a5ce77fe0e5b70b0a69e28c1e2 11670 restricted/source/Sources - 77ede22795f344b4373e5bda1d57c6e1f5bae14b56868540031ea378ac1a0a55 3580 restricted/source/Sources.gz - 88712e84fd5593009e38e85ca37a7d0f6923e9c5998def8a2cc30a6a0da6936b 3775 restricted/source/Sources.bz2 - f279288eefc126ef7e8dbae71f662b6fcd208c3a0fa5f920d7f831da167ef09e 99 universe/binary-amd64/Release - 536e97eea0a481c3df2cfc5b4568601a3c8f837f65e837daa0556ca128e25e08 26734222 universe/binary-amd64/Packages - 49d23df9370758b4159051a1814cf01230c59fa9243295105c4bb38c9c5d5484 5429539 universe/binary-amd64/Packages.bz2 - 28742757ae39144b9988ecea862d2f5c23654c9ad88fa609d86c4f3000b00b9f 7015632 universe/binary-amd64/Packages.gz - 7ac3d1dccda5bf50c20574198cc10128f3dd3898d875fb647fd6575f2bf33616 26046136 universe/binary-armel/Packages - ae9406e2a5223576872ba590db52a22d365d2aa67e22f4aeb88d0ffc48d45a3a 6835261 universe/binary-armel/Packages.gz - 3c9303f6b76d9b49e327f9f9ff250cf1dc5ce234643351b700de7ab4ab4a7e01 5286781 universe/binary-armel/Packages.bz2 - 3b7cd3879b7d42d359cfedeff10e8b760d4f39b8c2093c2d1a158f620b08c0d6 99 universe/binary-armel/Release - c5dc922c8f0ac07b8d428b46f795b26aa1cdf5863bae5c148f9aa7bcf5f1c29d 26807886 universe/binary-i386/Packages - a1be5af3be86e137a831343682b75243f78cc32944832c718bf0bd33f8393626 98 universe/binary-i386/Release - 07fa37630e04c1e96fd13815d6670b040b88885c3f8846537f7dddb1774bc231 7039759 universe/binary-i386/Packages.gz - fec57f9f84339bebbcbb6574a359650c46e409be6eade684be2f2665cfd2db8e 5447752 universe/binary-i386/Packages.bz2 - 67105e5d45b3cf36b04ea94025767947bf7623052071743f87a6b6556519c956 6875622 universe/binary-ia64/Packages.gz - 4b2e06335e74dd487721f333d344620362708dcb75bd757a7a727f4b95ae7185 98 universe/binary-ia64/Release - 4a307c3e89fd670d71cf3289a1a89b7bd6de3984c339416464eb1b190a112f64 26078621 universe/binary-ia64/Packages - 08059299d799f5271216b10cd2a0d329c8a8479057ad43b43d0bf9ca43d88642 5310527 universe/binary-ia64/Packages.bz2 - cac2be1cffbede73ef368cdad10fab2f514490fe2e2b4c92eabd0600d28a56c0 6970013 universe/binary-powerpc/Packages.gz - c58c69d1531f019bf8de0120f259abbb3e0a3e0b68e2a5acd9324b9af88e1f52 5394194 universe/binary-powerpc/Packages.bz2 - 9789763a4555391aa2044b6576f1cb2d0c030db712f36fdd817a6ec8ad7dd4e7 101 universe/binary-powerpc/Release - a3c52bdae25bb9ee07edfad21a09fe427503429a465acbf413b3214aff4e00de 26605550 universe/binary-powerpc/Packages - c1ac4277c1690cabd25c329f07f95a4977cc617738e660e4168de382edc46137 26213750 universe/binary-sparc/Packages - afc966573f8c882e8c87379829d946b7db358d2e53b053f2254b60fd62015306 99 universe/binary-sparc/Release - 3578e90cdaa5fc01f35aa19ba18f1653737e1fa092aeaac71119447ca2f30c88 6888044 universe/binary-sparc/Packages.gz - 1236e14d44574622191fdefdb13686a81c644d317631d496933eb5791b2b0ad2 5330271 universe/binary-sparc/Packages.bz2 - 261c00a23103dcba1623fc8fb3c0a29abd243bb913b26d838fd31c9e75999875 10279 universe/debian-installer/binary-amd64/Packages.bz2 - 5fe84f0b1660d6939909d0c0cff5a19d190bd1ff3dc6a02fb0037c93831bff30 40037 universe/debian-installer/binary-amd64/Packages - f2bc0d4f4a0fe36ee1f4d2f81c29a8c651b53b126662c192211daef7bcb01d65 11317 universe/debian-installer/binary-amd64/Packages.gz - 8eddb7cf1f620c0d72c32739504c455bee15e2a1e737c5be84b4a482dbbe1590 11433 universe/debian-installer/binary-armel/Packages.gz - 50d778a6464e556336e03332a16f5c96660babc581339b322d394906d877467d 10385 universe/debian-installer/binary-armel/Packages.bz2 - b06ebdbf67aa0b511416d2c70e80379e6d9fd7e92a83de588792962fe6e17b6b 40286 universe/debian-installer/binary-armel/Packages - d23a3bf578b66bbc38ab358522b3c6af799d7e60b5b7c8052e95559db68b43da 11295 universe/debian-installer/binary-i386/Packages.gz - 0e09478f0c06c6d3724528a4de4863bfb3e2ca06836cd189b9b0d1c009f6a960 39992 universe/debian-installer/binary-i386/Packages - 2e590c3016bc81ab2142d86cc01fcf0ee2b3839d082aa5996f516d4db7b7a776 10272 universe/debian-installer/binary-i386/Packages.bz2 - de3b987eb85a1d196be25021e71eacfa7e94f632730d2a7100f7a67dd1a8c86e 39417 universe/debian-installer/binary-ia64/Packages - 3f0de3953eaceb1b34e0f8fa230dcbc1f0bc5b61dd228f32bc42c699a8c625c8 10107 universe/debian-installer/binary-ia64/Packages.bz2 - 73b7dacc0ca6db43117bcfd0534d964a8333dc4d470d4df20c8b291e68687cb6 11132 universe/debian-installer/binary-ia64/Packages.gz - dd6acbb610466ec2eefa2e1f5190c40770cf8c830fe8301fe250025089531a9f 40531 universe/debian-installer/binary-powerpc/Packages - 4966d98a5627b2f0bc4221b33d2a3189149d528cb151f80522d904cf084e54f4 10312 universe/debian-installer/binary-powerpc/Packages.bz2 - 506b7e32b7766c8fe54090ed9a59696f99b9d294e1561ff28608681a1d71bc05 11362 universe/debian-installer/binary-powerpc/Packages.gz - d529381dbda89ff8d5be006e06b87d34991008e9648d610bbfea5b284266bf4f 10745 universe/debian-installer/binary-sparc/Packages.gz - 820533a6ebc7353ad0e17777efd901342fca412ed15e8dc44c6a00c25d1127b8 9806 universe/debian-installer/binary-sparc/Packages.bz2 - 87bd7ab6ac590d4356d14af50590b265de4a410ac5d661d28e68d0f109b776d8 38126 universe/debian-installer/binary-sparc/Packages - 4dea11c08b8e102cadba97561a53f6364fe6b0092dba63d9cfd4571ef1531f1a 3165115 universe/source/Sources.bz2 - 82a7f64d43cb9618a9139faf0ffe55ddfdd457d985dd2d2dcde43fa8ff7f9d1f 100 universe/source/Release - 49c0202ce6bf54cc6e0eb47bb68f2dc9cf5d42089f95de958fd913504de7cf9c 13888852 universe/source/Sources - f44fd6dc3ad168dd291da2b4390b2d5474a634b1d90abe6534cca53144e4447a 4005968 universe/source/Sources.gz diff -Nru update-manager-17.10.11/tests/aptroot-update-list-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release.gpg update-manager-0.156.14.15/tests/aptroot-update-list-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release.gpg --- update-manager-17.10.11/tests/aptroot-update-list-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release.gpg 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-update-list-test/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_lucid_Release.gpg 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQBL2cDzQJdur0N9BbURAmk2AJ9ungOjKn0ektAH87KhRIHht+1cDQCfck7P -ZoIb2P0v2PEqa4Az8KnIIW4= -=b/mY ------END PGP SIGNATURE----- diff -Nru update-manager-17.10.11/tests/aptroot-update-list-test/var/lib/dpkg/status update-manager-0.156.14.15/tests/aptroot-update-list-test/var/lib/dpkg/status --- update-manager-17.10.11/tests/aptroot-update-list-test/var/lib/dpkg/status 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-update-list-test/var/lib/dpkg/status 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -Package: apt -Status: install ok installed -Priority: important -Section: admin -Installed-Size: 3005 -Maintainer: Ubuntu Developers -Architecture: all -Version: 0.1 -Description: a example package with no phased updates - -Package: zsh -Status: install ok installed -Priority: important -Section: admin -Installed-Size: 3005 -Maintainer: Ubuntu Developers -Architecture: all -Version: 0.1 -Phased-Update-Percentage: 10 -Description: a example package with a phased updates percentage of 10% - -Package: zsh-dev -Status: install ok installed -Priority: important -Section: admin -Installed-Size: 3005 -Maintainer: Ubuntu Developers -Architecture: all -Version: 0.1 -Phased-Update-Percentage: 10 -Description: a second binary example package with a phased updates percentage of 10% - diff -Nru update-manager-17.10.11/tests/aptroot-update-origin/etc/apt/sources.list update-manager-0.156.14.15/tests/aptroot-update-origin/etc/apt/sources.list --- update-manager-17.10.11/tests/aptroot-update-origin/etc/apt/sources.list 2017-08-07 16:35:50.000000000 +0000 +++ update-manager-0.156.14.15/tests/aptroot-update-origin/etc/apt/sources.list 2017-12-23 05:00:38.000000000 +0000 @@ -1,5 +1,5 @@ -deb http://archive.ubuntu.com/ubuntu xenial main -deb http://archive.ubuntu.com/ubuntu xenial-security main -deb http://security.ubuntu.com/ubuntu xenial-security main -deb http://archive.ubuntu.com/ubuntu xenial-updates main +deb http://archive.ubuntu.com/ubuntu lucid main +deb http://archive.ubuntu.com/ubuntu lucid-security main +deb http://security.ubuntu.com/ubuntu lucid-security main +deb http://archive.ubuntu.com/ubuntu lucid-updates main Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/tests/aptroot-update-origin/etc/apt/trusted.gpg and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/tests/aptroot-update-origin/etc/apt/trusted.gpg differ diff -Nru update-manager-17.10.11/tests/hwe_support_status.py update-manager-0.156.14.15/tests/hwe_support_status.py --- update-manager-17.10.11/tests/hwe_support_status.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/hwe_support_status.py 2017-12-23 05:00:38.000000000 +0000 @@ -4,14 +4,12 @@ import optparse import datetime -import distro_info import os import re -import subprocess import sys import apt -from UpdateManager.Core.utils import twrap, get_dist +from UpdateManager.Core.utils import twrap # set locale early so that the subsequent imports have localized # strings @@ -28,68 +26,58 @@ from HweSupportStatus.consts import ( Messages, - LTS_EOL_DATE, - HWE_EOL_DATE, - NEXT_LTS_DOT1_DATE, + PRECISE_EOL_DATE, + PRECISE_HWE_EOL_DATE, + TRUSTY_DOT1_DATE, ) + - -# HWE stack with a short support period +# HWE backport names that are no longer supported HWE_UNSUPPORTED_BACKPORTS = ( - "-lts-utopic", - "-lts-vivid", - "-lts-wily" + "-lts-quantal", + "-lts-raring", + "-lts-saucy" ) # from https://wiki.ubuntu.com/Kernel/LTSEnablementStack -UNSUPPORTED_KERNEL_IMAGE_REGEX = \ - r'linux-image.*-(3\.16|3\.19|4\.2)(\.[0-9]+)?-.*' + # version 3.11.x 3.8.x and 3.5.x are unsupported in precise +UNSUPPORTED_KERNEL_IMAGE_REGEX = r'linux-.*-3\.(11|8|5)(\.[0-9]+)?-.*' -# HWE stack with a long support period -HWE_SUPPORTED_BACKPORT = "-lts-xenial" -SUPPORTED_KERNEL_IMAGE_REGEX = r'linux-image.*-4\.4(\.[0-9]+)?-.*' +# supported HWE stack +HWE_SUPPORTED_BACKPORT = "-lts-trusty" +SUPPORTED_KERNEL_IMAGE_REGEX = r'linux-.*-3\.13(\.[0-9]+)?-.*' KERNEL_METAPKGS = ( "linux-generic", "linux-image-generic", - "linux-signed-generic", - "linux-signed-image-generic", ) XORG_METAPKGS = ( "xserver-xorg", "libgl1-mesa-glx", - # LP: #1610434 - Ubuntu GNOME needed libwayland - "libwayland-egl1-mesa", -) -VBOX_METAPKGS = ( - "virtualbox-guest-utils", - "virtualbox-guest-source" ) -METAPKGS = KERNEL_METAPKGS + XORG_METAPKGS + VBOX_METAPKGS +METAPKGS = KERNEL_METAPKGS + XORG_METAPKGS class Package: """A lightweight apt package """ - def __init__(self, name, version, arch, foreign=False): + def __init__(self, name, version): self.name = name self.installed_version = version - self.arch = arch - self.foreign = foreign def find_hwe_packages(installed_packages): unsupported_hwe_packages = set() supported_hwe_packages = set() for pkg in installed_packages: - # metapackages and X are marked with the -lts-$distro string + # metapackages and X are marked with the -lts-distro string for name in HWE_UNSUPPORTED_BACKPORTS: if pkg.name.endswith(name): unsupported_hwe_packages.add(pkg) - # The individual backported kernels have names like + # The individual backported kernels have names like # linux-image-3.11.0-17-generic # so we match via a regexp. - # - # The linux-image-generic-lts-$distro metapkg has additional + # + # The linux-image-generic-lts-saucy metapkg has additional # dependencies (like linux-firmware) so we can't just walk the # dependency chain. if re.match(UNSUPPORTED_KERNEL_IMAGE_REGEX, pkg.name): @@ -119,7 +107,7 @@ def is_unsupported_xstack_running(unsupported_hwe_packages): # the HWE xstacks conflict with each other, so we can simply test - # for existence in the installed unsupported hwe packages + # for existance in the installed unsupported hwe packages for pkg in unsupported_hwe_packages: for xorg_meta in XORG_METAPKGS: if pkg.name.startswith(xorg_meta): @@ -127,22 +115,18 @@ return False -def find_supported_replacement_hwe_packages(unsupported_hwe_packages, - installed_packages): +def find_supported_replacement_hwe_packages(unsupported_hwe_packages): unsupported_metapkg_names = set() replacement_names = set() + unsupported_hwe_package_names = set( + [pkg.name for pkg in unsupported_hwe_packages]) for metapkg in METAPKGS: for unsupported_backport in HWE_UNSUPPORTED_BACKPORTS: metapkg_name = metapkg + unsupported_backport - for pkg in unsupported_hwe_packages: - if pkg.name == metapkg_name: - replacement_name = metapkg + HWE_SUPPORTED_BACKPORT - if (replacement_name, pkg.arch) not in \ - [(p.name, p.arch) for p in installed_packages]: - if pkg.foreign: - replacement_name += ':' + pkg.arch - replacement_names.add(replacement_name) - unsupported_metapkg_names.add(metapkg_name) + if metapkg_name in unsupported_hwe_package_names: + replacement_name = metapkg + HWE_SUPPORTED_BACKPORT + replacement_names.add(replacement_name) + unsupported_metapkg_names.add(metapkg_name) return unsupported_metapkg_names, replacement_names @@ -152,38 +136,30 @@ def advice_about_hwe_status(unsupported_hwe_packages, supported_hwe_packages, - installed_packages, has_update_manager, today, - verbose): + has_update_manager, verbose): unsupported_hwe_stack_running = is_unsupported_hwe_running( unsupported_hwe_packages) unsupported_hwe_metapkgs, supported_replacement_hwe = \ - find_supported_replacement_hwe_packages(unsupported_hwe_packages, - installed_packages) - # we need the "-p" option until the next LTS point release is available - if today < NEXT_LTS_DOT1_DATE: + find_supported_replacement_hwe_packages(unsupported_hwe_packages) + # we need the "-p" option until 14.04.1 is released on 2014-07-15 + if datetime.date.today() < TRUSTY_DOT1_DATE: do_release_upgrade_option = "-p" else: do_release_upgrade_option = "" if unsupported_hwe_stack_running: - if today < HWE_EOL_DATE: + if datetime.date.today() < PRECISE_HWE_EOL_DATE: s = Messages.HWE_SUPPORT_ENDS else: s = Messages.HWE_SUPPORT_HAS_ENDED if has_update_manager: print(s + Messages.UM_UPGRADE) else: - # bug #1341320 - if no metapkg is left we need to show - # what is no longer supported - if supported_replacement_hwe: - print(s + Messages.APT_UPGRADE % ( - do_release_upgrade_option, - " ".join(supported_replacement_hwe))) - else: - print(s + Messages.APT_SHOW_UNSUPPORTED % ( - " ".join([pkg.name for pkg in unsupported_hwe_packages]))) + print(s + Messages.APT_UPGRADE % ( + do_release_upgrade_option, + " ".join(supported_replacement_hwe))) - # some unsupported package installed but not running and not superseded + # some unsupported package installed but not running and not superseeded # - this is worth reporting elif (unsupported_hwe_packages and not supported_hwe_packages and @@ -191,40 +167,40 @@ s = _(""" You have packages from the Hardware Enablement Stack (HWE) installed that are going out of support on %s. - """) % HWE_EOL_DATE + """) % PRECISE_HWE_EOL_DATE if has_update_manager: print(s + Messages.UM_UPGRADE) else: print(s + Messages.APT_UPGRADE % ( do_release_upgrade_option, " ".join(supported_replacement_hwe))) + elif supported_hwe_packages: print(Messages.HWE_SUPPORTED) elif verbose: print( _("You are not running a system with a Hardware Enablement Stack. " "Your system is supported until %(month)s %(year)s.") % { - 'month': LTS_EOL_DATE.strftime("%B"), - 'year': LTS_EOL_DATE.year}) + 'month': PRECISE_EOL_DATE.strftime("%B"), + 'year': PRECISE_EOL_DATE.year}) if __name__ == "__main__": parser = optparse.OptionParser(description=_("Check HWE support status")) parser.add_option('--quiet', action='store_true', default=False, - help="No output, exit code 10 on unsupported HWE " - "packages") + help="No output, exit code 1 on unsupported HWE " + "packages") parser.add_option('--verbose', action='store_true', default=False, - help="more verbose output") + help="more verbose output") parser.add_option('--show-all-unsupported', action='store_true', - default=False, - help="Show unsupported HWE packages") + default=False, + help="Show unsupported HWE packages") parser.add_option('--show-replacements', action='store_true', default=False, - help="show what packages need installing to be " - "supported") + help='show what packages need installing to be supported') # hidden, only useful for testing parser.add_option( - '--disable-hwe-check-semaphore-file', + '--disable-hwe-check-semaphore-file', default="/var/lib/update-notifier/disable-hwe-eol-messages", help=optparse.SUPPRESS_HELP) options, args = parser.parse_args() @@ -233,17 +209,7 @@ nullfd = os.open(os.devnull, os.O_WRONLY) os.dup2(nullfd, sys.stdout.fileno()) - # Check to see if we are an LTS release - di = distro_info.UbuntuDistroInfo() - codename = get_dist() - lts = di.is_lts(codename) - if not lts: - if options.verbose: - print("Only LTS releases have Hardware Enablement stacks", - file=sys.stderr) - sys.exit(0) - - # request from PSE to be able to disable the hwe check via a special + # request from PSE to be able to disabled the hwe check via a special # semaphore file HWE_CHECK_DISABLED_FILE = options.disable_hwe_check_semaphore_file if os.path.exists(HWE_CHECK_DISABLED_FILE): @@ -252,47 +218,32 @@ HWE_CHECK_DISABLED_FILE, file=sys.stderr) sys.exit(0) - foreign_archs = set(subprocess.check_output( - ['dpkg', '--print-foreign-architectures'], - universal_newlines=True).split()) - # do the actual check installed_packages = set() - today = datetime.date.today() tagf = apt.apt_pkg.TagFile("/var/lib/dpkg/status") while tagf.step(): if tagf.section.find("Status", "") != "install ok installed": continue pkgname = tagf.section.find("Package") version = tagf.section.find("Version") - arch = tagf.section.find("Architecture") - foreign = arch in foreign_archs - installed_packages.add(Package(pkgname, version, arch, foreign)) + installed_packages.add(Package(pkgname, version)) - has_update_manager = "update-manager" in [ - pkg.name for pkg in installed_packages] + has_update_manager = "update-manager" in installed_packages unsupported_hwe_packages, supported_hwe_packages = find_hwe_packages( installed_packages) - if options.show_all_unsupported: - if today > HWE_EOL_DATE: - print(twrap(" ".join([ - pkg.foreign and pkg.name + ':' + pkg.arch or pkg.name - for pkg in unsupported_hwe_packages]))) - + print(twrap(" ".join(unsupported_hwe_packages))) if options.show_replacements: - unsupported, replacements = find_supported_replacement_hwe_packages( - unsupported_hwe_packages, installed_packages) - if replacements: - print(" ".join(replacements)) - + unsupported, replacements = find_supported_replacement_hwe_packages( + unsupported_hwe_packages) + print(" ".join(replacements)) + if not options.show_all_unsupported and not options.show_replacements: advice_about_hwe_status( - unsupported_hwe_packages, supported_hwe_packages, - installed_packages, has_update_manager, today, - options.verbose) - if is_unsupported_hwe_running(unsupported_hwe_packages) and \ - today > HWE_EOL_DATE: + unsupported_hwe_packages, supported_hwe_packages, + has_update_manager, options.verbose) + + if is_unsupported_hwe_running(unsupported_hwe_packages): sys.exit(10) sys.exit(0) diff -Nru update-manager-17.10.11/tests/interactive_fetch_release_upgrader.py update-manager-0.156.14.15/tests/interactive_fetch_release_upgrader.py --- update-manager-17.10.11/tests/interactive_fetch_release_upgrader.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/interactive_fetch_release_upgrader.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,85 @@ +#!/usr/bin/python + +import unittest + +import os +import os.path +import sys +sys.path = [os.path.normpath(os.path.join(os.getcwd(),"../"))] + sys.path + +from UpdateManager.GtkProgress import GtkFetchProgress +from UpdateManager.UpdateManager import UpdateManager +from UpdateManager.MetaReleaseGObject import MetaRelease +from UpdateManager.DistUpgradeFetcher import DistUpgradeFetcherGtk + +def _(s): return s + +# FIXME: use dogtail +# something like (needs to run as a seperate process): +# +# from dogtail.procedural import * +# focus.application('displayconfig-gtk') +# focus.frame('Screen and Graphics Preferences') +# click("Plug 'n' Play", roleName='push button') +# focus.window('Choose Screen') +# select('Flat Panel 1024x768', roleName='table cell') +# keyCombo("Return") +# click('OK', roleName='push button') + + +class TestMetaReleaseGUI(unittest.TestCase): + def setUp(self): + self.new_dist = None + + def new_dist_available(self, meta_release, upgradable_to): + #print "new dist: ", upgradable_to.name + #print "new dist: ", upgradable_to.version + #print "meta release: %s" % meta_release + self.new_dist = upgradable_to + + def testnewdist(self): + meta = MetaRelease() + meta.METARELEASE_URI = "http://changelogs.ubuntu.com/meta-release-unit-testing" + meta._buildMetaReleaseFile() + meta.connect("new_dist_available", self.new_dist_available) + meta.download() + self.assert_(meta.downloading == False) + no_new_information = meta.check() + self.assert_(no_new_information == False) + self.assert_(self.new_dist is not None) + +class TestReleaseUpgradeFetcherGUI(unittest.TestCase): + def _new_dist_available(self, meta_release, upgradable_to): + self.new_dist = upgradable_to + + def setUp(self): + meta = MetaRelease() + meta.METARELEASE_URI = "http://changelogs.ubuntu.com/meta-release-unit-testing" + meta.connect("new_dist_available", self._new_dist_available) + meta.download() + self.assert_(meta.downloading == False) + no_new_information = meta.check() + self.assert_(no_new_information == False) + self.assert_(self.new_dist is not None) + + def testdownloading(self): + parent = UpdateManager("/usr/share/update-manager/") + progress = GtkFetchProgress(parent, + _("Downloading the upgrade " + "tool"), + _("The upgrade tool will " + "guide you through the " + "upgrade process.")) + fetcher = DistUpgradeFetcherGtk(self.new_dist, parent=parent, progress=progress) + self.assert_(fetcher.showReleaseNotes()) + self.assert_(fetcher.fetchDistUpgrader()) + self.assert_(fetcher.extractDistUpgrader()) + fetcher.script = fetcher.tmpdir+"/gutsy" + #fetcher.verifyDistUprader() + self.assert_(fetcher.authenticate()) + self.assert_(fetcher.runDistUpgrader()) + + +if __name__ == '__main__': + unittest.main() + diff -Nru update-manager-17.10.11/tests/Makefile update-manager-0.156.14.15/tests/Makefile --- update-manager-17.10.11/tests/Makefile 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/Makefile 2017-12-23 05:00:38.000000000 +0000 @@ -1,5 +1,17 @@ #!/usr/bin/make +all: check # mago_test + +check: + set -e; \ + find . -name 'test_*.py' | \ + while read file; do \ + if [ -x $$file ]; then \ + echo "*** RUNNING $$file"; \ + python $$file ; \ + fi \ + done + mago_test: #MAGO_SHARE=./mago/ mago -f basic.xml MAGO_SHARE=./mago/ mago --log-level=debug -f basic.xml diff -Nru update-manager-17.10.11/tests/patchdir/dotdot_expected update-manager-0.156.14.15/tests/patchdir/dotdot_expected --- update-manager-17.10.11/tests/patchdir/dotdot_expected 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/patchdir/dotdot_expected 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,2 @@ +. +. diff -Nru update-manager-17.10.11/tests/patchdir/dotdot_orig update-manager-0.156.14.15/tests/patchdir/dotdot_orig --- update-manager-17.10.11/tests/patchdir/dotdot_orig 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/patchdir/dotdot_orig 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1 @@ +. diff -Nru update-manager-17.10.11/tests/patchdir/fail_orig update-manager-0.156.14.15/tests/patchdir/fail_orig --- update-manager-17.10.11/tests/patchdir/fail_orig 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/patchdir/fail_orig 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1 @@ +This is a patch that is intended to fail to ensure that the md5sum check works diff -Nru update-manager-17.10.11/tests/patchdir/foo_orig update-manager-0.156.14.15/tests/patchdir/foo_orig --- update-manager-17.10.11/tests/patchdir/foo_orig 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/patchdir/foo_orig 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,2 @@ +Hello +World diff -Nru update-manager-17.10.11/tests/patchdir/fstab_orig update-manager-0.156.14.15/tests/patchdir/fstab_orig --- update-manager-17.10.11/tests/patchdir/fstab_orig 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/patchdir/fstab_orig 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,17 @@ +# /etc/fstab: static file system information. +# +# Use 'blkid -o value -s UUID' to print the universally unique identifier +# for a device; this may be used with UUID= as a more robust way to name +# devices that works even if disks are added and removed. See fstab(5). +# +# +proc /proc proc nodev,noexec,nosuid 0 0 +# / was on /dev/sda1 during installation +UUID=6e45e093-05ff-43e4-9525-4206e8840761 / ext4 errors=remount-ro 0 1 +# swap was on /dev/sda5 during installation +UUID=c8b0eb70-9f4c-4c38-81fe-7309fb1965d0 none swap sw 0 0 + +# 1.5tb disk +UUID=e47814ee-ba9f-4c65-98cd-6f92a7fe26ba /space ext4 defaults 0 0 + +#/dev/sr0 /cdrom iso9660 defaults 0 0 diff -Nru update-manager-17.10.11/tests/patchdir/patchdir_dotdot.8cf8463b34caa8ac871a52d5dd7ad1ef.cddc4be46bedd91db15ddb9f7ddfa804 update-manager-0.156.14.15/tests/patchdir/patchdir_dotdot.8cf8463b34caa8ac871a52d5dd7ad1ef.cddc4be46bedd91db15ddb9f7ddfa804 --- update-manager-17.10.11/tests/patchdir/patchdir_dotdot.8cf8463b34caa8ac871a52d5dd7ad1ef.cddc4be46bedd91db15ddb9f7ddfa804 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/patchdir/patchdir_dotdot.8cf8463b34caa8ac871a52d5dd7ad1ef.cddc4be46bedd91db15ddb9f7ddfa804 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,4 @@ +1a +.. +. +s/.// diff -Nru update-manager-17.10.11/tests/patchdir/patchdir_fail.ed04abbc6ee688ee7908c9dbb4b9e0a2.deadbeefdeadbeefdeadbeff update-manager-0.156.14.15/tests/patchdir/patchdir_fail.ed04abbc6ee688ee7908c9dbb4b9e0a2.deadbeefdeadbeefdeadbeff --- update-manager-17.10.11/tests/patchdir/patchdir_fail.ed04abbc6ee688ee7908c9dbb4b9e0a2.deadbeefdeadbeefdeadbeff 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/patchdir/patchdir_fail.ed04abbc6ee688ee7908c9dbb4b9e0a2.deadbeefdeadbeefdeadbeff 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1 @@ +1d diff -Nru update-manager-17.10.11/tests/patchdir/patchdir_foo.f41121a903eafadf258962abc57c8644.52f83ff6877e42f613bcd2444c22528c update-manager-0.156.14.15/tests/patchdir/patchdir_foo.f41121a903eafadf258962abc57c8644.52f83ff6877e42f613bcd2444c22528c --- update-manager-17.10.11/tests/patchdir/patchdir_foo.f41121a903eafadf258962abc57c8644.52f83ff6877e42f613bcd2444c22528c 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/patchdir/patchdir_foo.f41121a903eafadf258962abc57c8644.52f83ff6877e42f613bcd2444c22528c 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1 @@ +1d diff -Nru update-manager-17.10.11/tests/patchdir/patchdir_fstab.a1b72f1370f4f847f602fd0e239265d2.c56d2d038afb651920c83106ec8dfd09 update-manager-0.156.14.15/tests/patchdir/patchdir_fstab.a1b72f1370f4f847f602fd0e239265d2.c56d2d038afb651920c83106ec8dfd09 --- update-manager-17.10.11/tests/patchdir/patchdir_fstab.a1b72f1370f4f847f602fd0e239265d2.c56d2d038afb651920c83106ec8dfd09 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/patchdir/patchdir_fstab.a1b72f1370f4f847f602fd0e239265d2.c56d2d038afb651920c83106ec8dfd09 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,13 @@ +17c + + +# Some additional junk +. +13a +# lalal# lalalaa + +. +10c +UUID=-05ff-43e4-9525-4206e8840761 / ext4 errors=remount-ro 0 1 +. +3d diff -Nru update-manager-17.10.11/tests/patchdir/patchdir_pycompile.b17cebfbf18d152702278b15710d5095.97c07a02e5951cf68cb3f86534f6f917 update-manager-0.156.14.15/tests/patchdir/patchdir_pycompile.b17cebfbf18d152702278b15710d5095.97c07a02e5951cf68cb3f86534f6f917 --- update-manager-17.10.11/tests/patchdir/patchdir_pycompile.b17cebfbf18d152702278b15710d5095.97c07a02e5951cf68cb3f86534f6f917 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/patchdir/patchdir_pycompile.b17cebfbf18d152702278b15710d5095.97c07a02e5951cf68cb3f86534f6f917 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,80 @@ +278a + if process.returncode not in (None, 0): + rv = process.returncode + sys.exit(rv) +. +276a + rv = 0 +. +271c + compile(files, versions, + options.force, options.optimize, e_patterns) +. +265c + compile(files, versions, + options.force, options.optimize, e_patterns) +. +258c + compile(files, compile_versions, options.force, + options.optimize, e_patterns) +. +238c + if options.vrange and options.vrange[0] == options.vrange[1] and\ + options.vrange != (None, None) and\ + exists("/usr/bin/python%d.%d" % options.vrange[0]): + # specific version requested, use it even if it's not in SUPPORTED + versions = set(options.vrange[:1]) + else: + versions = get_requested_versions(options.vrange, available=True) +. +207a + parser.add_option('-f', '--force', action='store_true', dest='force', + default=False, help='force rebuild even if timestamps are up-to-date') + parser.add_option('-O', action='store_true', dest='optimize', + default=False, help="byte-compile to .pyo files") +. +194c + try: + pipe = STDINS[version] + except KeyError: + # `pycompile /usr/lib/` invoked, add missing worker + pipe = py_compile(version, optimize, WORKERS) + pipe.next() + STDINS[version] = pipe +. +191,192c + cfn = fn + 'c' if (__debug__ or not optimize) else 'o' + if exists(cfn) and not force: + ftime = os.stat(fn).st_mtime + try: + ctime = os.stat(cfn).st_mtime + except os.error: + ctime = 0 + if (ctime > ftime): + continue +. +185c + coroutine = py_compile(version, optimize, WORKERS) +. +180c +def compile(files, versions, force, optimize, e_patterns=None): +. +170c + cmd = "python%s%s -m py_compile -" \ + % (version, '' if (__debug__ or not optimize) else ' -O') +. +167c +def py_compile(version, optimize, workers): +. +31c +from subprocess import PIPE, STDOUT, Popen +. +27a +import os +. +5a +# Copyright © 2010 Canonical Ltd +. +2c +# -*- coding: utf-8 -*- +. diff -Nru update-manager-17.10.11/tests/patchdir/pycompile_orig update-manager-0.156.14.15/tests/patchdir/pycompile_orig --- update-manager-17.10.11/tests/patchdir/pycompile_orig 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/patchdir/pycompile_orig 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,281 @@ +#! /usr/bin/python +# -*- coding: UTF-8 -*- +# vim: et ts=4 sw=4 + +# Copyright © 2010 Piotr Ożarowski +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +from __future__ import with_statement +import logging +import optparse +import sys +from os import environ, listdir, walk +from os.path import abspath, exists, isdir, isfile, join +from subprocess import PIPE, Popen +sys.path.insert(1, '/usr/share/python/') +from debpython.version import SUPPORTED, debsorted, vrepr, \ + get_requested_versions, parse_vrange, getver +from debpython.option import Option, compile_regexpr +from debpython.pydist import PUBLIC_DIR_RE +from debpython.tools import memoize + +# initialize script +logging.basicConfig(format='%(levelname).1s: %(module)s:%(lineno)d: ' + '%(message)s') +log = logging.getLogger(__name__) +STDINS = {} +WORKERS = {} + +"""TODO: move it to manpage +Examples: + pycompile -p python-mako # package's public files + pycompile -p foo /usr/share/foo # package's private files + pycompile -p foo -V 2.6- /usr/share/foo # private files, Python >= 2.6 + pycompile -V 2.6 /usr/lib/python2.6/dist-packages # python2.6 only + pycompile -V 2.6 /usr/lib/foo/bar.py # python2.6 only +""" + + +### FILES ###################################################### +def get_directory_files(dname): + """Generate *.py file names available in given directory.""" + if isfile(dname) and dname.endswith('.py'): + yield dname + else: + for root, dirs, file_names in walk(abspath(dname)): + #if root != dname and not exists(join(root, '__init__.py')): + # del dirs[:] + # continue + for fn in file_names: + if fn.endswith('.py'): + yield join(root, fn) + + +def get_package_files(package_name): + """Generate *.py file names available in given package.""" + process = Popen("/usr/bin/dpkg -L %s" % package_name,\ + shell=True, stdout=PIPE) + stdout, stderr = process.communicate() + if process.returncode != 0: + log.error('cannot get content of %s', package_name) + exit(2) + for line in stdout.split('\n'): + if line.endswith('.py'): + yield line + + +def get_private_files(files, dname): + """Generate *.py file names that match given directory.""" + for fn in files: + if fn.startswith(dname): + yield fn + + +def get_public_files(files, versions): + """Generate *.py file names that match given versions.""" + versions_str = set("%d.%d" % i for i in versions) + for fn in files: + if fn.startswith('/usr/lib/python') and \ + fn[15:18] in versions_str: + yield fn + + +### EXCLUDES ################################################### +@memoize +def get_exclude_patterns_from_dir(name='/usr/share/python/bcep/'): + """Return patterns for files that shouldn't be bytecompiled.""" + if not isdir(name): + return [] + + result = [] + for fn in listdir(name): + with file(join(name, fn), 'r') as lines: + for line in lines: + type_, vrange, dname, pattern = line.split('|', 3) + vrange = parse_vrange(vrange) + versions = get_requested_versions(vrange, available=True) + if not versions: + # pattern doesn't match installed Python versions + continue + pattern = pattern.rstrip('\n') + if type_ == 're': + pattern = compile_regexpr(None, None, pattern) + result.append((type_, versions, dname, pattern)) + return result + + +def get_exclude_patterns(directory='/', patterns=None, versions=None): + """Return patterns for files that shouldn't be compiled in given dir.""" + if patterns: + if versions is None: + versions = set(SUPPORTED) + patterns = [('re', versions, directory, i) for i in patterns] + else: + patterns = [] + + for type_, vers, dname, pattern in get_exclude_patterns_from_dir(): + # skip patterns that do not match requested directory + if not dname.startswith(directory[:len(dname)]): + continue + # skip patterns that do not match requested versions + if versions and not versions & vers: + continue + patterns.append((type_, vers, dname, pattern)) + return patterns + + +def filter_files(files, e_patterns, compile_versions): + """Generate (file, versions_to_compile) pairs.""" + for fn in files: + valid_versions = set(compile_versions) # all by default + + for type_, vers, dname, pattern in e_patterns: + if type_ == 'dir' and fn.startswith(dname): + valid_versions = valid_versions - vers + elif type_ == 're' and pattern.match(fn): + valid_versions = valid_versions - vers + + # move to the next file if all versions were removed + if not valid_versions: + break + if valid_versions: + public_dir = PUBLIC_DIR_RE.match(fn) + if public_dir: + yield fn, set([getver(public_dir.group(1))]) + else: + yield fn, valid_versions + + +### COMPILE #################################################### +def py_compile(version, workers): + if not isinstance(version, basestring): + version = vrepr(version) + cmd = "python%s -m py_compile -" % version + process = Popen(cmd, bufsize=1, shell=True, + stdin=PIPE, close_fds=True) + workers[version] = process # keep the reference for .communicate() + stdin = process.stdin + while True: + filename = (yield) + stdin.write(filename + '\n') + + +def compile(files, versions, e_patterns=None): + global STDINS, WORKERS + # start Python interpreters that will handle byte compilation + for version in versions: + if version not in STDINS: + coroutine = py_compile(version, WORKERS) + coroutine.next() + STDINS[version] = coroutine + + # byte compile files + for fn, versions_to_compile in filter_files(files, e_patterns, versions): + if exists("%sc" % fn): + continue + for version in versions_to_compile: + pipe = STDINS[version] + pipe.send(fn) + + +################################################################ +def main(): + usage = '%prog [-V [X.Y][-][A.B]] DIR_OR_FILE [-X REGEXPR]\n' + \ + ' %prog -p PACKAGE' + parser = optparse.OptionParser(usage, version='%prog 0.9', + option_class=Option) + parser.add_option('-v', '--verbose', action='store_true', dest='verbose', + help='turn verbose mode on') + parser.add_option('-q', '--quiet', action='store_false', dest='verbose', + default=False, help='be quiet') + parser.add_option('-p', '--package', + help='specify Debian package name whose files should be bytecompiled') + parser.add_option('-V', type='version_range', dest='vrange', + help="""force private modules to be bytecompiled with Python version +from given range, regardless of the default Python version in the system. +If there are no other options, bytecompile all public modules for installed +Python versions that match given range. + +VERSION_RANGE examples: '2.5' (version 2.5 only), '2.5-' (version 2.5 or +newer), '2.5-2.7' (version 2.5 or 2.6), '-3.0' (all supported 2.X versions)""") + parser.add_option('-X', '--exclude', action='append', + dest='regexpr', type='regexpr', + help='exclude items that match given REGEXPR. You may use this option \ +multiple times to build up a list of things to exclude.') + + (options, args) = parser.parse_args() + + if options.verbose or environ.get('PYCOMPILE_DEBUG') == '1': + log.setLevel(logging.DEBUG) + log.debug('argv: %s', sys.argv) + log.debug('options: %s', options) + log.debug('args: %s', args) + else: + log.setLevel(logging.WARN) + + if options.regexpr and not args: + parser.error('--exclude option works with private directories ' + 'only, please use /usr/share/python/bcep to specify ' + 'public modules to skip') + + versions = get_requested_versions(options.vrange, available=True) + if not versions: + log.error('Requested versions are not installed') + exit(3) + + if options.package and args: # package's private directories + # get requested Python version + compile_versions = debsorted(versions)[:1] + log.debug('compile versions: %s', versions) + + pkg_files = tuple(get_package_files(options.package)) + for item in args: + e_patterns = get_exclude_patterns(item, options.regexpr, \ + compile_versions) + if not exists(item): + log.warn('No such file or directory: %s', item) + else: + log.debug('byte compiling %s using Python %s', + item, compile_versions) + files = get_private_files(pkg_files, item) + compile(files, compile_versions, e_patterns) + elif options.package: # package's public modules + # no need to limit versions here, it's either pyr mode or version is + # hardcoded in path / via -V option + e_patterns = get_exclude_patterns() + files = get_package_files(options.package) + files = get_public_files(files, versions) + compile(files, versions, e_patterns) + elif args: # other directories/files (public ones mostly) + versions = debsorted(versions)[:1] + for item in args: + e_patterns = get_exclude_patterns(item, options.regexpr, versions) + files = get_directory_files(item) + compile(files, versions, e_patterns) + else: + parser.print_usage() + exit(1) + + # wait for all processes to finish + for process in WORKERS.itervalues(): + process.communicate() + +if __name__ == '__main__': + main() diff -Nru update-manager-17.10.11/tests/pyflakes.exclude update-manager-0.156.14.15/tests/pyflakes.exclude --- update-manager-17.10.11/tests/pyflakes.exclude 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/tests/pyflakes.exclude 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -# Exclude the following from pyflakes failures. - -# Property setter. -../janitor/plugincore/plugin.py:*: redefinition of function 'condition' from line * - -# Alternate imports for Python 2/3 compatibility. -../UpdateManager/Core/utils.py:*: redefinition of unused 'ProxyHandler' from line * -../UpdateManager/Core/utils.py:*: redefinition of unused 'Request' from line * -../UpdateManager/Core/utils.py:*: redefinition of unused 'build_opener' from line * -../UpdateManager/Core/utils.py:*: redefinition of unused 'install_opener' from line * -../UpdateManager/Core/utils.py:*: redefinition of unused 'urlopen' from line * -../UpdateManager/Core/utils.py:*: redefinition of unused 'urlsplit' from line * -../UpdateManager/Core/MetaRelease.py:*: redefinition of unused 'configparser' from line * -../UpdateManager/Core/MetaRelease.py:*: redefinition of unused 'BadStatusLine' from line * -../UpdateManager/Core/MetaRelease.py:*: redefinition of unused 'HTTPError' from line * -../UpdateManager/Core/MetaRelease.py:*: redefinition of unused 'Request' from line * -../UpdateManager/Core/MetaRelease.py:*: redefinition of unused 'URLError' from line * -../UpdateManager/Core/MetaRelease.py:*: redefinition of unused 'urlopen' from line * -../UpdateManager/Core/MyCache.py:*: redefinition of unused 'HTTPError' from line * -../UpdateManager/Core/MyCache.py:*: redefinition of unused 'urlopen' from line * -../UpdateManager/Core/MyCache.py:*: redefinition of unused 'urlsplit' from line * -../UpdateManager/Core/MyCache.py:*: redefinition of unused 'BadStatusLine' from line * -../tests/test_changelog.py:*: redefinition of unused 'HTTPError' from line * -../tests/test_meta_release_core.py:*: redefinition of unused 'HTTPError' from line * -../tests/test_meta_release_core.py:*: redefinition of unused 'urlopen' from line * -../tests/test_meta_release_core.py:*: redefinition of unused 'BaseHTTPRequestHandler' from line * -../tests/test_meta_release_core.py:*: redefinition of unused 'TCPServer' from line * - -# janitor code is no longer used -../janitor/plugincore/manager.py:*: undefined name 'basestring' diff -Nru update-manager-17.10.11/tests/test_apport_crash.py update-manager-0.156.14.15/tests/test_apport_crash.py --- update-manager-17.10.11/tests/test_apport_crash.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test_apport_crash.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,47 @@ +#!/usr/bin/python + +import os +import sys +import tempfile +import unittest + +from mock import patch + +sys.path.insert(0, "..") +from DistUpgrade.DistUpgradeApport import ( + _apport_append_logfiles, + apport_pkgfailure, + APPORT_WHITELIST, +) + +class TestApportInformationLeak(unittest.TestCase): + + def test_no_information_leak_in_apport_append_logfiles(self): + tmpdir = tempfile.mkdtemp() + from apport.report import Report + report = Report() + for name in ["apt.log", "system_state.tar.gz", "bar", "main.log"]: + with open(os.path.join(tmpdir, name), "w") as f: + f.write("some-data") + _apport_append_logfiles(report, tmpdir) + self.assertEqual(sorted([f[0].name for f in report.values() if isinstance(f, tuple)]), + sorted([os.path.join(tmpdir, "main.log"), + os.path.join(tmpdir, "apt.log")])) + + @patch("subprocess.Popen") + def test_no_information_leak_in_apport_pkgfailure(self, mock_popen): + # call apport_pkgfailure with mocked data + apport_pkgfailure("apt", "random error msg") + # extract the call arguments + function_call_args, kwargs = mock_popen.call_args + apport_cmd_args = function_call_args[0] + # ensure that the whitelist is honored + for i in range(1, len(apport_cmd_args), 2): + option = apport_cmd_args[i] + arg = apport_cmd_args[i+1] + if option == "-l": + self.assertTrue(os.path.basename(arg) in APPORT_WHITELIST) + + +if __name__ == "__main__": + unittest.main() diff -Nru update-manager-17.10.11/tests/test_cache.py update-manager-0.156.14.15/tests/test_cache.py --- update-manager-17.10.11/tests/test_cache.py 2017-08-07 19:03:37.000000000 +0000 +++ update-manager-0.156.14.15/tests/test_cache.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,82 +1,37 @@ -#!/usr/bin/python3 -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- +#!/usr/bin/python -import apt import logging import os import sys import unittest -import mock +from mock import patch, Mock +sys.path.insert(0, "../") +from UpdateManager.Core.MyCache import MyCache from UpdateManager.Core.MyCache import MyCache - -CURDIR = os.path.dirname(os.path.abspath(__file__)) - class TestCache(unittest.TestCase): def setUp(self): - # Whenever a test will initialize apt_pkg, we must set the architecture - # to amd64, because our various test files assume that. Even if this - # test doesn't use those files, apt_pkg is only initialized once across - # tests, so we must be consistent. - real_arch = apt.apt_pkg.config.find("APT::Architecture") - apt.apt_pkg.config.set("APT::Architecture", "amd64") - self.addCleanup( - lambda: apt.apt_pkg.config.set("APT::Architecture", real_arch)) - - # We don't need anything special, but since we modify architecture - # above, we ought to point to an aptroot that matches the arch - self.aptroot = os.path.join(CURDIR, "aptroot-cache-test") - - self.cache = MyCache(None, rootdir=self.aptroot) - self.cache.open() + self.cache = MyCache(None) def test_https_and_creds_in_changelog_uri(self): # credentials in https locations are not supported as they can # be man-in-the-middled because of the lack of cert checking in # urllib2 - pkgname = "package-one" + pkgname = "apt" uri = "https://user:pass$word@ubuntu.com/foo/bar" - mock_binary = mock.Mock() - mock_binary.return_value = uri - self.cache._guess_third_party_changelogs_uri_by_binary = mock_binary - mock_source = mock.Mock() - mock_source.return_value = uri - self.cache._guess_third_party_changelogs_uri_by_source = mock_source + self.cache._guess_third_party_changelogs_uri_by_binary = Mock() + self.cache._guess_third_party_changelogs_uri_by_binary.return_value = uri + self.cache._guess_third_party_changelogs_uri_by_source = Mock() + self.cache._guess_third_party_changelogs_uri_by_source.return_value = uri self.cache.all_changes[pkgname] = "header\n" - self.cache._fetch_changelog_for_third_party_package(pkgname, - origins=[]) + self.cache._fetch_changelog_for_third_party_package(pkgname) self.assertEqual( - self.cache.all_changes[pkgname], + self.cache.all_changes[pkgname], "header\n" - "This update does not come from a source that supports " - "changelogs.") - - def test_conflicts_replaces_removal(self): - # An incomplete set of Conflicts/Replaces does not allow removal. - with mock.patch("logging.info") as mock_info: - self.assertEqual(1, self.cache.saveDistUpgrade()) - mock_info.assert_called_once_with( - "package-two Conflicts/Replaces package-one; allowing removal") - self.assertEqual([], [pkg for pkg in self.cache if pkg.marked_delete]) - - # Specifying Conflicts/Replaces allows packages to be removed. - apt.apt_pkg.config.set( - "Dir::State::Status", - self.aptroot + "/var/lib/dpkg/status-minus-three") - apt.apt_pkg.init_system() - self.cache.open() - self.cache._initDepCache() - with mock.patch("logging.info") as mock_info: - self.assertEqual(0, self.cache.saveDistUpgrade()) - mock_info.assert_called_once_with( - "package-two Conflicts/Replaces package-one; allowing removal") - self.assertEqual( - [self.cache["package-one"]], - [pkg for pkg in self.cache if pkg.marked_delete]) - + "This update does not come from a source that supports changelogs.") if __name__ == '__main__': if len(sys.argv) > 1 and sys.argv[1] == "-v": diff -Nru update-manager-17.10.11/tests/test_cdrom.py update-manager-0.156.14.15/tests/test_cdrom.py --- update-manager-17.10.11/tests/test_cdrom.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test_cdrom.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,130 @@ +#!/usr/bin/python + +import apt_pkg +import os +import os.path +import sys +import tempfile +import unittest + +from mock import Mock + +sys.path.insert(0,"../DistUpgrade") +from DistUpgradeAptCdrom import AptCdrom + + +class TestAptCdrom(unittest.TestCase): + " this test the apt-cdrom implementation " + +# def testAdd(self): +# p = "./test-data-cdrom" +# apt_pkg.Config.Set("Dir::State::lists","/tmp") +# cdrom = AptCdrom(None, p) +# self.assert_(cdrom._doAdd()) + + def testWriteDatabase(self): + expect = """CD::36e3f69081b7d10081d167b137886a71-2 "Ubuntu 8.10 _Intrepid Ibex_ - Beta amd64 (20080930.4)"; +CD::36e3f69081b7d10081d167b137886a71-2::Label "Ubuntu 8.10 _Intrepid Ibex_ - Beta amd64 (20080930.4)"; +""" + p = "./test-data-cdrom/" + database="./test-data-cdrom/cdrom.list" + apt_pkg.Config.Set("Dir::State::cdroms", database) + apt_pkg.Config.Set("Acquire::cdrom::mount", p) + apt_pkg.Config.Set("APT::CDROM::NoMount","true") + if os.path.exists(database): + os.unlink(database) + cdrom = AptCdrom(None, p) + cdrom._writeDatabase() + self.assert_(open(database).read() == expect) + + def testScanCD(self): + p = "./test-data-cdrom" + cdrom = AptCdrom(None, p) + (p,s,i18n) = cdrom._scanCD() + self.assert_(len(p) > 0 and len(s) > 0 and len(i18n) > 0, + "failed to scan packages files (%s) (%s)" % (p,s)) + #print p,s,i18n + + def testDropArch(self): + p = "./test-data-cdrom" + cdrom = AptCdrom(None, p) + (p,s,i18n) = cdrom._scanCD() + self.assert_(len(cdrom._dropArch(p)) < len(p), + "drop arch did not drop (%s) < (%s)" % (len(cdrom._dropArch(p)), len(p))) + + def testDiskName(self): + " read and escape the disskname" + cdrom = AptCdrom(None, "./test-data-cdrom") + s = cdrom._readDiskName() + self.assert_(s == "Ubuntu 8.10 _Intrepid Ibex_ - Beta amd64 (20080930.4)", + "_readDiskName failed (got %s)" % s) + + def testGenerateSourcesListLine(self): + cdrom = AptCdrom(None, "./test-data-cdrom") + (p,s,i18n) = cdrom._scanCD() + p = cdrom._dropArch(p) + line = cdrom._generateSourcesListLine(cdrom._readDiskName(), p) + #print line + self.assert_(line == "deb cdrom:[Ubuntu 8.10 _Intrepid Ibex_ - Beta amd64 (20080930.4)]/ intrepid restricted", + "deb line wrong (got %s)" % line) + + def testCopyi18n(self): + cdrom = AptCdrom(None, "./test-data-cdrom") + (p,s,i18n) = cdrom._scanCD() + p = cdrom._dropArch(p) + d=tempfile.mkdtemp() + cdrom._copyTranslations(i18n, d) + self.assert_(os.path.exists(os.path.join(d,"Ubuntu%208.10%20%5fIntrepid%20Ibex%5f%20-%20Beta%20amd64%20(20080930.4)_dists_intrepid_main_i18n_Translation-be")), + "no outfile in '%s'" % os.listdir(d)) + + def testCopyPackages(self): + cdrom = AptCdrom(None, "./test-data-cdrom") + (p,s,i18n) = cdrom._scanCD() + p = cdrom._dropArch(p) + d=tempfile.mkdtemp() + cdrom._copyPackages(p, d) + self.assert_(os.path.exists(os.path.join(d,"Ubuntu%208.10%20%5fIntrepid%20Ibex%5f%20-%20Beta%20amd64%20(20080930.4)_dists_intrepid_restricted_binary-amd64_Packages")), + "no outfile in '%s'" % os.listdir(d)) + + def testVerifyRelease(self): + cdrom = AptCdrom(None, "./test-data-cdrom") + (p,s,i18n) = cdrom._scanCD() + res=cdrom._verifyRelease(s) + self.assert_(res==True) + + def testCopyRelease(self): + cdrom = AptCdrom(None, "./test-data-cdrom") + (p,s,i18n) = cdrom._scanCD() + d=tempfile.mkdtemp() + cdrom._copyRelease(s, d) + self.assert_(os.path.exists(os.path.join(d,"Ubuntu%208.10%20%5fIntrepid%20Ibex%5f%20-%20Beta%20amd64%20(20080930.4)_dists_intrepid_Release")), + "no outfile in '%s' (%s)" % (d, os.listdir(d))) + + + def testSourcesList(self): + cdrom = AptCdrom(None, "./test-data-cdrom") + (p,s,i18n) = cdrom._scanCD() + p=cdrom._dropArch(p) + line=cdrom._generateSourcesListLine(cdrom._readDiskName(), p) + self.assert_(line == "deb cdrom:[Ubuntu 8.10 _Intrepid Ibex_ - Beta amd64 (20080930.4)]/ intrepid restricted", + "sources.list line incorrect, got %s" % line) + + def test_comment_out(self): + tmpdir = tempfile.mkdtemp() + sourceslist = os.path.join(tmpdir, "sources.list") + open(sourceslist, "w") + apt_pkg.config.set("dir::etc::sourcelist", sourceslist) + apt_pkg.config.set("dir::state::lists", tmpdir) + view = Mock() + cdrom = AptCdrom(view, "./test-data-cdrom") + cdrom.add() + cdrom.comment_out_cdrom_entry() + for line in open(sourceslist): + self.assertTrue(line.startswith("#")) + self.assertEqual(len(open(sourceslist).readlines()), 2) + + +if __name__ == "__main__": + apt_pkg.init() + apt_pkg.Config.Set("APT::Architecture","amd64") + unittest.main() diff -Nru update-manager-17.10.11/tests/test_changelog.py update-manager-0.156.14.15/tests/test_changelog.py --- update-manager-17.10.11/tests/test_changelog.py 2017-08-07 19:04:02.000000000 +0000 +++ update-manager-0.156.14.15/tests/test_changelog.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,37 +1,19 @@ -#!/usr/bin/python3 -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- +#!/usr/bin/python + import apt import logging -import os import sys import unittest -try: - from urllib.error import HTTPError -except ImportError: - from urllib2 import HTTPError +import urllib2 +sys.path.insert(0, "../") from UpdateManager.Core.MyCache import MyCache -CURDIR = os.path.dirname(os.path.abspath(__file__)) - - class TestChangelogs(unittest.TestCase): def setUp(self): - # Whenever a test will initialize apt_pkg, we must set the architecture - # to amd64, because our various test files assume that. Even if this - # test doesn't use those files, apt_pkg is only initialized once across - # tests, so we must be consistent. - real_arch = apt.apt_pkg.config.find("APT::Architecture") - apt.apt_pkg.config.set("APT::Architecture", "amd64") - self.addCleanup( - lambda: apt.apt_pkg.config.set("APT::Architecture", real_arch)) - - aptroot = os.path.join(CURDIR, "aptroot-changelog") - - self.cache = MyCache(apt.progress.base.OpProgress(), rootdir=aptroot) - self.cache.open() + self.cache = MyCache(apt.progress.base.OpProgress()) def test_get_changelogs_uri(self): pkgname = "gcc" @@ -45,8 +27,7 @@ self.assertTrue("gcc-defaults_" in uri) self.assertTrue(uri.endswith(".changelog")) # and one without a "Source" entry, we don't find something here - uri = self.cache._guess_third_party_changelogs_uri_by_source("apt") - self.assertEqual(uri, None) + self.assertEqual(self.cache._guess_third_party_changelogs_uri_by_source("apt"), None) # one with srcver == binver pkgname = "libgtk2.0-dev" uri = self.cache._guess_third_party_changelogs_uri_by_source(pkgname) @@ -56,10 +37,9 @@ def test_changelog_not_supported(self): def monkey_patched_get_changelogs(name, what, ver, uri): - with open("/dev/zero") as zero: - raise HTTPError( - "url", "code", "msg", "hdrs", zero) - pkgname = "gcc" + raise urllib2.HTTPError( + "url", "code", "msg", "hdrs", open("/dev/zero")) + pkgname = "update-manager" # patch origin real_origin = self.cache.CHANGELOG_ORIGIN self.cache.CHANGELOG_ORIGIN = "xxx" @@ -67,17 +47,16 @@ self.cache._get_changelog_or_news = monkey_patched_get_changelogs # get changelog self.cache.get_changelog(pkgname) - error = "This update does not come from a source that " - error += "supports changelogs." + error = "This update does not come from a source that supports changelogs." # verify that we don't have the lines twice - self.assertEqual(self.cache.all_changes[pkgname].split("\n")[-1], - error) - self.assertEqual(len(self.cache.all_changes[pkgname].split("\n")), 5) - self.assertEqual(self.cache.all_changes[pkgname].count(error), 1) + self.assertEqual(self.cache.all_changes[pkgname].split("\n")[-1], error) + self.assertEqual(len(self.cache.all_changes[pkgname].split("\n")), 5) + self.assertEqual(self.cache.all_changes[pkgname].count(error), 1) self.cache.CHANGELOG_ORIGIN = real_origin - if __name__ == '__main__': if len(sys.argv) > 1 and sys.argv[1] == "-v": logging.basicConfig(level=logging.DEBUG) unittest.main() + + diff -Nru update-manager-17.10.11/tests/test_country_mirror.py update-manager-0.156.14.15/tests/test_country_mirror.py --- update-manager-17.10.11/tests/test_country_mirror.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test_country_mirror.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,28 @@ +#!/usr/bin/python + +import os +import sys +sys.path.insert(0, "../") + +import unittest + +from UpdateManager.Core.DistUpgradeFetcherCore import country_mirror + +class testCountryMirror(unittest.TestCase): + + def testSimple(self): + # empty + del os.environ["LANG"] + self.assertEqual(country_mirror(),'') + # simple + os.environ["LANG"] = 'de' + self.assertEqual(country_mirror(),'de.') + # more complicated + os.environ["LANG"] = 'en_DK.UTF-8' + self.assertEqual(country_mirror(),'dk.') + os.environ["LANG"] = 'fr_FR@euro.ISO-8859-15' + self.assertEqual(country_mirror(),'fr.') + + +if __name__ == "__main__": + unittest.main() diff -Nru update-manager-17.10.11/tests/test-data-cdrom/cdromupgrade update-manager-0.156.14.15/tests/test-data-cdrom/cdromupgrade --- update-manager-17.10.11/tests/test-data-cdrom/cdromupgrade 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test-data-cdrom/cdromupgrade 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,32 @@ +#!/bin/sh +# +# "cdromupgrade" is a shell script wrapper around the dist-upgrader +# to make it possible to put it onto the top-level dir of a CD and +# run it from there +# +# Not that useful unfortunately when the CD is mounted "noexec". +# +# WARNING: make sure to call it with a absolute path! +# (e.g. /cdrom/cdromupgrade) + +# the codename is AUTO-GENERATED from the build-host relase codename +CODENAME=intrepid +UPGRADER_DIR=dists/stable/main/dist-upgrader/binary-all/ + +cddirname="${0%\/*}" +fullpath="$cddirname/$UPGRADER_DIR" + +# extrace the tar to a TMPDIR and run it from there +if [ ! -f "$fullpath/$CODENAME.tar.gz" ]; then + echo "Could not find the upgrade application archive, exiting" + exit 1 +fi + +TMPDIR=$(mktemp -d) +cd $TMPDIR +tar xzf "$fullpath/$CODENAME.tar.gz" +if [ ! -x $TMPDIR/$CODENAME ]; then + echo "Could not find the upgrade application in the archive, exiting" + exit 1 +fi +$TMPDIR/$CODENAME --cdrom "$cddirname" $@ diff -Nru update-manager-17.10.11/tests/test-data-cdrom/.disk/base_components update-manager-0.156.14.15/tests/test-data-cdrom/.disk/base_components --- update-manager-17.10.11/tests/test-data-cdrom/.disk/base_components 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test-data-cdrom/.disk/base_components 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,2 @@ +main +restricted diff -Nru update-manager-17.10.11/tests/test-data-cdrom/.disk/cd_type update-manager-0.156.14.15/tests/test-data-cdrom/.disk/cd_type --- update-manager-17.10.11/tests/test-data-cdrom/.disk/cd_type 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test-data-cdrom/.disk/cd_type 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1 @@ +full_cd/single diff -Nru update-manager-17.10.11/tests/test-data-cdrom/.disk/info update-manager-0.156.14.15/tests/test-data-cdrom/.disk/info --- update-manager-17.10.11/tests/test-data-cdrom/.disk/info 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test-data-cdrom/.disk/info 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1 @@ +Ubuntu 8.10 "Intrepid Ibex" - Beta amd64 (20080930.4) \ No newline at end of file diff -Nru update-manager-17.10.11/tests/test-data-cdrom/.disk/udeb_include update-manager-0.156.14.15/tests/test-data-cdrom/.disk/udeb_include --- update-manager-17.10.11/tests/test-data-cdrom/.disk/udeb_include 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test-data-cdrom/.disk/udeb_include 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,4 @@ +netcfg +ethdetect +pcmcia-cs-udeb +wireless-tools-udeb diff -Nru update-manager-17.10.11/tests/test-data-cdrom/dists/intrepid/main/binary-amd64/Release update-manager-0.156.14.15/tests/test-data-cdrom/dists/intrepid/main/binary-amd64/Release --- update-manager-17.10.11/tests/test-data-cdrom/dists/intrepid/main/binary-amd64/Release 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test-data-cdrom/dists/intrepid/main/binary-amd64/Release 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,6 @@ +Archive: intrepid +Version: 8.10 +Component: main +Origin: Ubuntu +Label: Ubuntu +Architecture: amd64 diff -Nru update-manager-17.10.11/tests/test-data-cdrom/dists/intrepid/main/debian-installer/binary-amd64/Packages.gz update-manager-0.156.14.15/tests/test-data-cdrom/dists/intrepid/main/debian-installer/binary-amd64/Packages.gz --- update-manager-17.10.11/tests/test-data-cdrom/dists/intrepid/main/debian-installer/binary-amd64/Packages.gz 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test-data-cdrom/dists/intrepid/main/debian-installer/binary-amd64/Packages.gz 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1 @@ + Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/tests/test-data-cdrom/dists/intrepid/main/i18n/Translation-be.gz and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/tests/test-data-cdrom/dists/intrepid/main/i18n/Translation-be.gz differ diff -Nru update-manager-17.10.11/tests/test-data-cdrom/dists/intrepid/Release update-manager-0.156.14.15/tests/test-data-cdrom/dists/intrepid/Release --- update-manager-17.10.11/tests/test-data-cdrom/dists/intrepid/Release 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test-data-cdrom/dists/intrepid/Release 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,27 @@ +Origin: Ubuntu +Label: Ubuntu +Suite: intrepid +Version: 8.10 +Codename: intrepid +Date: Tue, 30 Sep 2008 9:45:01 UTC +Architectures: amd64 +Components: main restricted +Description: Ubuntu Intrepid 8.10 +MD5Sum: + 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-amd64/Packages.gz + 2ff65cfab8554f25348bb2d270d3f57d 1815 restricted/binary-amd64/Packages.gz + 9d1be4f55b113f7e379323855a5cf4f7 5772 restricted/binary-amd64/Packages + 9d6878681d7fa00d880d3f9a50a4f876 103 restricted/binary-amd64/Release + 9a82c503df21309ec6d28c508f76f9fe 97 main/binary-amd64/Release +SHA1: + a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-amd64/Packages.gz + be6415c7866b0fa8f6d044214f16a5e1050f9552 1815 restricted/binary-amd64/Packages.gz + c4be20109c9cd92643f47725ce1fe930eb622ee4 5772 restricted/binary-amd64/Packages + eb84afc4e5cb289f300fdab30da8de3c36f72ab2 103 restricted/binary-amd64/Release + 79601180e1aed7251db9a4483a3881852c7ab57f 97 main/binary-amd64/Release +SHA256: + f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-amd64/Packages.gz + bf6da0c77142581589c012108ae055076aae2a08476992f4041b08aabd54f1c1 1815 restricted/binary-amd64/Packages.gz + 711cf2f6f4d8405628c11cc28a95d32f380e74cd42e9c94ede6c8e121bf51366 5772 restricted/binary-amd64/Packages + 4fd2579083c9eeea7fdb2f0af4322f31b6b33d0502d878706ca5c90fccdf263d 103 restricted/binary-amd64/Release + 7c588b52b8e7246302279bca384eced574b9f04ab2a822ec982eed1819f2052b 97 main/binary-amd64/Release diff -Nru update-manager-17.10.11/tests/test-data-cdrom/dists/intrepid/Release.gpg update-manager-0.156.14.15/tests/test-data-cdrom/dists/intrepid/Release.gpg --- update-manager-17.10.11/tests/test-data-cdrom/dists/intrepid/Release.gpg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test-data-cdrom/dists/intrepid/Release.gpg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEABECAAYFAkj0qLUACgkQliSD4VZixzSHegCfSEkG5UAHOMgfC0Cg0N491RNx +i3YAoI5qwAIaSTTQY7DjiGlv8ILxKH8A +=jvtD +-----END PGP SIGNATURE----- Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/tests/test-data-cdrom/dists/intrepid/restricted/binary-amd64/Packages.gz and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/tests/test-data-cdrom/dists/intrepid/restricted/binary-amd64/Packages.gz differ diff -Nru update-manager-17.10.11/tests/test-data-cdrom/dists/intrepid/restricted/binary-amd64/Release update-manager-0.156.14.15/tests/test-data-cdrom/dists/intrepid/restricted/binary-amd64/Release --- update-manager-17.10.11/tests/test-data-cdrom/dists/intrepid/restricted/binary-amd64/Release 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test-data-cdrom/dists/intrepid/restricted/binary-amd64/Release 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,6 @@ +Archive: intrepid +Version: 8.10 +Component: restricted +Origin: Ubuntu +Label: Ubuntu +Architecture: amd64 Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/tests/test-data-cdrom/dists/intrepid/restricted/debian-installer/binary-amd64/Packages.gz and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/tests/test-data-cdrom/dists/intrepid/restricted/debian-installer/binary-amd64/Packages.gz differ diff -Nru update-manager-17.10.11/tests/test-data-cdrom/dists/stable/main/binary-amd64/Release update-manager-0.156.14.15/tests/test-data-cdrom/dists/stable/main/binary-amd64/Release --- update-manager-17.10.11/tests/test-data-cdrom/dists/stable/main/binary-amd64/Release 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test-data-cdrom/dists/stable/main/binary-amd64/Release 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,6 @@ +Archive: intrepid +Version: 8.10 +Component: main +Origin: Ubuntu +Label: Ubuntu +Architecture: amd64 diff -Nru update-manager-17.10.11/tests/test-data-cdrom/dists/stable/main/debian-installer/binary-amd64/Packages.gz update-manager-0.156.14.15/tests/test-data-cdrom/dists/stable/main/debian-installer/binary-amd64/Packages.gz --- update-manager-17.10.11/tests/test-data-cdrom/dists/stable/main/debian-installer/binary-amd64/Packages.gz 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test-data-cdrom/dists/stable/main/debian-installer/binary-amd64/Packages.gz 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1 @@ + Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/tests/test-data-cdrom/dists/stable/main/i18n/Translation-be.gz and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/tests/test-data-cdrom/dists/stable/main/i18n/Translation-be.gz differ diff -Nru update-manager-17.10.11/tests/test-data-cdrom/dists/stable/Release update-manager-0.156.14.15/tests/test-data-cdrom/dists/stable/Release --- update-manager-17.10.11/tests/test-data-cdrom/dists/stable/Release 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test-data-cdrom/dists/stable/Release 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,27 @@ +Origin: Ubuntu +Label: Ubuntu +Suite: intrepid +Version: 8.10 +Codename: intrepid +Date: Tue, 30 Sep 2008 9:45:01 UTC +Architectures: amd64 +Components: main restricted +Description: Ubuntu Intrepid 8.10 +MD5Sum: + 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-amd64/Packages.gz + 2ff65cfab8554f25348bb2d270d3f57d 1815 restricted/binary-amd64/Packages.gz + 9d1be4f55b113f7e379323855a5cf4f7 5772 restricted/binary-amd64/Packages + 9d6878681d7fa00d880d3f9a50a4f876 103 restricted/binary-amd64/Release + 9a82c503df21309ec6d28c508f76f9fe 97 main/binary-amd64/Release +SHA1: + a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-amd64/Packages.gz + be6415c7866b0fa8f6d044214f16a5e1050f9552 1815 restricted/binary-amd64/Packages.gz + c4be20109c9cd92643f47725ce1fe930eb622ee4 5772 restricted/binary-amd64/Packages + eb84afc4e5cb289f300fdab30da8de3c36f72ab2 103 restricted/binary-amd64/Release + 79601180e1aed7251db9a4483a3881852c7ab57f 97 main/binary-amd64/Release +SHA256: + f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-amd64/Packages.gz + bf6da0c77142581589c012108ae055076aae2a08476992f4041b08aabd54f1c1 1815 restricted/binary-amd64/Packages.gz + 711cf2f6f4d8405628c11cc28a95d32f380e74cd42e9c94ede6c8e121bf51366 5772 restricted/binary-amd64/Packages + 4fd2579083c9eeea7fdb2f0af4322f31b6b33d0502d878706ca5c90fccdf263d 103 restricted/binary-amd64/Release + 7c588b52b8e7246302279bca384eced574b9f04ab2a822ec982eed1819f2052b 97 main/binary-amd64/Release diff -Nru update-manager-17.10.11/tests/test-data-cdrom/dists/stable/Release.gpg update-manager-0.156.14.15/tests/test-data-cdrom/dists/stable/Release.gpg --- update-manager-17.10.11/tests/test-data-cdrom/dists/stable/Release.gpg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test-data-cdrom/dists/stable/Release.gpg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEABECAAYFAkj0qLUACgkQliSD4VZixzSHegCfSEkG5UAHOMgfC0Cg0N491RNx +i3YAoI5qwAIaSTTQY7DjiGlv8ILxKH8A +=jvtD +-----END PGP SIGNATURE----- Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/tests/test-data-cdrom/dists/stable/restricted/binary-amd64/Packages.gz and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/tests/test-data-cdrom/dists/stable/restricted/binary-amd64/Packages.gz differ diff -Nru update-manager-17.10.11/tests/test-data-cdrom/dists/stable/restricted/binary-amd64/Release update-manager-0.156.14.15/tests/test-data-cdrom/dists/stable/restricted/binary-amd64/Release --- update-manager-17.10.11/tests/test-data-cdrom/dists/stable/restricted/binary-amd64/Release 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test-data-cdrom/dists/stable/restricted/binary-amd64/Release 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,6 @@ +Archive: intrepid +Version: 8.10 +Component: restricted +Origin: Ubuntu +Label: Ubuntu +Architecture: amd64 Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/tests/test-data-cdrom/dists/stable/restricted/debian-installer/binary-amd64/Packages.gz and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/tests/test-data-cdrom/dists/stable/restricted/debian-installer/binary-amd64/Packages.gz differ diff -Nru update-manager-17.10.11/tests/test-data-cdrom/dists/unstable/main/binary-amd64/Release update-manager-0.156.14.15/tests/test-data-cdrom/dists/unstable/main/binary-amd64/Release --- update-manager-17.10.11/tests/test-data-cdrom/dists/unstable/main/binary-amd64/Release 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test-data-cdrom/dists/unstable/main/binary-amd64/Release 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,6 @@ +Archive: intrepid +Version: 8.10 +Component: main +Origin: Ubuntu +Label: Ubuntu +Architecture: amd64 diff -Nru update-manager-17.10.11/tests/test-data-cdrom/dists/unstable/main/debian-installer/binary-amd64/Packages.gz update-manager-0.156.14.15/tests/test-data-cdrom/dists/unstable/main/debian-installer/binary-amd64/Packages.gz --- update-manager-17.10.11/tests/test-data-cdrom/dists/unstable/main/debian-installer/binary-amd64/Packages.gz 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test-data-cdrom/dists/unstable/main/debian-installer/binary-amd64/Packages.gz 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1 @@ + Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/tests/test-data-cdrom/dists/unstable/main/i18n/Translation-be.gz and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/tests/test-data-cdrom/dists/unstable/main/i18n/Translation-be.gz differ diff -Nru update-manager-17.10.11/tests/test-data-cdrom/dists/unstable/Release update-manager-0.156.14.15/tests/test-data-cdrom/dists/unstable/Release --- update-manager-17.10.11/tests/test-data-cdrom/dists/unstable/Release 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test-data-cdrom/dists/unstable/Release 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,27 @@ +Origin: Ubuntu +Label: Ubuntu +Suite: intrepid +Version: 8.10 +Codename: intrepid +Date: Tue, 30 Sep 2008 9:45:01 UTC +Architectures: amd64 +Components: main restricted +Description: Ubuntu Intrepid 8.10 +MD5Sum: + 4a4dd3598707603b3f76a2378a4504aa 20 restricted/debian-installer/binary-amd64/Packages.gz + 2ff65cfab8554f25348bb2d270d3f57d 1815 restricted/binary-amd64/Packages.gz + 9d1be4f55b113f7e379323855a5cf4f7 5772 restricted/binary-amd64/Packages + 9d6878681d7fa00d880d3f9a50a4f876 103 restricted/binary-amd64/Release + 9a82c503df21309ec6d28c508f76f9fe 97 main/binary-amd64/Release +SHA1: + a0fddd5458378c1bf3c10dd2f5c060d1347741ed 20 restricted/debian-installer/binary-amd64/Packages.gz + be6415c7866b0fa8f6d044214f16a5e1050f9552 1815 restricted/binary-amd64/Packages.gz + c4be20109c9cd92643f47725ce1fe930eb622ee4 5772 restricted/binary-amd64/Packages + eb84afc4e5cb289f300fdab30da8de3c36f72ab2 103 restricted/binary-amd64/Release + 79601180e1aed7251db9a4483a3881852c7ab57f 97 main/binary-amd64/Release +SHA256: + f61f27bd17de546264aa58f40f3aafaac7021e0ef69c17f6b1b4cd7664a037ec 20 restricted/debian-installer/binary-amd64/Packages.gz + bf6da0c77142581589c012108ae055076aae2a08476992f4041b08aabd54f1c1 1815 restricted/binary-amd64/Packages.gz + 711cf2f6f4d8405628c11cc28a95d32f380e74cd42e9c94ede6c8e121bf51366 5772 restricted/binary-amd64/Packages + 4fd2579083c9eeea7fdb2f0af4322f31b6b33d0502d878706ca5c90fccdf263d 103 restricted/binary-amd64/Release + 7c588b52b8e7246302279bca384eced574b9f04ab2a822ec982eed1819f2052b 97 main/binary-amd64/Release diff -Nru update-manager-17.10.11/tests/test-data-cdrom/dists/unstable/Release.gpg update-manager-0.156.14.15/tests/test-data-cdrom/dists/unstable/Release.gpg --- update-manager-17.10.11/tests/test-data-cdrom/dists/unstable/Release.gpg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test-data-cdrom/dists/unstable/Release.gpg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEABECAAYFAkj0qLUACgkQliSD4VZixzSHegCfSEkG5UAHOMgfC0Cg0N491RNx +i3YAoI5qwAIaSTTQY7DjiGlv8ILxKH8A +=jvtD +-----END PGP SIGNATURE----- Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/tests/test-data-cdrom/dists/unstable/restricted/binary-amd64/Packages.gz and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/tests/test-data-cdrom/dists/unstable/restricted/binary-amd64/Packages.gz differ diff -Nru update-manager-17.10.11/tests/test-data-cdrom/dists/unstable/restricted/binary-amd64/Release update-manager-0.156.14.15/tests/test-data-cdrom/dists/unstable/restricted/binary-amd64/Release --- update-manager-17.10.11/tests/test-data-cdrom/dists/unstable/restricted/binary-amd64/Release 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test-data-cdrom/dists/unstable/restricted/binary-amd64/Release 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,6 @@ +Archive: intrepid +Version: 8.10 +Component: restricted +Origin: Ubuntu +Label: Ubuntu +Architecture: amd64 Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/tests/test-data-cdrom/dists/unstable/restricted/debian-installer/binary-amd64/Packages.gz and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/tests/test-data-cdrom/dists/unstable/restricted/debian-installer/binary-amd64/Packages.gz differ Binary files /tmp/tmpn3LXtW/woMlaj2_Fn/update-manager-17.10.11/tests/test-data-cdrom/doc/install/manual/example-preseed.txt.gz and /tmp/tmpn3LXtW/CZegZ0rS4P/update-manager-0.156.14.15/tests/test-data-cdrom/doc/install/manual/example-preseed.txt.gz differ diff -Nru update-manager-17.10.11/tests/test-data-cdrom/README.diskdefines update-manager-0.156.14.15/tests/test-data-cdrom/README.diskdefines --- update-manager-17.10.11/tests/test-data-cdrom/README.diskdefines 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test-data-cdrom/README.diskdefines 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,9 @@ +#define DISKNAME Ubuntu 8.10 "Intrepid Ibex" - Beta amd64 +#define TYPE binary +#define TYPEbinary 1 +#define ARCH amd64 +#define ARCHamd64 1 +#define DISKNUM 1 +#define DISKNUM1 1 +#define TOTALNUM 0 +#define TOTALNUM0 1 diff -Nru update-manager-17.10.11/tests/test_dist_upgrade_fetcher_core.py update-manager-0.156.14.15/tests/test_dist_upgrade_fetcher_core.py --- update-manager-17.10.11/tests/test_dist_upgrade_fetcher_core.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test_dist_upgrade_fetcher_core.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,95 @@ +#!/usr/bin/python + +import apt +import apt_pkg +import logging +import os +import os.path +import sys +import time +import unittest +sys.path.insert(0, "../") + +from UpdateManager.Core.MetaRelease import MetaReleaseCore +from UpdateManager.Core.DistUpgradeFetcherCore import DistUpgradeFetcherCore + +# make sure we have a writable location for the meta-release file +os.environ["XDG_CACHE_HOME"] = "/tmp" + +def get_new_dist(): + """ + common code to test new dist fetching, get the new dist information + for hardy+1 + """ + meta = MetaReleaseCore() + #meta.DEBUG = True + meta.current_dist_name = "lucid" + meta.METARELEASE_URI = "http://changelogs.ubuntu.com/meta-release" + while meta.downloading: + time.sleep(0.1) + meta._buildMetaReleaseFile() + meta.download() + return meta.new_dist + +class TestFetchProgress(apt.progress.base.AcquireProgress): + " class to test if the fetch progress was run " + def start(self): + self.started = True + def stop(self): + self.stopped = True + def pulse(self, acquire): + self.pulsed = True + #for item in acquire.items: + # print item, item.destfile, item.desc_uri + return True + +class TestMetaReleaseCore(unittest.TestCase): + + def setUp(self): + self.new_dist = None + + def testnewdist(self): + new_dist = get_new_dist() + self.assert_(new_dist is not None) + +class TestDistUpgradeFetcherCore(DistUpgradeFetcherCore): + " subclass of the DistUpgradeFetcherCore class to make it testable " + def runDistUpgrader(self): + " do not actually run the upgrader here " + return True + +class TestDistUpgradeFetcherCoreTestCase(unittest.TestCase): + testdir = os.path.abspath("./data-sources-list-test/") + + def setUp(self): + self.new_dist = get_new_dist() + apt_pkg.config.set("Dir::Etc",self.testdir) + apt_pkg.config.set("Dir::Etc::sourcelist", "sources.list.hardy") + + def testfetcher(self): + progress = TestFetchProgress() + fetcher = TestDistUpgradeFetcherCore(self.new_dist, progress) + #fetcher.DEBUG=True + res = fetcher.run() + self.assertTrue(res) + self.assertTrue(progress.started) + self.assertTrue(progress.stopped) + self.assertTrue(progress.pulsed) + + def disabled_because_ftp_is_not_relaible____testfetcher_ftp(self): + progress = TestFetchProgress() + fetcher = TestDistUpgradeFetcherCore(self.new_dist, progress) + fetcher.current_dist_name = "hardy" + #fetcher.DEBUG=True + res = fetcher.run() + self.assertTrue(res) + self.assert_(fetcher.uri.startswith("ftp://uk.archive.ubuntu.com")) + self.assertTrue(progress.started) + self.assertTrue(progress.stopped) + self.assertTrue(progress.pulsed) + + +if __name__ == '__main__': + logging.basicConfig(level=logging.DEBUG) + unittest.main() + diff -Nru update-manager-17.10.11/tests/test_end_of_life.py update-manager-0.156.14.15/tests/test_end_of_life.py --- update-manager-17.10.11/tests/test_end_of_life.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test_end_of_life.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,64 @@ +#!/usr/bin/python + +from gi.repository import Gtk, GObject + +import mock +import unittest +import subprocess +import sys + +sys.path.insert(0,"../") + +class TestDistroEndOfLife(unittest.TestCase): + + # we need to test two cases: + # - the current distro is end of life + # - the next release (the upgrade target) is end of life + + def test_distro_current_distro_end_of_life(self): + """ this code tests that check-new-release-gtk shows a + dist-no-longer-supported dialog when it detects that the + running distribution is no longer supported + """ + def _nag_dialog_close_helper(checker): + # this helper is called to verify that the nag dialog appears + # and that it + dialog = checker.window_main.get_data("no-longer-supported-nag") + self.assertNotEqual(dialog, None) + dialog.response(Gtk.ResponseType.DELETE_EVENT) + self.dialog_called = True + # ---- + from check_new_release_gtk import CheckNewReleaseGtk + options = mock.Mock() + options.datadir = "../data" + options.test_uri = None + checker = CheckNewReleaseGtk(options) + meta_release = mock.Mock() + # pretend the current distro is no longer supported + meta_release.no_longer_supported = subprocess.Popen( + ["lsb_release","-c","-s"], + stdout=subprocess.PIPE).communicate()[0].strip() + # build new release mock + new_dist = mock.Mock() + new_dist.name = "zaphod" + new_dist.version = "127.0" + new_dist.supported = True + new_dist.releaseNotesHtmlUri = "http://www.ubuntu.com/html" + new_dist.releaseNotesURI = "http://www.ubuntu.com/text" + # schedule a close event in 1 s + GObject.timeout_add_seconds(1, _nag_dialog_close_helper, checker) + # run the dialog, this will also run a gtk mainloop so that the + # timeout works + self.dialog_called = False + checker.new_dist_available(meta_release, new_dist) + self.assertTrue(self.dialog_called, True) + + + def _p(self): + while Gtk.events_pending(): + Gtk.main_iteration() + +if __name__ == "__main__": + import logging + logging.basicConfig(level=logging.DEBUG) + unittest.main() diff -Nru update-manager-17.10.11/tests/test_hwe_support_status.py update-manager-0.156.14.15/tests/test_hwe_support_status.py --- update-manager-17.10.11/tests/test_hwe_support_status.py 2017-08-07 20:47:06.000000000 +0000 +++ update-manager-0.156.14.15/tests/test_hwe_support_status.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,8 +1,8 @@ -#!/usr/bin/python3 +#!/usr/bin/python + +from __future__ import print_function -import apt -import builtins import unittest import os @@ -13,30 +13,27 @@ import hwe_support_status -builtins # pyflakes - def make_mock_pkg(name, ver_str="1.0"): - arch = apt.apt_pkg.config.find("APT::Architecture") - return hwe_support_status.Package(name, ver_str, arch) + return hwe_support_status.Package(name, ver_str) class HweSupportStatusTestCase(TestCase): INSTALLED_UNSUPPORTED_HWE_KERNEL_PKG_NAMES = ( - "linux-generic-lts-utopic", - "linux-image-3.16.0-20-generic", + "linux-generic-lts-raring", + "linux-image-3.11.0-20-generic", ) INSTALLED_UNSUPPORTED_HWE_XORG_PKG_NAMES = ( - "xserver-xorg-core-lts-utopic", + "xserver-xorg-core-lts-raring", ) INSTALLED_SUPPORTED_HWE_PKG_NAMES = ( - "xserver-xorg-core-lts-trusty", + "xserver-xorg-core-lts-trusty", ) INSTALLED_OTHER_PKG_NAMES = ( - "2vcard", + "2vcard", ) - + INSTALLED_UNSUPPORTED_HWE_PKG_NAMES = ( INSTALLED_UNSUPPORTED_HWE_KERNEL_PKG_NAMES + INSTALLED_UNSUPPORTED_HWE_XORG_PKG_NAMES) @@ -48,7 +45,7 @@ self.INSTALLED_OTHER_PKG_NAMES) for name in INSTALL: self.cache.append(make_mock_pkg(name)) - + def test_find_unsupported_hwe_packages(self): unsupported, supported = hwe_support_status.find_hwe_packages( self.cache) @@ -74,72 +71,55 @@ def test_advice_about_hwe_status_is_running(self): with patch("hwe_support_status.is_unsupported_hwe_running") as m: - with patch("builtins.print") as mock_print: + with patch("__builtin__.print") as mock_print: m.return_value = True mock_unsupported_hwe_pkgs = [] mock_unsupported_hwe_pkgs.append(make_mock_pkg( self.INSTALLED_UNSUPPORTED_HWE_XORG_PKG_NAMES[0])) - from HweSupportStatus.consts import HWE_EOL_DATE - from datetime import timedelta - today = HWE_EOL_DATE - timedelta(14) hwe_support_status.advice_about_hwe_status( - mock_unsupported_hwe_pkgs, [], [], False, today, - verbose=True) + mock_unsupported_hwe_pkgs, [], False, verbose=True) text = mock_print.call_args[0][0] self.assertIn("Your current Hardware Enablement Stack (HWE) " "is going out of support", text) def test_advice_about_hwe_status_installed_only(self): with patch("hwe_support_status.is_unsupported_hwe_running") as m: - with patch("builtins.print") as mock_print: + with patch("__builtin__.print") as mock_print: m.return_value = False mock_unsupported_hwe_pkgs = [] mock_unsupported_hwe_pkgs.append(make_mock_pkg( self.INSTALLED_UNSUPPORTED_HWE_XORG_PKG_NAMES[0])) - from HweSupportStatus.consts import HWE_EOL_DATE - from datetime import timedelta - today = HWE_EOL_DATE + timedelta(14) hwe_support_status.advice_about_hwe_status( - mock_unsupported_hwe_pkgs, [], [], False, today, - verbose=True) + mock_unsupported_hwe_pkgs, [], False, verbose=True) text = mock_print.call_args[0][0] - self.assertIn("You have packages from the Hardware " - "Enablement Stack (HWE) installed that", - text) + self.assertIn("You have packages from the Hardware Enablement " + "Stack (HWE) installed that", text) def test_advice_about_hwe_status_no_hwe_stack(self): with patch("hwe_support_status.is_unsupported_hwe_running") as m: - with patch("builtins.print") as mock_print: + with patch("__builtin__.print") as mock_print: m.return_value = False mock_unsupported_hwe_pkgs = [] - from HweSupportStatus.consts import LTS_EOL_DATE - from datetime import timedelta - today = LTS_EOL_DATE - timedelta(14) hwe_support_status.advice_about_hwe_status( - mock_unsupported_hwe_pkgs, [], [], False, today, - verbose=True) + mock_unsupported_hwe_pkgs, [], False, verbose=True) text = mock_print.call_args[0][0] print("43242343243", mock_print.call_count) self.assertIn( - "Your system is supported until April 2019", text) + "Your system is supported until April 2017", text) def test_advice_about_hwe_status_supported_hwe_stack(self): with patch("hwe_support_status.is_unsupported_hwe_running") as m: - with patch("builtins.print") as mock_print: + with patch("__builtin__.print") as mock_print: m.return_value = False mock_supported_hwe_pkgs = [] mock_supported_hwe_pkgs.append(make_mock_pkg( self.INSTALLED_SUPPORTED_HWE_PKG_NAMES[0])) - from HweSupportStatus.consts import LTS_EOL_DATE - from datetime import timedelta - today = LTS_EOL_DATE - timedelta(14) hwe_support_status.advice_about_hwe_status( - [], mock_supported_hwe_pkgs, [], False, today, - verbose=True) + [], mock_supported_hwe_pkgs, False, verbose=True) text = mock_print.call_args[0][0] self.assertIn( "Your Hardware Enablement Stack (HWE) is supported " - "until April 2019", text) + "until April 2017", text) if __name__ == "__main__": diff -Nru update-manager-17.10.11/tests/test_kernel_from_baseinstaller.py update-manager-0.156.14.15/tests/test_kernel_from_baseinstaller.py --- update-manager-17.10.11/tests/test_kernel_from_baseinstaller.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test_kernel_from_baseinstaller.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,41 @@ +#!/usr/bin/python + +import os +import subprocess +import sys +import unittest + +from mock import Mock,patch + +sys.path.insert(0,"../") +from DistUpgrade.DistUpgradeCache import MyCache +from DistUpgrade.DistUpgradeConfigParser import DistUpgradeConfig + +class TestKernelBaseinstaller(unittest.TestCase): + + def test_kernel_from_baseinstaller(self): + # the upgrade expects this + os.chdir("../DistUpgrade") + # get a config + config = DistUpgradeConfig(".") + config.set("Files", "LogDir", "/tmp") + cache = MyCache(config, None, None, lock=False) + cache._has_kernel_headers_installed = Mock() + cache._has_kernel_headers_installed.return_value = True + cache.getKernelsFromBaseInstaller = Mock() + cache.getKernelsFromBaseInstaller.return_value = \ + ["linux-generic2-pae", "linux-generic2"] + cache.mark_install = Mock() + cache.mark_install.return_value = True + cache._selectKernelFromBaseInstaller() + #print cache.mark_install.call_args + calls = cache.mark_install.call_args_list + self.assertEqual(len(calls), 2) + cache.mark_install.assert_any_call( + "linux-generic2-pae", "Selecting new kernel from base-installer") + cache.mark_install.assert_any_call( + "linux-headers-generic2-pae", "Selecting new kernel headers from base-installer") +if __name__ == "__main__": + import logging + logging.basicConfig(level=logging.DEBUG) + unittest.main() diff -Nru update-manager-17.10.11/tests/test_livepatch_socket.py update-manager-0.156.14.15/tests/test_livepatch_socket.py --- update-manager-17.10.11/tests/test_livepatch_socket.py 2017-08-31 16:17:31.000000000 +0000 +++ update-manager-0.156.14.15/tests/test_livepatch_socket.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,200 +0,0 @@ -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA - -import datetime -from gi.repository import GLib -import http.client -from mock import Mock -import logging -import sys -import unittest -import yaml - -from UpdateManager.Core.LivePatchSocket import LivePatchSocket, LivePatchFix - - -status0 = {'architecture': 'x86_64', - 'boot-time': datetime.datetime(2017, 6, 27, 11, 16), - 'client-version': '7.21', - 'cpu-model': 'Intel(R) Core(TM) i7-6700HQ CPU @ 2.60GHz', - 'last-check': datetime.datetime(2017, 6, 28, 14, 23, 29, 683361), - 'machine-id': 123456789, - 'machine-token': 987654321, - 'uptime': '27h12m12s'} - -status1 = {'architecture': 'x86_64', - 'boot-time': datetime.datetime(2017, 6, 27, 11, 16), - 'client-version': '7.21', - 'cpu-model': 'Intel(R) Core(TM) i7-6700HQ CPU @ 2.60GHz', - 'last-check': datetime.datetime(2017, 6, 28, 14, 23, 29, 683361), - 'machine-id': 123456789, - 'machine-token': 987654321, - 'status': [{'kernel': '4.4.0-78.99-generic', - 'livepatch': {'checkState': 'needs-check', - 'fixes': '', - 'patchState': 'nothing-to-apply', - 'version': '24.2'}, - 'running': True}], - 'uptime': '27h12m12s'} - -status2 = {'architecture': 'x86_64', - 'boot-time': datetime.datetime(2017, 6, 27, 11, 16), - 'client-version': '7.21', - 'cpu-model': 'Intel(R) Core(TM) i7-6700HQ CPU @ 2.60GHz', - 'last-check': datetime.datetime(2017, 6, 28, 14, 23, 29, 683361), - 'machine-id': 123456789, - 'machine-token': 987654321, - 'status': [{'kernel': '4.4.0-78.99-generic', - 'livepatch': {'checkState': 'checked', - 'fixes': '* CVE-2016-0001\n' - '* CVE-2016-0002\n' - '* CVE-2017-0001 (unpatched)\n' - '* CVE-2017-0001', - 'patchState': 'applied', - 'version': '24.2'}, - 'running': True}], - 'uptime': '27h12m12s'} - - -class TestUtils(object): - - @staticmethod - def __TimeoutCallback(user_data=None): - user_data[0] = True - return False - - @staticmethod - def __ScheduleTimeout(timeout_reached, timeout_duration=10): - return GLib.timeout_add(timeout_duration, - TestUtils.__TimeoutCallback, - timeout_reached) - - @staticmethod - def WaitUntilMSec(instance, check_function, expected_result=True, - max_wait=500, error_msg=''): - instance.assertIsNotNone(check_function) - - timeout_reached = [False] - timeout_id = TestUtils.__ScheduleTimeout(timeout_reached, max_wait) - - result = None - while not timeout_reached[0]: - result = check_function() - if result == expected_result: - break - GLib.MainContext.default().iteration(True) - - if result == expected_result: - GLib.Source.remove(timeout_id) - - instance.assertEqual(expected_result, result, error_msg) - - -class MockResponse(): - - def __init__(self, status, data): - self.status = status - self.data = data - - def read(self): - return yaml.dump(self.data) - - -class TestLivePatchSocket(unittest.TestCase): - - def test_get_check_state(self): - check_state = LivePatchSocket.get_check_state(status0) - self.assertEqual(check_state, 'check-failed') - check_state = LivePatchSocket.get_check_state(status1) - self.assertEqual(check_state, 'needs-check') - check_state = LivePatchSocket.get_check_state(status2) - self.assertEqual(check_state, 'checked') - - def test_get_patch_state(self): - patch_state = LivePatchSocket.get_patch_state(status0) - self.assertEqual(patch_state, 'unknown') - patch_state = LivePatchSocket.get_patch_state(status1) - self.assertEqual(patch_state, 'nothing-to-apply') - patch_state = LivePatchSocket.get_patch_state(status2) - self.assertEqual(patch_state, 'applied') - - def test_get_fixes(self): - fixes = LivePatchSocket.get_fixes(status0) - self.assertEqual(fixes, []) - fixes = LivePatchSocket.get_fixes(status1) - self.assertEqual(fixes, []) - fixes = LivePatchSocket.get_fixes(status2) - self.assertEqual(fixes, [LivePatchFix('CVE-2016-0001'), - LivePatchFix('CVE-2016-0002'), - LivePatchFix('CVE-2017-0001 (unpatched)'), - LivePatchFix('CVE-2017-0001')]) - - def test_livepatch_fix(self): - fix = LivePatchFix('CVE-2016-0001') - self.assertEqual(fix.name, 'CVE-2016-0001') - self.assertTrue(fix.patched) - - fix = LivePatchFix('CVE-2016-0001 (unpatched)') - self.assertEqual(fix.name, 'CVE-2016-0001') - self.assertFalse(fix.patched) - - def test_callback_not_active(self): - mock_http_conn = Mock(spec=http.client.HTTPConnection) - attrs = {'getresponse.return_value': MockResponse(400, None)} - mock_http_conn.configure_mock(**attrs) - - cb_called = [False] - - def on_done(active, check_state, patch_state, fixes): - cb_called[0] = True - self.assertFalse(active) - - lp = LivePatchSocket(mock_http_conn) - lp.get_status(on_done) - - mock_http_conn.request.assert_called_with( - 'GET', '/status?verbose=True') - TestUtils.WaitUntilMSec(self, lambda: cb_called[0] is True) - - def test_callback_active(self): - mock_http_conn = Mock(spec=http.client.HTTPConnection) - attrs = {'getresponse.return_value': MockResponse(200, status2)} - mock_http_conn.configure_mock(**attrs) - - cb_called = [False] - - def on_done(active, check_state, patch_state, fixes): - cb_called[0] = True - self.assertTrue(active) - self.assertEqual(check_state, 'checked') - self.assertEqual(patch_state, 'applied') - self.assertEqual(fixes, [LivePatchFix('CVE-2016-0001'), - LivePatchFix('CVE-2016-0002'), - LivePatchFix('CVE-2017-0001 (unpatched)'), - LivePatchFix('CVE-2017-0001')]) - - lp = LivePatchSocket(mock_http_conn) - lp.get_status(on_done) - - mock_http_conn.request.assert_called_with( - 'GET', '/status?verbose=True') - TestUtils.WaitUntilMSec(self, lambda: cb_called[0] is True) - - -if __name__ == '__main__': - if len(sys.argv) > 1 and sys.argv[1] == "-v": - logging.basicConfig(level=logging.DEBUG) - unittest.main() diff -Nru update-manager-17.10.11/tests/test_meta_release_core.py update-manager-0.156.14.15/tests/test_meta_release_core.py --- update-manager-17.10.11/tests/test_meta_release_core.py 2017-08-07 23:13:28.000000000 +0000 +++ update-manager-0.156.14.15/tests/test_meta_release_core.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,70 +1,53 @@ -#!/usr/bin/python3 -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- +#!/usr/bin/python import random import logging import multiprocessing import os +import os.path import sys -import tempfile -try: - from test.support import EnvironmentVarGuard -except ImportError: - from test.test_support import EnvironmentVarGuard import time -try: - from urllib.error import HTTPError - from urllib.request import install_opener, urlopen -except ImportError: - from urllib2 import HTTPError, install_opener, urlopen +import urllib2 import unittest -from mock import patch - -try: - from http.server import BaseHTTPRequestHandler -except ImportError: - from BaseHTTPServer import BaseHTTPRequestHandler -try: - from socketserver import TCPServer -except ImportError: - from SocketServer import TCPServer - - -from UpdateManager.Core.MetaRelease import ( - Dist, - MetaReleaseCore, - MetaReleaseParseError, -) - -CURDIR = os.path.dirname(os.path.abspath(__file__)) +from urllib2 import urlopen +from BaseHTTPServer import BaseHTTPRequestHandler +from SocketServer import TCPServer class SillyProxyRequestHandler(BaseHTTPRequestHandler): def do_HEAD(self): code = 200 info = "" try: - f = urlopen(self.path) + f = urllib2.urlopen(self.path) info = f.info() - except HTTPError as e: + except urllib2.HTTPError as e: code = e.code s = "HTTP/1.0 %s OK\n%s" % (code, info) - self.wfile.write(s.encode("UTF-8")) + self.wfile.write(s) # well, good enough do_GET = do_HEAD +PORT = random.randint(1025, 65535) +Handler = SillyProxyRequestHandler +httpd = TCPServer(("", PORT), Handler) + + +sys.path.insert(0, "../") +from UpdateManager.Core.MetaRelease import MetaReleaseCore, Dist +#from UpdateManager.Core.DistUpgradeFetcherCore import + def get_new_dist(current_release): - """ + """ common code to test new dist fetching, get the new dist information for hardy+1 """ meta = MetaReleaseCore() #meta.DEBUG = True meta.current_dist_name = current_release - fake_metarelease = os.path.join(CURDIR, "test-data", - "meta-release") + fake_metarelease = os.path.join(os.getcwd(), "test-data", "meta-release") meta.METARELEASE_URI = "file://%s" % fake_metarelease while meta.downloading: time.sleep(0.1) @@ -72,185 +55,83 @@ meta.download() return meta.new_dist - class TestMetaReleaseCore(unittest.TestCase): def setUp(self): self.new_dist = None - self.port = random.randint(1025, 65535) - self.httpd = TCPServer(("", self.port), SillyProxyRequestHandler) - self.httpd_process = multiprocessing.Process( - target=self.httpd.serve_forever) - self.httpd_process.start() + self.httpd = multiprocessing.Process(target=httpd.serve_forever) + self.httpd.start() def tearDown(self): - self.httpd_process.terminate() - self.httpd_process.join() - install_opener(None) + self.httpd.terminate() + self.httpd.join() def testnewdist(self): """ test that upgrades offer the right upgrade path """ - for (current, next) in [("dapper", "hardy"), - ("hardy", "lucid"), - ("intrepid", "jaunty"), - ("jaunty", "karmic"), - ("karmic", "lucid")]: + for (current, next) in [ ("dapper", "edgy"), + ("hardy", "lucid"), + ("intrepid", "jaunty"), + ("jaunty", "karmic"), + ("karmic", "lucid") ]: new_dist = get_new_dist(current) - self.assertEqual(next, new_dist.name, - "New dist name for %s is '%s', " - "but expected '%s''" % (current, new_dist.name, - next)) + self.assert_(new_dist.name == next, + "New dist name for %s is '%s', but expected '%s''" % (current, new_dist.name, next)) def test_url_downloadable(self): from UpdateManager.Core.utils import url_downloadable - with EnvironmentVarGuard() as environ: - # ensure that $no_proxy doesn't prevent us from accessing - # localhost through proxy - try: - del environ["no_proxy"] - except KeyError: - pass - logging.debug("proxy 1") - environ["http_proxy"] = "http://localhost:%s/" % self.port - install_opener(None) - self.assertTrue(url_downloadable("http://archive.ubuntu.com", - logging.debug), - "download with proxy %s failed" % - environ["http_proxy"]) - logging.debug("proxy 2") - environ["http_proxy"] = "http://localhost:%s" % self.port - install_opener(None) - self.assertTrue(url_downloadable("http://archive.ubuntu.com", - logging.debug), - "download with proxy %s failed" % - environ["http_proxy"]) - logging.debug("no proxy") - del environ["http_proxy"] - install_opener(None) - self.assertTrue(url_downloadable("http://archive.ubuntu.com", - logging.debug), - "download with no proxy failed") - - logging.debug("no proxy, no valid adress") - self.assertFalse(url_downloadable("http://archive.ubuntu.com/xxx", - logging.debug), - "download with no proxy failed") - - logging.debug("proxy, no valid adress") - environ["http_proxy"] = "http://localhost:%s" % self.port - install_opener(None) - self.assertFalse(url_downloadable("http://archive.ubuntu.com/xxx", - logging.debug), - "download with no proxy failed") + logging.debug("proxy 1") + os.environ["http_proxy"] = "http://localhost:%s/" % PORT + self.assertTrue(url_downloadable("http://www.ubuntu.com/desktop", + logging.debug), + "download with proxy %s failed" % os.environ["http_proxy"]) + logging.debug("proxy 2") + os.environ["http_proxy"] = "http://localhost:%s" % PORT + self.assertTrue(url_downloadable("http://www.ubuntu.com/desktop", + logging.debug), + "download with proxy %s failed" % os.environ["http_proxy"]) + logging.debug("no proxy") + del os.environ["http_proxy"] + self.assertTrue(url_downloadable("http://www.ubuntu.com/desktop", + logging.debug), + "download with no proxy failed") + + logging.debug("no proxy, no valid adress") + self.assertFalse(url_downloadable("http://www.ubuntu.com/xxx", + logging.debug), + "download with no proxy failed") + + logging.debug("proxy, no valid adress") + os.environ["http_proxy"] = "http://localhost:%s" % PORT + self.assertFalse(url_downloadable("http://www.ubuntu.com/xxx", + logging.debug), + "download with no proxy failed") def test_get_uri_query_string(self): - # test with fake data, use a space to test quoting - d = Dist("xenial", "16.04 LTS", "2016-04-21", True) + # test with fake data + d = Dist("oneiric", "11.10", "2011-10-10", True) meta = MetaReleaseCore() q = meta._get_release_notes_uri_query_string(d) - self.assertTrue("os%3Dubuntu" in q) - self.assertTrue("ver%3D16.04%20LTS" in q) + self.assertTrue("os=ubuntu" in q) + self.assertTrue("ver=11.10" in q) def test_html_uri_real(self): - # test parsing of a meta-releaes file from the server - with EnvironmentVarGuard() as environ: - environ["META_RELEASE_FAKE_CODENAME"] = "lucid" - meta = MetaReleaseCore(forceDownload=True) - while meta.downloading: - time.sleep(0.1) - self.assertIsNotNone(meta.new_dist) - uri = meta.new_dist.releaseNotesHtmlUri - f = urlopen(uri) - data = f.read().decode("UTF-8") - self.assertTrue(len(data) > 0) - self.assertTrue("" in data) - - @patch("UpdateManager.Core.MetaRelease.MetaReleaseCore.download") - def test_parse_fails_for_all_non_tagfiles(self, mock_download): - meta = MetaReleaseCore() - with tempfile.TemporaryFile() as f: - f.write("random stuff".encode("utf-8")) - f.seek(0) - meta.metarelease_information = f - self.assertRaises(MetaReleaseParseError, meta.parse) - - @patch("UpdateManager.Core.MetaRelease.MetaReleaseCore.download") - def test_parse_good(self, mock_download): - meta = MetaReleaseCore() - meta.current_dist_name = "foo" - with tempfile.TemporaryFile() as f: - f.write("""Dist: foo -Supported: 1 -Date: Thu, 26 Oct 2006 12:00:00 UTC -Version: 1.0 - -Dist: goo -Supported: 1 -Date: Thu, 26 Oct 2016 12:00:00 UTC -Version: 2.0 - """.encode("utf-8")) - f.seek(0) - meta.metarelease_information = f - meta.parse() - self.assertEqual(meta.upgradable_to.name, "goo") - self.assertEqual(meta.upgradable_to.version, "2.0") - self.assertEqual(meta.upgradable_to.supported, True) - - @patch("UpdateManager.Core.MetaRelease.MetaReleaseCore.download") - def test_parse_next_release_unsupported(self, mock_download): - # We should jump over an unsupported release. LP: #1497024 - meta = MetaReleaseCore() - meta.current_dist_name = "foo" - with tempfile.TemporaryFile() as f: - f.write("""Dist: foo -Supported: 1 -Date: Thu, 26 Oct 2006 12:00:00 UTC -Version: 1.0 - -Dist: goo -Supported: 0 -Date: Thu, 26 Oct 2016 12:00:00 UTC -Version: 2.0 - -Dist: hoo -Supported: 1 -Date: Thu, 26 Oct 2026 12:00:00 UTC -Version: 3.0 - """.encode("utf-8")) - f.seek(0) - meta.metarelease_information = f - meta.parse() - self.assertEqual(meta.upgradable_to.name, "hoo") - self.assertEqual(meta.upgradable_to.version, "3.0") - self.assertEqual(meta.upgradable_to.supported, True) - - @patch("UpdateManager.Core.MetaRelease.MetaReleaseCore.download") - def test_parse_next_release_unsupported_devel(self, mock_download): - # We should not jump over an unsupported release if we are running in - # "devel" mode. LP: #1497024 - meta = MetaReleaseCore() - meta.current_dist_name = "foo" - meta.useDevelopmentRelease = True - with tempfile.TemporaryFile() as f: - f.write("""Dist: foo -Supported: 1 -Date: Thu, 26 Oct 2006 12:00:00 UTC -Version: 1.0 - -Dist: goo -Supported: 0 -Date: Thu, 26 Oct 2016 12:00:00 UTC -Version: 2.0 - """.encode("utf-8")) - f.seek(0) - meta.metarelease_information = f - meta.parse() - self.assertEqual(meta.upgradable_to.name, "goo") - self.assertEqual(meta.upgradable_to.version, "2.0") - self.assertEqual(meta.upgradable_to.supported, False) - + os.environ["http_proxy"]="" + os.environ["META_RELEASE_FAKE_CODENAME"] = "lucid" + # useDevelopmentRelease=True is only needed until precise is + # released + meta = MetaReleaseCore(forceDownload=True, useDevelopmentRelease=True) + while meta.downloading: + time.sleep(0.1) + uri = meta.new_dist.releaseNotesHtmlUri + f = urlopen(uri) + data = f.read() + self.assertTrue(len(data) > 0) + self.assertTrue("" in data) + del os.environ["META_RELEASE_FAKE_CODENAME"] if __name__ == '__main__': if len(sys.argv) > 1 and sys.argv[1] == "-v": logging.basicConfig(level=logging.DEBUG) unittest.main() + + diff -Nru update-manager-17.10.11/tests/test_pep8.py update-manager-0.156.14.15/tests/test_pep8.py --- update-manager-17.10.11/tests/test_pep8.py 2017-08-07 20:26:53.000000000 +0000 +++ update-manager-0.156.14.15/tests/test_pep8.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -#!/usr/bin/python3 -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- - -import os -import subprocess -import unittest - -# pep8 is overdoing it a bit IMO -IGNORE_PEP8 = "E265,E402" -IGNORE_FILES = ( -) - - -class TestPep8Clean(unittest.TestCase): - """ ensure that the tree is pep8 clean """ - - def test_pep8_clean(self): - CURDIR = os.path.dirname(os.path.abspath(__file__)) - py_files = set() - for dirpath, dirs, files in os.walk(os.path.join(CURDIR, "..")): - for f in files: - if os.path.splitext(f)[1] != ".py": - continue - # islink to avoid running pep8 on imported files - # that are symlinks to other packages - if os.path.islink(os.path.join(dirpath, f)): - continue - if f in IGNORE_FILES: - continue - py_files.add(os.path.join(dirpath, f)) - ret_code = subprocess.call( - ["pep8", "--ignore={0}".format(IGNORE_PEP8)] + list(py_files)) - self.assertEqual(0, ret_code) - - -if __name__ == "__main__": - import logging - logging.basicConfig(level=logging.DEBUG) - unittest.main() diff -Nru update-manager-17.10.11/tests/test_prerequists.py update-manager-0.156.14.15/tests/test_prerequists.py --- update-manager-17.10.11/tests/test_prerequists.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test_prerequists.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,155 @@ +#!/usr/bin/python + +import unittest +import tempfile +import shutil +import sys +import os.path +import apt_pkg +sys.path.insert(0,"../") + +from DistUpgrade.DistUpgradeController import DistUpgradeController, NoBackportsFoundException +from DistUpgrade.DistUpgradeView import DistUpgradeView + +class testPreRequists(unittest.TestCase): + " this test the prerequists fetching " + + testdir = os.path.abspath("./data-sources-list-test/") + + def setUp(self): + apt_pkg.config.set("Dir::Etc",self.testdir) + apt_pkg.config.set("Dir::Etc::sourceparts",os.path.join(self.testdir,"sources.list.d")) + self.dc = DistUpgradeController(DistUpgradeView(), + datadir=self.testdir) + def testPreReqSourcesListAddingSimple(self): + " test adding the prerequists when a mirror is known " + shutil.copy(os.path.join(self.testdir,"sources.list.in"), + os.path.join(self.testdir,"sources.list")) + template = os.path.join(self.testdir,"prerequists-sources.list.in") + out = os.path.join(self.testdir,"sources.list.d", + "prerequists-sources.list") + self.dc._addPreRequistsSourcesList(template, out) + self.assert_(os.path.getsize(out)) + self._verifySources(out, """ +deb http://old-releases.ubuntu.com/ubuntu/ feisty-backports main/debian-installer +""") + + + def testPreReqSourcesListAddingNoMultipleIdenticalLines(self): + """ test adding the prerequists and ensure that no multiple + identical lines are added + """ + shutil.copy(os.path.join(self.testdir,"sources.list.no_archive_u_c"), + os.path.join(self.testdir,"sources.list")) + template = os.path.join(self.testdir,"prerequists-sources.list.in") + out = os.path.join(self.testdir,"sources.list.d", + "prerequists-sources.list") + self.dc._addPreRequistsSourcesList(template, out) + self.assert_(os.path.getsize(out)) + self._verifySources(out, """ +deb http://old-releases.ubuntu.com/ubuntu/ feisty-backports main/debian-installer +""") + + def testVerifyBackportsNotFound(self): + " test the backport verification " + # only minimal stuff in sources.list to speed up tests + shutil.copy(os.path.join(self.testdir,"sources.list.minimal"), + os.path.join(self.testdir,"sources.list")) + tmpdir = tempfile.mkdtemp() + # unset sourceparts + apt_pkg.config.set("Dir::Etc::sourceparts", tmpdir) + # write empty status file + open(tmpdir+"/status","w") + os.makedirs(tmpdir+"/lists/partial") + apt_pkg.config.set("Dir::State", tmpdir) + apt_pkg.config.set("Dir::State::status", tmpdir+"/status") + self.dc.openCache(lock=False) + exp = False + try: + res = self.dc._verifyBackports() + print res + except NoBackportsFoundException: + exp = True + self.assert_(exp == True) + + def disabled__because_of_jaunty_EOL_testVerifyBackportsValid(self): + " test the backport verification " + # only minimal stuff in sources.list to speed up tests + shutil.copy(os.path.join(self.testdir,"sources.list.minimal"), + os.path.join(self.testdir,"sources.list")) + tmpdir = tempfile.mkdtemp() + #apt_pkg.config.set("Debug::pkgAcquire::Auth","true") + #apt_pkg.config.set("Debug::Acquire::gpgv","true") + apt_pkg.config.set("APT::GPGV::TrustedKeyring",self.testdir+"/trusted.gpg") + # set sourceparts + apt_pkg.config.set("Dir::Etc::sourceparts", tmpdir) + template = os.path.join(self.testdir,"prerequists-sources.list.in") + out = os.path.join(tmpdir,"prerequists-sources.list") + # write empty status file + open(tmpdir+"/status","w") + os.makedirs(tmpdir+"/lists/partial") + apt_pkg.config.set("Dir::State", tmpdir) + apt_pkg.config.set("Dir::State::status", tmpdir+"/status") + self.dc._addPreRequistsSourcesList(template, out) + self.dc.openCache(lock=False) + res = self.dc._verifyBackports() + self.assert_(res == True) + + def disabled__because_of_jaunty_EOL_testVerifyBackportsNoValidMirror(self): + " test the backport verification with no valid mirror " + # only minimal stuff in sources.list to speed up tests + shutil.copy(os.path.join(self.testdir,"sources.list.no_valid_mirror"), + os.path.join(self.testdir,"sources.list")) + tmpdir = tempfile.mkdtemp() + #apt_pkg.config.set("Debug::pkgAcquire::Auth","true") + #apt_pkg.config.set("Debug::Acquire::gpgv","true") + apt_pkg.config.set("APT::GPGV::TrustedKeyring",self.testdir+"/trusted.gpg") + # set sourceparts + apt_pkg.config.set("Dir::Etc::sourceparts", tmpdir) + template = os.path.join(self.testdir,"prerequists-sources.list.in.no_archive_falllback") + out = os.path.join(tmpdir,"prerequists-sources.list") + # write empty status file + open(tmpdir+"/status","w") + os.makedirs(tmpdir+"/lists/partial") + apt_pkg.config.set("Dir::State", tmpdir) + apt_pkg.config.set("Dir::State::status", tmpdir+"/status") + self.dc._addPreRequistsSourcesList(template, out, dumb=True) + self.dc.openCache(lock=False) + res = self.dc._verifyBackports() + self.assert_(res == True) + + def disabled__because_of_jaunty_EOL_testVerifyBackportsNoValidMirror2(self): + " test the backport verification with no valid mirror " + # only minimal stuff in sources.list to speed up tests + shutil.copy(os.path.join(self.testdir,"sources.list.no_valid_mirror"), + os.path.join(self.testdir,"sources.list")) + tmpdir = tempfile.mkdtemp() + #apt_pkg.config.set("Debug::pkgAcquire::Auth","true") + #apt_pkg.config.set("Debug::Acquire::gpgv","true") + apt_pkg.config.set("APT::GPGV::TrustedKeyring",self.testdir+"/trusted.gpg") + # set sourceparts + apt_pkg.config.set("Dir::Etc::sourceparts", tmpdir) + template = os.path.join(self.testdir,"prerequists-sources.list.in.broken") + out = os.path.join(tmpdir,"prerequists-sources.list") + # write empty status file + open(tmpdir+"/status","w") + os.makedirs(tmpdir+"/lists/partial") + apt_pkg.config.set("Dir::State", tmpdir) + apt_pkg.config.set("Dir::State::status", tmpdir+"/status") + try: + self.dc._addPreRequistsSourcesList(template, out, dumb=False) + self.dc.openCache(lock=False) + self.dc._verifyBackports() + except NoBackportsFoundException: + exp = True + self.assert_(exp == True) + + def _verifySources(self, filename, expected): + sources_list = open(filename).read() + for l in expected.split("\n"): + if l: + self.assert_(l in sources_list, + "expected entry '%s' in '%s' missing, got:\n%s" % (l, filename, open(filename).read())) + +if __name__ == "__main__": + unittest.main() diff -Nru update-manager-17.10.11/tests/test_proxy.py update-manager-0.156.14.15/tests/test_proxy.py --- update-manager-17.10.11/tests/test_proxy.py 2017-08-07 19:03:56.000000000 +0000 +++ update-manager-0.156.14.15/tests/test_proxy.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,39 +1,29 @@ -#!/usr/bin/python3 -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- +#!/usr/bin/python import unittest import apt_pkg import logging import os +import os.path import sys +sys.path.insert(0, "../") from UpdateManager.Core.utils import init_proxy - class TestInitProxy(unittest.TestCase): - proxy = "http://10.0.2.2:3128" - - def setUp(self): - try: - del os.environ["http_proxy"] - except KeyError: - pass - apt_pkg.config.set("Acquire::http::proxy", self.proxy) - def tearDown(self): + def testinitproxy(self): + import gconf + proxy = "http://10.0.2.2:3128" try: del os.environ["http_proxy"] - except KeyError: + except KeyError: pass - apt_pkg.config.clear("Acquire::http::proxy") - - def testinitproxy(self): - from gi.repository import Gio - settings = Gio.Settings.new("com.ubuntu.update-manager") - detected_proxy = init_proxy(settings) - self.assertEqual(detected_proxy, self.proxy) - + apt_pkg.Config.set("Acquire::http::proxy", proxy) + client = gconf.client_get_default() + detected_proxy = init_proxy(client) + self.assertEqual(detected_proxy, proxy) if __name__ == '__main__': if len(sys.argv) > 1 and sys.argv[1] == "-v": diff -Nru update-manager-17.10.11/tests/test_pyflakes.py update-manager-0.156.14.15/tests/test_pyflakes.py --- update-manager-17.10.11/tests/test_pyflakes.py 2017-08-07 19:03:48.000000000 +0000 +++ update-manager-0.156.14.15/tests/test_pyflakes.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,60 +1,16 @@ -#!/usr/bin/python3 -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- +#!/usr/bin/python -# Partly based on a script from Review Board, MIT license; but modified to -# act as a unit test. - -from __future__ import print_function - -import os -import re import subprocess import unittest -CURDIR = os.path.dirname(os.path.abspath(__file__)) - - class TestPyflakesClean(unittest.TestCase): """ ensure that the tree is pyflakes clean """ - def read_exclusions(self): - exclusions = {} - try: - excpath = os.path.join(CURDIR, "pyflakes.exclude") - with open(excpath, "r") as fp: - for line in fp: - if not line.startswith("#"): - exclusions[line.rstrip()] = 1 - except IOError: - pass - return exclusions - - def filter_exclusions(self, contents): - exclusions = self.read_exclusions() - for line in contents: - if line.startswith("#"): - continue - - line = line.rstrip().split(CURDIR + '/', 1)[1] - test_line = re.sub(r":[0-9]+:", r":*:", line, 1) - test_line = re.sub(r"line [0-9]+", r"line *", test_line) - - if test_line not in exclusions: - yield line - def test_pyflakes_clean(self): # mvo: type -f here to avoid running pyflakes on imported files # that are symlinks to other packages - cmd = 'find %s/.. -type f -name "*.py" | xargs pyflakes3' % CURDIR - p = subprocess.Popen( - cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, - close_fds=True, shell=True, universal_newlines=True) - contents = p.communicate()[0].splitlines() - filtered_contents = list(self.filter_exclusions(contents)) - for line in filtered_contents: - print(line) - self.assertEqual(0, len(filtered_contents)) - + cmd = 'find .. -type f -name "*.py"|xargs pyflakes' + self.assertEqual(subprocess.call(cmd, shell=True), 0) if __name__ == "__main__": import logging diff -Nru update-manager-17.10.11/tests/test_quirks.py update-manager-0.156.14.15/tests/test_quirks.py --- update-manager-17.10.11/tests/test_quirks.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test_quirks.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,179 @@ +#!/usr/bin/python + +import apt +import apt_pkg +import hashlib +import mock +import unittest +import shutil +import sys +import tempfile + +sys.path.insert(0,"../") +from DistUpgrade.DistUpgradeQuirks import DistUpgradeQuirks + +class MockController(object): + def __init__(self): + self._view = None + +class MockConfig(object): + pass + +class TestQuirks(unittest.TestCase): + + def test_enable_recommends_during_upgrade(self): + controller = mock.Mock() + + config = mock.Mock() + q = DistUpgradeQuirks(controller, config) + # server mode + apt_pkg.config.set("APT::Install-Recommends", "0") + controller.serverMode = True + self.assertFalse(apt_pkg.config.find_b("APT::Install-Recommends")) + q.ensure_recommends_are_installed_on_desktops() + self.assertFalse(apt_pkg.config.find_b("APT::Install-Recommends")) + # desktop mode + apt_pkg.config.set("APT::Install-Recommends", "0") + controller.serverMode = False + self.assertFalse(apt_pkg.config.find_b("APT::Install-Recommends")) + q.ensure_recommends_are_installed_on_desktops() + self.assertTrue(apt_pkg.config.find_b("APT::Install-Recommends")) + + def test_parse_from_modaliases_header(self): + pkgrec = { "Package" : "foo", + "Modaliases" : "modules1(pci:v00001002d00006700sv*sd*bc03sc*i*, pci:v00001002d00006701sv*sd*bc03sc*i*), module2(pci:v00001002d00006702sv*sd*bc03sc*i*, pci:v00001001d00006702sv*sd*bc03sc*i*)" + } + controller = mock.Mock() + config = mock.Mock() + q = DistUpgradeQuirks(controller, config) + self.assertEqual(q._parse_modaliases_from_pkg_header({}), []) + self.assertEqual(q._parse_modaliases_from_pkg_header(pkgrec), + [("modules1", + ["pci:v00001002d00006700sv*sd*bc03sc*i*", "pci:v00001002d00006701sv*sd*bc03sc*i*"]), + ("module2", + ["pci:v00001002d00006702sv*sd*bc03sc*i*", "pci:v00001001d00006702sv*sd*bc03sc*i*"]) ]) + + def testFglrx(self): + mock_lspci_good = set(['1002:9714']) + mock_lspci_bad = set(['8086:ac56']) + config = mock.Mock() + cache = apt.Cache() + controller = mock.Mock() + controller.cache = cache + q = DistUpgradeQuirks(controller, config) + self.assert_(q._supportInModaliases("fglrx", + mock_lspci_good) == True) + self.assert_(q._supportInModaliases("fglrx", + mock_lspci_bad) == False) + + def test_cpuHasSSESupport(self): + q = DistUpgradeQuirks(MockController(), MockConfig) + self.assert_(q._cpuHasSSESupport(cpuinfo="test-data/cpuinfo-with-sse") == True) + self.assert_(q._cpuHasSSESupport(cpuinfo="test-data/cpuinfo-without-sse") == False) + + def test_cpu_is_i686(self): + q = DistUpgradeQuirks(MockController(), MockConfig) + q.arch = "i386" + self.assertTrue(q._cpu_is_i686_and_has_cmov("test-data/cpuinfo-with-sse")) + self.assertFalse(q._cpu_is_i686_and_has_cmov("test-data/cpuinfo-without-cmov")) + self.assertFalse(q._cpu_is_i686_and_has_cmov("test-data/cpuinfo-i586")) + self.assertFalse(q._cpu_is_i686_and_has_cmov("test-data/cpuinfo-i486")) + self.assertTrue(q._cpu_is_i686_and_has_cmov("test-data/cpuinfo-via-c7m")) + + def _verify_result_checksums(self): + """ helper for test_patch to verify that we get the expected result """ + # simple case is foo + self.assertFalse("Hello" in open("./patchdir/foo").read()) + self.assertTrue("Hello" in open("./patchdir/foo_orig").read()) + md5 = hashlib.md5() + md5.update(open("./patchdir/foo").read()) + self.assertEqual(md5.hexdigest(), "52f83ff6877e42f613bcd2444c22528c") + # more complex example fstab + md5 = hashlib.md5() + md5.update(open("./patchdir/fstab").read()) + self.assertEqual(md5.hexdigest(), "c56d2d038afb651920c83106ec8dfd09") + # most complex example + md5 = hashlib.md5() + md5.update(open("./patchdir/pycompile").read()) + self.assertEqual(md5.hexdigest(), "97c07a02e5951cf68cb3f86534f6f917") + # with ".\n" + md5 = hashlib.md5() + md5.update(open("./patchdir/dotdot").read()) + self.assertEqual(md5.hexdigest(), "cddc4be46bedd91db15ddb9f7ddfa804") + # test that incorrect md5sum after patching rejects the patch + self.assertEqual(open("./patchdir/fail").read(), + open("./patchdir/fail_orig").read()) + + def test_patch(self): + q = DistUpgradeQuirks(MockController(), MockConfig) + # create patch environment + shutil.copy("./patchdir/foo_orig", "./patchdir/foo") + shutil.copy("./patchdir/fstab_orig", "./patchdir/fstab") + shutil.copy("./patchdir/pycompile_orig", "./patchdir/pycompile") + shutil.copy("./patchdir/dotdot_orig", "./patchdir/dotdot") + shutil.copy("./patchdir/fail_orig", "./patchdir/fail") + # apply patches + q._applyPatches(patchdir="./patchdir") + self._verify_result_checksums() + # now apply patches again and ensure we don't patch twice + q._applyPatches(patchdir="./patchdir") + self._verify_result_checksums() + + def test_patch_lowlevel(self): + #test lowlevel too + from DistUpgrade.DistUpgradePatcher import patch, PatchError + self.assertRaises(PatchError, patch, "./patchdir/fail", "patchdir/patchdir_fail.ed04abbc6ee688ee7908c9dbb4b9e0a2.deadbeefdeadbeefdeadbeff", "deadbeefdeadbeefdeadbeff") + + def test_ntfs_fstab(self): + q = DistUpgradeQuirks(MockController(), MockConfig) + shutil.copy("./test-data/fstab.ntfs.orig", "./test-data/fstab.ntfs") + self.assertTrue("UUID=7260D4F760D4C2D1 /media/storage ntfs defaults,nls=utf8,umask=000,gid=46 0 1" in open("./test-data/fstab.ntfs").read()) + q._ntfsFstabFixup(fstab="./test-data/fstab.ntfs") + self.assertTrue(open("./test-data/fstab.ntfs").read().endswith("0\n")) + self.assertTrue("UUID=7260D4F760D4C2D1 /media/storage ntfs defaults,nls=utf8,umask=000,gid=46 0 0" in open("./test-data/fstab.ntfs").read()) + self.assertFalse("UUID=7260D4F760D4C2D1 /media/storage ntfs defaults,nls=utf8,umask=000,gid=46 0 1" in open("./test-data/fstab.ntfs").read()) + + def test_kde_card_games_transition(self): + # fake nothing is installed + empty_status = tempfile.NamedTemporaryFile() + apt_pkg.config.set("Dir::state::status", empty_status.name) + + # create quirks class + controller = mock.Mock() + config = mock.Mock() + quirks = DistUpgradeQuirks(controller, config) + # add cache to the quirks class + cache = quirks.controller.cache = apt.Cache() + # add mark_install to the cache (this is part of mycache normally) + cache.mark_install = lambda p, s: cache[p].mark_install() + + # test if the quirks handler works when kdegames-card is not installed + # does not try to install it + self.assertFalse(cache["kdegames-card-data-extra"].marked_install) + quirks._add_kdegames_card_extra_if_installed() + self.assertFalse(cache["kdegames-card-data-extra"].marked_install) + + # mark it for install + cache["kdegames-card-data"].mark_install() + self.assertFalse(cache["kdegames-card-data-extra"].marked_install) + quirks._add_kdegames_card_extra_if_installed() + # verify that the quirks handler is now installing it + self.assertTrue(cache["kdegames-card-data-extra"].marked_install) + + def test_screensaver_poke(self): + # fake nothing is installed + empty_status = tempfile.NamedTemporaryFile() + apt_pkg.config.set("Dir::state::status", empty_status.name) + + # create quirks class + controller = mock.Mock() + config = mock.Mock() + quirks = DistUpgradeQuirks(controller, config) + quirks._pokeScreensaver() + res = quirks._stopPokeScreensaver() + res # pyflakes + +if __name__ == "__main__": + import logging + logging.basicConfig(level=logging.DEBUG) + unittest.main() diff -Nru update-manager-17.10.11/tests/test_sources_list.py update-manager-0.156.14.15/tests/test_sources_list.py --- update-manager-17.10.11/tests/test_sources_list.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test_sources_list.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,317 @@ +#!/usr/bin/python + +import os +import sys +sys.path.insert(0,"../") + +import shutil +import subprocess +import apt_pkg +import unittest +from DistUpgrade.DistUpgradeController import DistUpgradeController +from DistUpgrade.DistUpgradeViewNonInteractive import DistUpgradeViewNonInteractive +import logging + +class TestSourcesListUpdate(unittest.TestCase): + + testdir = os.path.abspath("./data-sources-list-test/") + + def setUp(self): + apt_pkg.config.set("Dir::Etc",self.testdir) + apt_pkg.config.set("Dir::Etc::sourceparts",os.path.join(self.testdir,"sources.list.d")) + if os.path.exists(os.path.join(self.testdir, "sources.list")): + os.unlink(os.path.join(self.testdir, "sources.list")) + + def test_sources_list_with_nothing(self): + """ + test sources.list rewrite with nothing in it + """ + shutil.copy(os.path.join(self.testdir,"sources.list.nothing"), + os.path.join(self.testdir,"sources.list")) + apt_pkg.config.set("Dir::Etc::sourcelist","sources.list") + v = DistUpgradeViewNonInteractive() + d = DistUpgradeController(v,datadir=self.testdir) + d.openCache(lock=False) + res = d.updateSourcesList() + self.assert_(res == True) + + # now test the result + self._verifySources(""" +deb http://archive.ubuntu.com/ubuntu gutsy main restricted +deb http://archive.ubuntu.com/ubuntu gutsy-updates main restricted +deb http://security.ubuntu.com/ubuntu/ gutsy-security main restricted +""") + + def test_sources_list_rewrite(self): + """ + test regular sources.list rewrite + """ + shutil.copy(os.path.join(self.testdir,"sources.list.in"), + os.path.join(self.testdir,"sources.list")) + apt_pkg.config.set("Dir::Etc::sourcelist","sources.list") + v = DistUpgradeViewNonInteractive() + d = DistUpgradeController(v,datadir=self.testdir) + d.openCache(lock=False) + res = d.updateSourcesList() + self.assert_(res == True) + + # now test the result + #print open(os.path.join(self.testdir,"sources.list")).read() + self._verifySources(""" +# main repo +deb http://archive.ubuntu.com/ubuntu/ gutsy main restricted multiverse universe +deb http://de.archive.ubuntu.com/ubuntu/ gutsy main restricted multiverse +deb-src http://archive.ubuntu.com/ubuntu/ gutsy main restricted multiverse +deb http://security.ubuntu.com/ubuntu/ gutsy-security main restricted multiverse +deb http://security.ubuntu.com/ubuntu/ gutsy-security universe +""") + # check that the backup file was created correctly + self.assert_(subprocess.call( + ["cmp", + apt_pkg.config.find_file("Dir::Etc::sourcelist")+".in", + apt_pkg.config.find_file("Dir::Etc::sourcelist")+".distUpgrade" + ]) == 0) + + def test_commercial_transition(self): + """ + test transition of pre-gutsy archive.canonical.com archives + """ + shutil.copy(os.path.join(self.testdir,"sources.list.commercial-transition"), + os.path.join(self.testdir,"sources.list")) + apt_pkg.config.set("Dir::Etc::sourceparts",os.path.join(self.testdir,"sources.list.d")) + v = DistUpgradeViewNonInteractive() + d = DistUpgradeController(v,datadir=self.testdir) + d.openCache(lock=False) + res = d.updateSourcesList() + self.assert_(res == True) + + # now test the result + self._verifySources(""" +deb http://archive.canonical.com/ubuntu gutsy partner +""") + + def test_powerpc_transition(self): + """ + test transition of powerpc to ports.ubuntu.com + """ + arch = apt_pkg.config.find("APT::Architecture") + apt_pkg.config.set("APT::Architecture","powerpc") + shutil.copy(os.path.join(self.testdir,"sources.list.powerpc"), + os.path.join(self.testdir,"sources.list")) + apt_pkg.config.set("Dir::Etc::sourceparts",os.path.join(self.testdir,"sources.list.d")) + v = DistUpgradeViewNonInteractive() + d = DistUpgradeController(v,datadir=self.testdir) + d.openCache(lock=False) + res = d.updateSourcesList() + self.assert_(res == True) + # now test the result + self._verifySources(""" +deb http://ports.ubuntu.com/ubuntu-ports/ gutsy main restricted multiverse universe +deb-src http://archive.ubuntu.com/ubuntu/ gutsy main restricted multiverse + +deb http://ports.ubuntu.com/ubuntu-ports/ gutsy-security main restricted universe multiverse +""") + apt_pkg.config.set("APT::Architecture",arch) + + def test_sparc_transition(self): + """ + test transition of sparc to ports.ubuntu.com + """ + arch = apt_pkg.config.find("APT::Architecture") + apt_pkg.config.set("APT::Architecture","sparc") + shutil.copy(os.path.join(self.testdir,"sources.list.sparc"), + os.path.join(self.testdir,"sources.list")) + apt_pkg.config.set("Dir::Etc::sourceparts",os.path.join(self.testdir,"sources.list.d")) + v = DistUpgradeViewNonInteractive() + d = DistUpgradeController(v,datadir=self.testdir) + d.fromDist = "gutsy" + d.toDist = "hardy" + d.openCache(lock=False) + res = d.updateSourcesList() + self.assert_(res == True) + # now test the result + self._verifySources(""" +deb http://ports.ubuntu.com/ubuntu-ports/ hardy main restricted multiverse universe +deb-src http://archive.ubuntu.com/ubuntu/ hardy main restricted multiverse + +deb http://ports.ubuntu.com/ubuntu-ports/ hardy-security main restricted universe multiverse +""") + apt_pkg.config.set("APT::Architecture",arch) + + + def testVerifySourcesListEntry(self): + from aptsources.sourceslist import SourceEntry + v = DistUpgradeViewNonInteractive() + d = DistUpgradeController(v,datadir=self.testdir) + for scheme in ["http"]: + entry = "deb %s://archive.ubuntu.com/ubuntu/ hardy main universe restricted multiverse" % scheme + self.assertTrue(d._sourcesListEntryDownloadable(SourceEntry(entry)), + "entry '%s' not downloadable" % entry) + entry = "deb %s://archive.ubuntu.com/ubuntu/ warty main universe restricted multiverse" % scheme + self.assertFalse(d._sourcesListEntryDownloadable(SourceEntry(entry)), + "entry '%s' not downloadable" % entry) + entry = "deb %s://archive.ubuntu.com/ubuntu/ xxx main" % scheme + self.assertFalse(d._sourcesListEntryDownloadable(SourceEntry(entry)), + "entry '%s' not downloadable" % entry) + + def testEOL2EOLUpgrades(self): + " test upgrade from EOL release to EOL release " + v = DistUpgradeViewNonInteractive() + d = DistUpgradeController(v,datadir=self.testdir) + shutil.copy(os.path.join(self.testdir,"sources.list.EOL"), + os.path.join(self.testdir,"sources.list")) + apt_pkg.config.set("Dir::Etc::sourceparts",os.path.join(self.testdir,"sources.list.d")) + v = DistUpgradeViewNonInteractive() + d = DistUpgradeController(v,datadir=self.testdir) + d.fromDist = "warty" + d.toDist = "hoary" + d.openCache(lock=False) + res = d.updateSourcesList() + self.assert_(res == True) + self._verifySources(""" +# main repo +deb http://old-releases.ubuntu.com/ubuntu hoary main restricted multiverse universe +deb-src http://old-releases.ubuntu.com/ubuntu hoary main restricted multiverse + +deb http://old-releases.ubuntu.com/ubuntu hoary-security main restricted universe multiverse +""") + + def testEOL2SupportedWithMirrorUpgrade(self): + " test upgrade from a EOL release to a supported release with mirror" + os.environ["LANG"] = "de_DE.UTF-8" + v = DistUpgradeViewNonInteractive() + d = DistUpgradeController(v,datadir=self.testdir) + shutil.copy(os.path.join(self.testdir,"sources.list.EOL2Supported"), + os.path.join(self.testdir,"sources.list")) + apt_pkg.config.set("Dir::Etc::sourceparts",os.path.join(self.testdir,"sources.list.d")) + v = DistUpgradeViewNonInteractive() + d = DistUpgradeController(v,datadir=self.testdir) + d.fromDist = "gutsy" + d.toDist = "hardy" + d.openCache(lock=False) + res = d.updateSourcesList() + self.assert_(res == True) + self._verifySources(""" +# main repo +deb http://de.archive.ubuntu.com/ubuntu hardy main restricted multiverse universe +deb-src http://de.archive.ubuntu.com/ubuntu hardy main restricted multiverse + +deb http://de.archive.ubuntu.com/ubuntu hardy-security main restricted universe multiverse +""") + + def testEOL2SupportedUpgrade(self): + " test upgrade from a EOL release to a supported release " + os.environ["LANG"] = "C" + v = DistUpgradeViewNonInteractive() + d = DistUpgradeController(v,datadir=self.testdir) + shutil.copy(os.path.join(self.testdir,"sources.list.EOL2Supported"), + os.path.join(self.testdir,"sources.list")) + apt_pkg.config.set("Dir::Etc::sourceparts",os.path.join(self.testdir,"sources.list.d")) + v = DistUpgradeViewNonInteractive() + d = DistUpgradeController(v,datadir=self.testdir) + d.fromDist = "gutsy" + d.toDist = "hardy" + d.openCache(lock=False) + res = d.updateSourcesList() + self.assert_(res == True) + self._verifySources(""" +# main repo +deb http://archive.ubuntu.com/ubuntu hardy main restricted multiverse universe +deb-src http://archive.ubuntu.com/ubuntu hardy main restricted multiverse + +deb http://archive.ubuntu.com/ubuntu hardy-security main restricted universe multiverse +""") + + def test_partner_update(self): + """ + test transition partner repository updates + """ + shutil.copy(os.path.join(self.testdir,"sources.list.partner"), + os.path.join(self.testdir,"sources.list")) + apt_pkg.config.set("Dir::Etc::sourceparts",os.path.join(self.testdir,"sources.list.d")) + v = DistUpgradeViewNonInteractive() + d = DistUpgradeController(v,datadir=self.testdir) + d.openCache(lock=False) + res = d.updateSourcesList() + self.assert_(res == True) + + # now test the result + self._verifySources(""" +deb http://archive.ubuntu.com/ubuntu/ gutsy main restricted multiverse universe +deb-src http://archive.ubuntu.com/ubuntu/ gutsy main restricted multiverse + +deb http://security.ubuntu.com/ubuntu/ gutsy-security main restricted universe multiverse + +deb http://archive.canonical.com/ubuntu gutsy partner +""") + + def test_private_ppa_transition(self): + shutil.copy( + os.path.join(self.testdir,"sources.list.commercial-ppa-uploaders"), + os.path.join(self.testdir,"sources.list")) + apt_pkg.config.set( + "Dir::Etc::sourceparts",os.path.join(self.testdir,"sources.list.d")) + v = DistUpgradeViewNonInteractive() + d = DistUpgradeController(v,datadir=self.testdir) + d.openCache(lock=False) + res = d.updateSourcesList() + self.assert_(res == True) + + # now test the result + self._verifySources(""" +deb http://archive.ubuntu.com/ubuntu/ gutsy main restricted multiverse universe +deb-src http://archive.ubuntu.com/ubuntu/ gutsy main restricted multiverse + +deb http://security.ubuntu.com/ubuntu/ gutsy-security main restricted universe multiverse + +# random one +# deb http://user:pass@private-ppa.launchpad.net/random-ppa gutsy main # disabled on upgrade to gutsy + +# commercial PPA +deb https://user:pass@private-ppa.launchpad.net/commercial-ppa-uploaders gutsy main +""") + + + def test_apt_cacher_and_apt_bittorent(self): + """ + test transition of apt-cacher/apt-torrent uris + """ + shutil.copy(os.path.join(self.testdir,"sources.list.apt-cacher"), + os.path.join(self.testdir,"sources.list")) + apt_pkg.config.set("Dir::Etc::sourceparts",os.path.join(self.testdir,"sources.list.d")) + v = DistUpgradeViewNonInteractive() + d = DistUpgradeController(v,datadir=self.testdir) + d.openCache(lock=False) + res = d.updateSourcesList() + self.assert_(res == True) + + # now test the result + self._verifySources(""" +deb http://localhost:9977/security.ubuntu.com/ubuntu gutsy-security main restricted universe multiverse +deb http://localhost:9977/archive.canonical.com/ubuntu gutsy partner +deb http://localhost:9977/us.archive.ubuntu.com/ubuntu/ gutsy main +deb http://localhost:9977/archive.ubuntu.com/ubuntu/ gutsy main + +deb http://archive.ubuntu.com/ubuntu/ gutsy main restricted multiverse universe +deb-src http://archive.ubuntu.com/ubuntu/ gutsy main restricted multiverse + +deb http://security.ubuntu.com/ubuntu/ gutsy-security main restricted +deb http://security.ubuntu.com/ubuntu/ gutsy-security universe + +deb http://archive.canonical.com/ubuntu gutsy partner +""") + + + def _verifySources(self, expected): + sources_list = open(apt_pkg.config.find_file("Dir::Etc::sourcelist")).read() + for l in expected.split("\n"): + self.assert_(l in sources_list.split("\n"), + "expected entry '%s' in sources.list missing. got:\n'''%s'''" % (l, sources_list)) + + +if __name__ == "__main__": + import sys + for e in sys.argv: + if e == "-v": + logging.basicConfig(level=logging.DEBUG) + unittest.main() diff -Nru update-manager-17.10.11/tests/test_stop_update.py update-manager-0.156.14.15/tests/test_stop_update.py --- update-manager-17.10.11/tests/test_stop_update.py 2017-08-07 19:03:21.000000000 +0000 +++ update-manager-0.156.14.15/tests/test_stop_update.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -#!/usr/bin/python3 -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- - -import logging -import sys -import unittest -from mock import patch -from gettext import gettext as _ - -from UpdateManager.UpdateManager import UpdateManager -from UpdateManager.UpdatesAvailable import UpdatesAvailable -from UpdateManager import Dialogs - -import os -CURDIR = os.path.dirname(os.path.abspath(__file__)) - - -class TestStopUpdate(unittest.TestCase): - - def setUp(self): - patcher = patch('UpdateManager.UpdateManager.UpdateManager') - self.addCleanup(patcher.stop) - self.manager = patcher.start() - self.manager._check_meta_release.return_value = False - self.manager.hwe_replacement_packages = None - self.manager.datadir = os.path.join(CURDIR, '..', 'data') - - def test_stop_no_updates(self): - p = UpdateManager._make_available_pane(self.manager, 0, - cancelled_update=True) - self.assertIsInstance(p, Dialogs.StoppedUpdatesDialog) - - def test_no_stop_no_updates(self): - p = UpdateManager._make_available_pane(self.manager, 0, - cancelled_update=False) - self.assertNotIsInstance(p, Dialogs.StoppedUpdatesDialog) - - def test_stop_updates(self): - p = UpdateManager._make_available_pane(self.manager, 1, - cancelled_update=True) - self.assertIsInstance(p, UpdatesAvailable) - self.assertEqual(p.custom_header, - _("You stopped the check for updates.")) - - def test_no_stop_updates(self): - p = UpdateManager._make_available_pane(self.manager, 1, - cancelled_update=False) - self.assertIsInstance(p, UpdatesAvailable) - self.assertIsNone(p.custom_header) - - -if __name__ == '__main__': - if len(sys.argv) > 1 and sys.argv[1] == "-v": - logging.basicConfig(level=logging.DEBUG) - unittest.main() diff -Nru update-manager-17.10.11/tests/test_update_error.py update-manager-0.156.14.15/tests/test_update_error.py --- update-manager-17.10.11/tests/test_update_error.py 2017-08-07 19:02:19.000000000 +0000 +++ update-manager-0.156.14.15/tests/test_update_error.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ -#!/usr/bin/python3 -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- - -import logging -import mock -import sys -import unittest -from gettext import gettext as _ -from mock import patch - -from UpdateManager.Dialogs import NoUpdatesDialog -from UpdateManager.UpdateManager import UpdateManager -from UpdateManager.backend import (InstallBackend, get_backend) -from UpdateManager.UpdatesAvailable import UpdatesAvailable - -import os -CURDIR = os.path.dirname(os.path.abspath(__file__)) - - -class TestUpdateManagerError(unittest.TestCase): - - def setUp(self): - patcher = patch('UpdateManager.UpdateManager.UpdateManager') - self.addCleanup(patcher.stop) - self.manager = patcher.start() - self.manager._check_meta_release.return_value = False - self.manager.hwe_replacement_packages = None - self.manager.datadir = os.path.join(CURDIR, '..', 'data') - - def test_error_no_updates(self): - p = UpdateManager._make_available_pane(self.manager, 0, - error_occurred=True) - self.assertIsInstance(p, NoUpdatesDialog) - header_markup = "%s" - self.assertEqual( - p.label_header.get_label(), - header_markup % _("No software updates are available.")) - - def test_error_with_updates(self): - p = UpdateManager._make_available_pane(self.manager, 1, - error_occurred=True) - self.assertIsInstance(p, UpdatesAvailable) - self.assertEqual(p.custom_desc, - _("Some software couldn’t be checked for updates.")) - - -class TestBackendError(unittest.TestCase): - - def setUp(self): - os.environ['UPDATE_MANAGER_FORCE_BACKEND_APTDAEMON'] = '1' - - def clear_environ(): - del os.environ['UPDATE_MANAGER_FORCE_BACKEND_APTDAEMON'] - - self.addCleanup(clear_environ) - - @patch('UpdateManager.backend.InstallBackendAptdaemon.' - 'InstallBackendAptdaemon.update') - def test_backend_error(self, update): - main = mock.MagicMock() - main.datadir = os.path.join(CURDIR, '..', 'data') - - update_backend = get_backend(main, InstallBackend.ACTION_UPDATE) - update.side_effect = lambda: update_backend._action_done( - InstallBackend.ACTION_UPDATE, True, False, "string", "desc") - update_backend.start() - main.start_error.assert_called_once_with(True, "string", "desc") - - -if __name__ == '__main__': - if len(sys.argv) > 1 and sys.argv[1] == "-v": - logging.basicConfig(level=logging.DEBUG) - unittest.main() diff -Nru update-manager-17.10.11/tests/test_update_list.py update-manager-0.156.14.15/tests/test_update_list.py --- update-manager-17.10.11/tests/test_update_list.py 2017-08-07 19:02:33.000000000 +0000 +++ update-manager-0.156.14.15/tests/test_update_list.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,188 +0,0 @@ -#!/usr/bin/python3 -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- - -import os - -import apt -import unittest - -from UpdateManager.Core import UpdateList -from UpdateManager.Core.MyCache import MyCache - -from gi.repository import Gio -from mock import patch, PropertyMock, MagicMock - -CURDIR = os.path.dirname(os.path.abspath(__file__)) - - -class PhasedTestCase(unittest.TestCase): - - def setUp(self): - # mangle the arch - real_arch = apt.apt_pkg.config.find("APT::Architecture") - apt.apt_pkg.config.set("APT::Architecture", "amd64") - self.addCleanup( - lambda: apt.apt_pkg.config.set("APT::Architecture", real_arch)) - - self.aptroot = os.path.join(CURDIR, - "aptroot-update-list-test") - self.cache = MyCache(apt.progress.base.OpProgress(), - rootdir=self.aptroot) - self.cache.open() - self.updates_list = UpdateList.UpdateList(parent=None) - - def assertUpdatesListLen(self, nr): - self.assertEqual(self.updates_list.num_updates, nr) - - def test_phased_percentage_not_included(self): - """ Test that updates above the threshold are not included""" - with patch.object(self.updates_list.random, "randint") as mock_randint: - # threshold is 10 - mock_randint.return_value = 11 - self.updates_list.update(self.cache) - self.assertUpdatesListLen(1) - - def test_phased_percentage_included(self): - """ Test that updates below the threshold are included""" - with patch.object(self.updates_list.random, "randint") as mock_randint: - # threshold is 10 - mock_randint.return_value = 9 - self.updates_list.update(self.cache) - self.assertUpdatesListLen(3) - - def test_second_phased_binary_not_included(self): - """ Test that there is no overlap between the source packages of the - packages being ignored and installed """ - with patch.object(self.updates_list.random, "randint") as mock_randint: - mock_randint.return_value = 11 - self.updates_list.update(self.cache) - ignored_srcs = set([pkg.candidate.source_name for pkg in - self.updates_list.ignored_phased_updates]) - group = self.updates_list.update_groups[0] - install_srcs = set([x.pkg.candidate.source_name for x in group.items]) - self.assertEqual(ignored_srcs, set({'zsh'})) - self.assertEqual(install_srcs, set({'apt'})) - self.assertTrue(len(ignored_srcs & install_srcs) == 0) - - def test_phased_percentage_included_via_force(self): - """ Test that the "always" override config works """ - # set config to force override - apt.apt_pkg.config.set( - self.updates_list.ALWAYS_INCLUDE_PHASED_UPDATES, "1") - self.addCleanup(lambda: apt.apt_pkg.config.set( - self.updates_list.ALWAYS_INCLUDE_PHASED_UPDATES, "0")) - # ensure it's included even if it's above the threshold - with patch.object(self.updates_list.random, "randint") as mock_randint: - mock_randint.return_value = 100 - self.updates_list.update(self.cache) - self.assertUpdatesListLen(3) - - def test_phased_percentage_excluded_via_force(self): - """ Test that the "never" override config works """ - # set config to force override - apt.apt_pkg.config.set( - self.updates_list.NEVER_INCLUDE_PHASED_UPDATES, "1") - self.addCleanup(lambda: apt.apt_pkg.config.set( - self.updates_list.NEVER_INCLUDE_PHASED_UPDATES, "0")) - # ensure it's excluded even if it's below the threshold - with patch.object(self.updates_list.random, "randint") as mock_randint: - mock_randint.return_value = 0 - self.updates_list.update(self.cache) - self.assertUpdatesListLen(1) - - @patch('UpdateManager.Core.UpdateList.UpdateList._is_security_update') - def test_phased_percentage_from_security(self, mock_security): - """ Test that updates from the security node go in""" - # pretend all updates come from security for the sake of this test - mock_security.return_value = True - with patch.object(self.updates_list.random, "randint") as mock_randint: - mock_randint.return_value = 100 - self.updates_list.update(self.cache) - self.assertUpdatesListLen(3) - - -class GroupingTestCase(unittest.TestCase): - # installed_files does not respect aptroot, so we have to patch it - @patch('apt.package.Package.installed_files', new_callable=PropertyMock) - @patch('gi.repository.Gio.DesktopAppInfo.new_from_filename') - def setUp(self, mock_desktop, mock_installed): - # mangle the arch - real_arch = apt.apt_pkg.config.find("APT::Architecture") - apt.apt_pkg.config.set("APT::Architecture", "amd64") - self.addCleanup( - lambda: apt.apt_pkg.config.set("APT::Architecture", real_arch)) - self.aptroot = os.path.join(CURDIR, - "aptroot-grouping-test") - self.cache = MyCache(apt.progress.base.OpProgress(), - rootdir=self.aptroot) - self.cache.open() - mock_installed.__get__ = self.fake_installed_files - mock_desktop.side_effect = self.fake_desktop - self.updates_list = UpdateList.UpdateList(parent=None, dist='lucid') - self.updates_list.update(self.cache) - - def fake_installed_files(self, mock_prop, pkg, pkg_class): - if pkg.name == 'installed-app': - return ['/usr/share/applications/installed-app.desktop'] - elif pkg.name == 'installed-app-with-subitems': - return ['/usr/share/applications/installed-app2.desktop'] - else: - return [] - - def fake_desktop(self, path): - # These can all be the same for our purposes - app = MagicMock() - app.get_filename.return_value = path - app.get_display_name.return_value = 'App ' + os.path.basename(path) - app.get_icon.return_value = Gio.ThemedIcon.new("package") - return app - - def test_app(self): - self.assertGreater(len(self.updates_list.update_groups), 0) - group = self.updates_list.update_groups[0] - self.assertIsInstance(group, UpdateList.UpdateApplicationGroup) - self.assertIsNotNone(group.core_item) - self.assertEqual(group.core_item.pkg.name, 'installed-app') - self.assertListEqual([x.pkg.name for x in group.items], - ['installed-app']) - - def test_app_with_subitems(self): - self.assertGreater(len(self.updates_list.update_groups), 1) - group = self.updates_list.update_groups[1] - self.assertIsInstance(group, UpdateList.UpdateApplicationGroup) - self.assertIsNotNone(group.core_item) - self.assertEqual(group.core_item.pkg.name, - 'installed-app-with-subitems') - self.assertListEqual([x.pkg.name for x in group.items], - ['installed-app-with-subitems', - 'installed-pkg-single-dep']) - - def test_pkg(self): - self.assertGreater(len(self.updates_list.update_groups), 2) - group = self.updates_list.update_groups[2] - self.assertIsInstance(group, UpdateList.UpdatePackageGroup) - self.assertIsNotNone(group.core_item) - self.assertEqual(group.core_item.pkg.name, 'installed-pkg') - self.assertListEqual([x.pkg.name for x in group.items], - ['installed-pkg']) - - def test_pkg_multiple_deps(self): - self.assertEqual(len(self.updates_list.update_groups), 4) - group = self.updates_list.update_groups[3] - self.assertIsInstance(group, UpdateList.UpdatePackageGroup) - self.assertIsNotNone(group.core_item) - self.assertEqual(group.core_item.pkg.name, - 'installed-pkg-multiple-deps') - self.assertListEqual([x.pkg.name for x in group.items], - ['installed-pkg-multiple-deps']) - - def test_security(self): - self.assertEqual(len(self.updates_list.security_groups), 1) - group = self.updates_list.security_groups[0] - self.assertIsInstance(group, UpdateList.UpdateSystemGroup) - self.assertIsNone(group.core_item) - self.assertListEqual([x.pkg.name for x in group.items], ['base-pkg']) - - -if __name__ == "__main__": - unittest.main() diff -Nru update-manager-17.10.11/tests/test_update_origin.py update-manager-0.156.14.15/tests/test_update_origin.py --- update-manager-17.10.11/tests/test_update_origin.py 2017-09-20 19:25:20.000000000 +0000 +++ update-manager-0.156.14.15/tests/test_update_origin.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,7 +1,8 @@ -#!/usr/bin/python3 -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- +#!/usr/bin/python import os +import sys +sys.path.insert(0,"../") import apt import shutil @@ -9,23 +10,15 @@ from UpdateManager.Core.UpdateList import UpdateList from UpdateManager.Core.MyCache import MyCache -CURDIR = os.path.dirname(os.path.abspath(__file__)) - -class TestOriginMatcher(unittest.TestCase): +class testOriginMatcher(unittest.TestCase): def setUp(self): - # mangle the arch - real_arch = apt.apt_pkg.config.find("APT::Architecture") - apt.apt_pkg.config.set("APT::Architecture", "amd64") - self.addCleanup( - lambda: apt.apt_pkg.config.set("APT::Architecture", real_arch)) - - self.aptroot = os.path.join(CURDIR, - "aptroot-update-origin") - self.dpkg_status = open("%s/var/lib/dpkg/status" % self.aptroot, "w") + self.aptroot = os.path.join(os.getcwd(), + "aptroot-update-origin/") + self.dpkg_status = open("%s/var/lib/dpkg/status" % self.aptroot,"w") self.dpkg_status.flush() - self.cache = MyCache(apt.progress.base.OpProgress(), + self.cache = MyCache(apt.progress.base.OpProgress(), rootdir=self.aptroot) self.cache._listsLock = 0 self.cache.update() @@ -46,24 +39,28 @@ except OSError: pass + def testOriginMatcherSimple(self): test_pkgs = set() for pkg in self.cache: if pkg.candidate and pkg.candidate.origins: if [l.archive for l in pkg.candidate.origins - if l.archive == "xenial-security"]: + if l.archive == "lucid-security"]: test_pkgs.add(pkg.name) self.assertTrue(len(test_pkgs) > 0) - ul = UpdateList(None, dist="xenial") + ul = UpdateList(None) + matcher = ul.initMatcher("lucid") for pkgname in test_pkgs: pkg = self.cache[pkgname] - self.assertTrue(ul._is_security_update(pkg), - "pkg '%s' is not in xenial-security" % pkg.name) + self.assertEqual(self.cache.matchPackageOrigin(pkg, matcher), + matcher[("lucid-security","Ubuntu")], + "pkg '%s' is not in lucid-security but in '%s' instead" % (pkg.name, self.cache.matchPackageOrigin(pkg, matcher).description)) + def testOriginMatcherWithVersionInUpdatesAndSecurity(self): # empty dpkg status self.cache.open(apt.progress.base.OpProgress()) - + # find test packages set test_pkgs = set() for pkg in self.cache: @@ -72,69 +69,54 @@ continue # check if the candidate origin is -updates (but not also # -security, often packages are available in both) - if pkg.candidate is not None: - # ensure that the origin is not in -updates and -security + if pkg.candidateOrigin: + # ensure that the origin is not -updates and -security is_in_updates = False is_in_security = False - had_security = False - for v in pkg.candidate.origins: - # test if the package is not in both updates and security - if v.archive == "xenial-updates": + for v in pkg.candidateOrigin: + # test if the package is not in both updates and secu + if v.archive == "lucid-updates": is_in_updates = True - elif v.archive == "xenial-security": + elif v.archive == "lucid-security": is_in_security = True - # ensure that the package actually has any version in -security - for v in pkg.versions: - for (pkgfile, _unused) in v._cand.file_list: - o = apt.package.Origin(pkg, pkgfile) - if o.archive == "xenial-security": - had_security = True - break - if (is_in_updates and - not is_in_security and - had_security and - len(pkg._pkg.version_list) > 2): + if (is_in_updates and + not is_in_security and + len(pkg._pkg.version_list) > 2): test_pkgs.add(pkg.name) - self.assertTrue(len(test_pkgs) > 0, - "no suitable test package found that has a version in " - "both -security and -updates and where -updates is " - "newer") + self.assert_(len(test_pkgs) > 0, + "no suitable test package found that has a version in both -security and -updates and where -updates is newer") # now test if versions in -security are detected - ul = UpdateList(None, dist="xenial") + ul = UpdateList(None) + matcher = ul.initMatcher("lucid") for pkgname in test_pkgs: pkg = self.cache[pkgname] - self.assertTrue(ul._is_security_update(pkg), - "package '%s' from xenial-updates contains also a " - "(not yet installed) security update, but it is " - "not labeled as such" % pkg.name) + self.assertEqual(self.cache.matchPackageOrigin(pkg, matcher), + matcher[("lucid-security","Ubuntu")], + "package '%s' from lucid-updates contains also a (not yet installed) security updates, but it is not labeled as such" % pkg.name) # now check if it marks the version with -update if the -security # version is installed for pkgname in test_pkgs: pkg = self.cache[pkgname] - # FIXME: make this more inteligent (picking the version from + # FIXME: make this more inteligent (picking the versin from # -security sec_ver = pkg._pkg.version_list[1] self.dpkg_status.write("Package: %s\n" - "Status: install ok installed\n" - "Installed-Size: 1\n" - "Version: %s\n" - "Architecture: all\n" - "Description: foo\n\n" - % (pkg.name, sec_ver.ver_str)) + "Status: install ok installed\n" + "Installed-Size: 1\n" + "Version: %s\n" + "Description: foo\n\n" + % (pkg.name, sec_ver.ver_str)) self.dpkg_status.flush() self.cache.open() for pkgname in test_pkgs: pkg = self.cache[pkgname] - self.assertIsNotNone(pkg._pkg.current_ver, - "no package '%s' installed" % pkg.name) - candidate_version = getattr(pkg.candidate, "version", None) - self.assertFalse(ul._is_security_update(pkg), - "package '%s' (%s) from xenial-updates is " - "labelled as a security update even though we " - "have marked this version as installed already" % - (pkg.name, candidate_version)) + self.assert_(pkg._pkg.current_ver != None, + "no package '%s' installed" % pkg.name) + self.assertEqual(self.cache.matchPackageOrigin(pkg, matcher), + matcher[("lucid-updates", "Ubuntu")], + "package '%s' (%s) from lucid-updates is labeld '%s' even though we have marked this version as installed already" % (pkg.name, pkg.candidateVersion, self.cache.matchPackageOrigin(pkg, matcher).description)) if __name__ == "__main__": diff -Nru update-manager-17.10.11/tests/test_upgrade.py update-manager-0.156.14.15/tests/test_upgrade.py --- update-manager-17.10.11/tests/test_upgrade.py 2017-08-07 19:04:10.000000000 +0000 +++ update-manager-0.156.14.15/tests/test_upgrade.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -#!/usr/bin/python3 -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- - -import logging -import mock -import os -import sys -import unittest - -from UpdateManager.Dialogs import DistUpgradeDialog - -CURDIR = os.path.dirname(os.path.abspath(__file__)) - - -class TestUpgrade(unittest.TestCase): - """ - Tests that release upgrading works as expected. - """ - - def make_dialog_args(self): - window_main = mock.MagicMock() - window_main.datadir = os.path.join(CURDIR, '..', 'data') - meta_release = mock.MagicMock() - meta_release.flavor_name = "Ubuntu" - meta_release.current_dist_version = "1" - meta_release.upgradable_to.version = "2" - return (window_main, meta_release) - - def test_pass_args(self): - """ - Confirms that we pass update-manager args down to do-release-upgrade. - """ - window_main, meta_release = self.make_dialog_args() - window_main.options.devel_release = True - window_main.options.use_proposed = True - dlg = DistUpgradeDialog(window_main, meta_release) - with mock.patch("os.execl") as execl: - dlg.upgrade() - execl.assert_called_once_with( - "/bin/sh", "/bin/sh", "-c", - "/usr/bin/pkexec /usr/bin/do-release-upgrade " - "--frontend=DistUpgradeViewGtk3 -d -p") - - -if __name__ == '__main__': - if len(sys.argv) > 1 and sys.argv[1] == "-v": - logging.basicConfig(level=logging.DEBUG) - unittest.main() diff -Nru update-manager-17.10.11/tests/test_utils.py update-manager-0.156.14.15/tests/test_utils.py --- update-manager-17.10.11/tests/test_utils.py 2017-08-31 16:17:31.000000000 +0000 +++ update-manager-0.156.14.15/tests/test_utils.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,123 +1,65 @@ -#!/usr/bin/python3 -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- +#!/usr/bin/python + import logging -import mock +import glob import sys import unittest -from UpdateManager.Core import utils - +sys.path.insert(0, "../") +from UpdateManager.Core.utils import (is_child_of_process_name, + get_string_with_no_auth_from_source_entry, + humanize_size, + estimate_kernel_size_in_boot) class TestUtils(unittest.TestCase): def test_humanize_size(self): # humanize size is a bit funny, it rounds up to kB as the meaningful # unit for users - self.assertEqual(utils.humanize_size(1000), "1 kB") - self.assertEqual(utils.humanize_size(10), "1 kB") - self.assertEqual(utils.humanize_size(1200), "2 kB") + self.assertEqual(humanize_size(1000), "1 kB") + self.assertEqual(humanize_size(10), "1 kB") + self.assertEqual(humanize_size(1200), "2 kB") # but not for MB as well - self.assertEqual(utils.humanize_size(1200 * 1000), "1.2 MB") - self.assertEqual(utils.humanize_size(1478 * 1000), "1.5 MB") + self.assertEqual(humanize_size(1200*1000), "1.2 MB") + self.assertEqual(humanize_size(1478*1000), "1.5 MB") # and we don't go to Gb just yet (as its not really needed # in a upgrade context most of the time - self.assertEqual(utils.humanize_size(1000 * 1000 * 1000), "1000.0 MB") + self.assertEqual(humanize_size(1000*1000*1000), "1000.0 MB") - def test_is_child_of_process_name(self): - data = "1 (systemd) S 0 1 1 0 -1 4194560 255183 71659081 87 18403 \ -816 737 430168 107409 20 0 1 0 2 218931200 1882 18446744073709551615 1 1 0 0 \ -0 0 671173123 4096 1260 0 0 0 17 3 0 0 469245113 0 258124 0 0 0 0 0 0 0 0" - with mock.patch("builtins.open", - mock.mock_open(read_data=data)) as mock_file: - assert open("/proc/1/stat").read() == data - mock_file.assert_called_with("/proc/1/stat") - self.assertTrue(utils.is_child_of_process_name("init") or - utils.is_child_of_process_name("systemd")) - self.assertFalse(utils.is_child_of_process_name("mvo")) + def test_estimate_kernel_size(self): + estimate = estimate_kernel_size_in_boot() + self.assertTrue(estimate > 0) + def test_is_child_of_process_name(self): + self.assertTrue(is_child_of_process_name("init")) + self.assertFalse(is_child_of_process_name("mvo")) + for e in glob.glob("/proc/[0-9]*"): + pid = int(e[6:]) + is_child_of_process_name("gdm", pid) + def test_is_port_listening(self): - from UpdateManager.Core.utils import is_port_already_listening - data = "9: 00000000:0016 00000000:0000 0A 00000000:00000000 \ -00:00000000 00000000 0 0 11366514 1 0000000000000000 100 \ -0 0 10 0" - with mock.patch("builtins.open", - mock.mock_open(read_data=data)) as mock_file: - assert open("/proc/net/tcp").readlines() == [data] - mock_file.assert_called_with("/proc/net/tcp") - self.assertTrue(is_port_already_listening(22)) + from DistUpgrade.utils import is_port_already_listening + self.assertTrue(is_port_already_listening(22)) def test_strip_auth_from_source_entry(self): from aptsources.sourceslist import SourceEntry # entry with PW s = SourceEntry("deb http://user:pass@some-ppa/ ubuntu main") self.assertTrue( - "user" not in utils.get_string_with_no_auth_from_source_entry(s)) + not "user" in get_string_with_no_auth_from_source_entry(s)) self.assertTrue( - "pass" not in utils.get_string_with_no_auth_from_source_entry(s)) - self.assertEqual(utils.get_string_with_no_auth_from_source_entry(s), + not "pass" in get_string_with_no_auth_from_source_entry(s)) + self.assertEqual(get_string_with_no_auth_from_source_entry(s), "deb http://hidden-u:hidden-p@some-ppa/ ubuntu main") # no pw s = SourceEntry("deb http://some-ppa/ ubuntu main") - self.assertEqual(utils.get_string_with_no_auth_from_source_entry(s), + self.assertEqual(get_string_with_no_auth_from_source_entry(s), "deb http://some-ppa/ ubuntu main") - - @mock.patch('UpdateManager.Core.utils._load_meta_pkg_list') - def test_flavor_package_ubuntu_first(self, mock_load): - cache = {'ubuntu-desktop': mock.MagicMock(), - 'other-desktop': mock.MagicMock()} - cache['ubuntu-desktop'].is_installed = True - cache['other-desktop'].is_installed = True - mock_load.return_value = ['other-desktop'] - self.assertEqual(utils.get_ubuntu_flavor_package(cache=cache), - 'ubuntu-desktop') - - @mock.patch('UpdateManager.Core.utils._load_meta_pkg_list') - def test_flavor_package_match(self, mock_load): - cache = {'a': mock.MagicMock(), - 'b': mock.MagicMock(), - 'c': mock.MagicMock()} - cache['a'].is_installed = True - cache['b'].is_installed = True - cache['c'].is_installed = True - mock_load.return_value = ['c', 'a', 'b'] - # Must pick alphabetically first - self.assertEqual(utils.get_ubuntu_flavor_package(cache=cache), 'a') - - def test_flavor_package_default(self): - self.assertEqual(utils.get_ubuntu_flavor_package(cache={}), - 'ubuntu-desktop') - - def test_flavor_default(self): - self.assertEqual(utils.get_ubuntu_flavor(cache={}), 'ubuntu') - - @mock.patch('UpdateManager.Core.utils.get_ubuntu_flavor_package') - def test_flavor_simple(self, mock_package): - mock_package.return_value = 'd' - self.assertEqual(utils.get_ubuntu_flavor(), 'd') - - @mock.patch('UpdateManager.Core.utils.get_ubuntu_flavor_package') - def test_flavor_chop(self, mock_package): - mock_package.return_value = 'd-pkg' - self.assertEqual(utils.get_ubuntu_flavor(), 'd') - - @mock.patch('UpdateManager.Core.utils.get_ubuntu_flavor_package') - def test_flavor_name_desktop(self, mock_package): - mock_package.return_value = 'something-desktop' - self.assertEqual(utils.get_ubuntu_flavor_name(), 'Something') - - @mock.patch('UpdateManager.Core.utils.get_ubuntu_flavor_package') - def test_flavor_name_netbook(self, mock_package): - mock_package.return_value = 'something-netbook' - self.assertEqual(utils.get_ubuntu_flavor_name(), 'Something') - - @mock.patch('UpdateManager.Core.utils.get_ubuntu_flavor_package') - def test_flavor_name_studio(self, mock_package): - mock_package.return_value = 'ubuntustudio-desktop' - self.assertEqual(utils.get_ubuntu_flavor_name(), 'Ubuntu Studio') - + if __name__ == '__main__': if len(sys.argv) > 1 and sys.argv[1] == "-v": logging.basicConfig(level=logging.DEBUG) unittest.main() + diff -Nru update-manager-17.10.11/tests/test_xorg_fix_intrepid.py update-manager-0.156.14.15/tests/test_xorg_fix_intrepid.py --- update-manager-17.10.11/tests/test_xorg_fix_intrepid.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/tests/test_xorg_fix_intrepid.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,46 @@ +#!/usr/bin/python + +import sys +sys.path.insert(0,"../") + +import unittest +import shutil +import re + +from DistUpgrade.xorg_fix_proprietary import comment_out_driver_from_xorg, replace_driver_from_xorg, is_multiseat + +class testOriginMatcher(unittest.TestCase): + ORIG="test-data/xorg.conf.orig" + FGLRX="test-data/xorg.conf.fglrx" + MULTISEAT="test-data/xorg.conf.multiseat" + NEW="test-data/xorg.conf" + + + def testSimple(self): + shutil.copy(self.ORIG, self.NEW) + replace_driver_from_xorg("fglrx", "ati", self.NEW) + self.assert_(open(self.ORIG).read() == open(self.NEW).read()) + def testRemove(self): + shutil.copy(self.FGLRX, self.NEW) + self.assert_("fglrx" in open(self.NEW).read()) + replace_driver_from_xorg("fglrx", "ati", self.NEW) + self.assert_(not "fglrx" in open(self.NEW).read()) + def testMultiseat(self): + self.assert_(is_multiseat(self.ORIG) == False) + self.assert_(is_multiseat(self.FGLRX) == False) + self.assert_(is_multiseat(self.MULTISEAT) == True) + def testComment(self): + shutil.copy(self.FGLRX, self.NEW) + comment_out_driver_from_xorg("fglrx",self.NEW) + for line in open(self.NEW): + if re.match('^#.*Driver.*fglrx',line): + logging.info("commented out line found") + break + else: + raise Exception("commenting the line did *not* work") + + +if __name__ == "__main__": + import logging + logging.basicConfig(level=logging.DEBUG) + unittest.main() diff -Nru update-manager-17.10.11/TODO update-manager-0.156.14.15/TODO --- update-manager-17.10.11/TODO 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/TODO 2017-12-23 05:00:38.000000000 +0000 @@ -10,6 +10,8 @@ the childs) Misc: +- have a common error dialog readymade and rib out all those + GtkMessageDialogs - add download size to treeview - add /etc/apt/software-properties.d dir where the user can install matchers and templates diff -Nru update-manager-17.10.11/ubuntu-support-status update-manager-0.156.14.15/ubuntu-support-status --- update-manager-17.10.11/ubuntu-support-status 2017-07-12 21:28:54.000000000 +0000 +++ update-manager-0.156.14.15/ubuntu-support-status 2017-12-23 05:00:38.000000000 +0000 @@ -1,48 +1,21 @@ -#!/usr/bin/python3 - -from __future__ import print_function +#!/usr/bin/python import apt -import csv import locale import datetime -import operator import os import subprocess -import time import gettext -import sys -from apt.utils import ( - get_maintenance_end_date, - ) +from apt.utils import * +from gettext import gettext as _ from optparse import OptionParser -from UpdateManager.Core.utils import twrap, get_dist - -CODENAME = get_dist() - -def get_release_date(dist): - distro_data = '/usr/share/distro-info/ubuntu.csv' - release_date = None - try: - with open(distro_data) as csvfile: - csv_reader = csv.DictReader(csvfile) - for row in csv_reader: - if row['series'] == CODENAME: - release_date = row['release'] - break - except FileNotFoundError: - return None - - if not release_date: - return None +from UpdateManager.Core.utils import twrap - time_t = time.mktime(time.strptime(release_date, '%Y-%m-%d')) - release_date = datetime.datetime.fromtimestamp(time_t) - return release_date +CODENAME = subprocess.Popen(["lsb_release","-c","-s"], + stdout=subprocess.PIPE).communicate()[0].strip() - -def get_maintenance_status(supported_tag, release_date): +def get_maintenance_status(cache, pkgname, supported_tag): if supported_tag.endswith("y"): supported_for_n_month = 12*int(supported_tag.rstrip("y")) elif supported_tag.endswith("m"): @@ -50,16 +23,33 @@ else: raise Exception("Unsupported tag '%s'" % supported_tag) + # try to figure out the support dates of the release and make + # sure to look only for stuff in "Ubuntu" and "distro_codename" + # (to exclude stuff in ubuntu-updates for the support time + # calculation because the "Release" file time for that gets + # updated regularly) + releasef = get_release_filename_for_pkg(cache, pkgname, + "Ubuntu", CODENAME) + if not releasef: + releasef = get_release_filename_for_pkg(cache, pkgname, + "Ubuntu", CODENAME + "-updates") + + time_t = get_release_date_from_release_file(releasef) + # check the release date and show support information + # based on this + if not time_t: + raise Exception("No date tag found") + release_date = datetime.datetime.fromtimestamp(time_t) now = datetime.datetime.now() - + # mvo: we do not define the end date very precisely # currently this is why it will just display a end # range (support_end_year, support_end_month) = get_maintenance_end_date(release_date, supported_for_n_month) support_end_month_str = locale.nl_langinfo(getattr(locale,"MON_%d" % support_end_month)) # check if the support has ended - support_ended = (now.year > support_end_year or - (now.year == support_end_year and now.month > support_end_month)) + support_ended = (now.year >= support_end_year and + now.month > support_end_month) # build dict for the argument string d = { 'support_tag' : supported_tag, @@ -67,20 +57,12 @@ 'support_end_year' : support_end_year } if support_ended: - return (False, "%(support_end_month_str)s %(support_end_year)s (%(support_tag)s)" % d) + (False, "%(support_end_month_str)s %(support_end_year)s (%(support_tag)s)" % d) return (True, "%(support_end_month_str)s %(support_end_year)s (%(support_tag)s)" % d) - + if __name__ == "__main__": - #FIXME: Workaround a bug in optparser which doesn't handle unicode/str - # correctly, see http://bugs.python.org/issue4391 - # Should be resolved by Python3 gettext.bindtextdomain("update-manager", "/usr/share/locale") gettext.textdomain("update-manager") - translation = gettext.translation("update-manager", fallback=True) - if sys.version >= '3': - _ = translation.gettext - else: - _ = translation.ugettext try: locale.setlocale(locale.LC_ALL, "") @@ -88,18 +70,22 @@ pass parser = OptionParser() + #FIXME: Workaround a bug in optparser which doesn't handle unicode/str + # correctly, see http://bugs.python.org/issue4391 + # Should be resolved by Python3 + enc = locale.getpreferredencoding() parser.add_option("", "--show-unsupported", action="store_true", default=False, - help=_("Show unsupported packages on this machine")) + help=_("Show unsupported packages on this machine").decode(enc)) parser.add_option("", "--show-supported", action="store_true", default=False, - help=_("Show supported packages on this machine")) + help=_("Show supported packages on this machine").decode(enc)) parser.add_option("", "--show-all", action="store_true", default=False, - help=_("Show all packages with their status")) + help=_("Show all packages with their status").decode(enc)) parser.add_option("", "--list", action="store_true", default=False, - help=_("Show all packages in a list")) + help=_("Show all packages in a list").decode(enc)) (options, args) = parser.parse_args() @@ -118,56 +104,46 @@ # total count, for statistics total = 0 - release_date = None - - if CODENAME != 'unknown distribution': - release_date = get_release_date(CODENAME) - - if not release_date: - print ("No valid Ubuntu release found, support status unknown") - sys.exit(1) - - # analyze - with apt.Cache() as cache: - for pkg in cache: - if pkg.is_installed: - total += 1 - if not pkg.candidate or not pkg.candidate.downloadable: - no_candidate.add(pkg.name) - continue - if not "Supported" in pkg.candidate.record: - unsupported.add(pkg.name) - continue - # get support time - support_tag = pkg.candidate.record["Supported"] - (still_supported, support_str) = get_maintenance_status( - support_tag, release_date) - if not still_supported: - unsupported.add(pkg.name) - continue - supported_time_for_pkgname[pkg.name] = support_tag - if not support_str in supported_by_time: - supported_by_time[support_str] = set() - supported_by_time[support_str].add(pkg.name) + # analyize + cache = apt.Cache() + for pkg in cache: + if pkg.is_installed: + total += 1 + if not pkg.candidate or not pkg.candidate.downloadable: + no_candidate.add(pkg.name) + continue + if not "Supported" in pkg.candidate.record: + unsupported.add(pkg.name) + continue + # get support time + support_tag = pkg.candidate.record["Supported"] + (still_supported, support_str) = get_maintenance_status(cache, pkg.name, support_tag) + if not still_supported: + unsupported.add(pkg.name) + continue + supported_time_for_pkgname[pkg.name] = support_tag + if not support_str in supported_by_time: + supported_by_time[support_str] = set() + supported_by_time[support_str].add(pkg.name) # output - print(_("Support status summary of '%s':") % os.uname()[1]) - print() - for (time, tset) in supported_by_time.items(): - print(_("You have %(num)s packages (%(percent).1f%%) supported until %(time)s") % { + print _("Support status summary of '%s':") % os.uname()[1] + print + for (time, tset) in supported_by_time.iteritems(): + print _("You have %(num)s packages (%(percent).1f%%) supported until %(time)s") % { 'num' : len(tset), 'percent' : len(tset) * 100.0 / total, - 'time' : time}) - print() + 'time' : time} + print - print(_("You have %(num)s packages (%(percent).1f%%) that can not/no-longer be downloaded") % { + print _("You have %(num)s packages (%(percent).1f%%) that can not/no-longer be downloaded") % { 'num' : len(no_candidate), - 'percent' : len(no_candidate) * 100.0 / total}) - print(_("You have %(num)s packages (%(percent).1f%%) that are unsupported") % { + 'percent' : len(no_candidate) * 100.0 / total} + print _("You have %(num)s packages (%(percent).1f%%) that are unsupported") % { 'num' : len(unsupported), - 'percent' : len(unsupported) * 100.0 / total}) + 'percent' : len(unsupported) * 100.0 / total} - # provide the HWE support status info as well + # provide the support status info as well if os.path.exists("/usr/bin/hwe-support-status"): print("") subprocess.call(["/usr/bin/hwe-support-status"]) @@ -175,28 +151,28 @@ if not (options.show_unsupported or options.show_supported or options.show_all): - print() - print(_("Run with --show-unsupported, --show-supported or --show-all to see more details")) + print + print _("Run with --show-unsupported, --show-supported or --show-all to see more details") if options.show_unsupported or options.show_all: - print() - print(_("No longer downloadable:")) - print(twrap(" ".join(sorted(no_candidate)))) + print + print _("No longer downloadable:") + print twrap(" ".join(sorted(no_candidate))) - print(_("Unsupported: ")) - print(twrap(" ".join(sorted(unsupported)))) + print _("Unsupported: ") + print twrap(" ".join(sorted(unsupported))) if options.show_supported or options.show_all: - for (time, tset) in supported_by_time.items(): - print(_("Supported until %s:") % time) - print(twrap(" ".join(sorted(tset)))) + for (time, tset) in supported_by_time.iteritems(): + print _("Supported until %s:") % time + print twrap(" ".join(sorted(tset))) if options.list: pkg = max(cache, key=lambda pkg: pkg.is_installed and len(pkg.name)) field_width = len(pkg.name) format_str = "%-"+str(field_width)+"s %s" - for pkg in sorted(cache, key=operator.attrgetter("name")): + for pkg in sorted(cache, cmp=lambda a,b: cmp(a.name, b.name)): if pkg.is_installed: support = supported_time_for_pkgname.get(pkg.name, _("Unsupported")) - print(format_str % (pkg.name, support)) + print format_str % (pkg.name, support) diff -Nru update-manager-17.10.11/update-manager update-manager-0.156.14.15/update-manager --- update-manager-17.10.11/update-manager 2017-07-12 21:57:36.000000000 +0000 +++ update-manager-0.156.14.15/update-manager 2017-12-23 05:00:38.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/python # update-manager.in - easy updating application # # Copyright (c) 2004-2008 Canonical @@ -23,41 +23,27 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA -from __future__ import print_function - +from gi.repository import Gtk import gi gi.require_version("Gtk", "3.0") -from gi.repository import Gtk -from gi.repository import Gio -import logging import os import sys -import time from UpdateManager.UpdateManager import UpdateManager -from UpdateManager.Core.utils import init_proxy -from UpdateManager.UpdateManagerVersion import VERSION +from DistUpgrade.DistUpgradeVersion import VERSION import locale import gettext +from gettext import gettext as _ from optparse import OptionParser if __name__ == "__main__": - Gtk.init(sys.argv) - Gtk.Window.set_default_icon_name("system-software-update") - - #FIXME: Workaround a bug in optparser which doesn't handle unicode/str - # correctly, see http://bugs.python.org/issue4391 - # Should be resolved by Python3 + Gtk.init_check(sys.argv) + gettext.bindtextdomain("update-manager", "/usr/share/locale") gettext.textdomain("update-manager") - translation = gettext.translation("update-manager", fallback=True) - if sys.version >= '3': - _ = translation.gettext - else: - _ = translation.ugettext try: locale.setlocale(locale.LC_ALL, "") @@ -66,34 +52,43 @@ # Begin parsing of options parser = OptionParser() + #FIXME: Workaround a bug in optparser which doesn't handle unicode/str + # correctly, see http://bugs.python.org/issue4391 + # Should be resolved by Python3 + enc = locale.getpreferredencoding() parser.add_option ("-V", "--version", action="store_true", dest="show_version", default=False, - help=_("Show version and exit")) + help=_("Show version and exit").decode(enc)) parser.add_option ("--data-dir", "", default="/usr/share/update-manager/", - help=_("Directory that contains the data files")) + help=_("Directory that contains the data files").decode(enc)) parser.add_option ("-c", "--check-dist-upgrades", action="store_true", dest="check_dist_upgrades", default=False, - help=_("Check if a new Ubuntu release is available")) + help=_("Check if a new Ubuntu release is available").decode(enc)) parser.add_option ("-d", "--devel-release", action="store_true", dest="devel_release", default=False, - help=_("If using the latest supported release, " - "upgrade to the development release")) + help=_("Check if upgrading to the latest devel release " + "is possible").decode(enc)) parser.add_option ("-p","--proposed", action="store_true", dest="use_proposed", default=False, - help=_("Upgrade using the latest proposed version of the release upgrader")) + help=_("Upgrade using the latest proposed version of the release upgrader").decode(enc)) parser.add_option ("--no-focus-on-map", action="store_true", dest="no_focus_on_map", default=False, # TRANSLATORS: this describes the "focus-on-map" gtk # property that controls if a new window takes the # input focus control when it is displayed for the # first time (see also the gtk devhelp page) - help=_("Do not focus on map when starting")) + help=_("Do not focus on map when starting").decode(enc)) + parser.add_option ("--dist-upgrade", action="store_true", + dest="dist_upgrade", default=False, + help=_("Try to run a dist-upgrade").decode(enc)) parser.add_option ("--no-update", action="store_true", dest="no_update", default=False, - help=_("Do not check for updates when starting")) - parser.add_option ("", "--debug", action="store_true", default=False, - help=_("Show debug messages")) + help=_("Do not check for updates when starting").decode(enc)) + parser.add_option ("-s","--sandbox", action="store_true", default=False, + # TRANSLATORS: aufs is the name of the filesystem + # that is used to create the overlay + help=_("Test upgrade with a sandbox aufs overlay").decode(enc)) (options, args) = parser.parse_args() @@ -101,18 +96,21 @@ #data_dir="/tmp/xxx/share/update-manager/" data_dir = os.path.normpath(options.data_dir)+"/" - if options.debug: - logging.basicConfig(level=logging.DEBUG) - if options.show_version: - print("%s: version %s" % (os.path.basename(sys.argv[0]), VERSION)) + print "%s: version %s" % (os.path.basename(sys.argv[0]), VERSION) sys.exit(0) - # keep track when we run (for update-notifier) - settings = Gio.Settings.new("com.ubuntu.update-manager") - settings.set_int64("launch-time", int(time.time())) - init_proxy(settings) - - app = UpdateManager(data_dir, options) - app.start_update() - Gtk.main() + if options.dist_upgrade == True: + #import logging + #logging.basicConfig(level=logging.DEBUG) + from DistUpgrade.DistUpgradeViewGtk3 import DistUpgradeViewGtk3 + from DistUpgrade.DistUpgradeController import DistUpgradeController + # FIXME: Having a "partial upgrade" view here would make it possible + # to get rid of the ugly hideStep() stuff + view = DistUpgradeViewGtk3(data_dir) + view.label_title.set_markup("%s" % _("Running partial upgrade")) + controller = DistUpgradeController(view, datadir=data_dir) + controller.doPartialUpgrade() + else: + app = UpdateManager(data_dir, options) + app.main(options) diff -Nru update-manager-17.10.11/UpdateManager/backend/__init__.py update-manager-0.156.14.15/UpdateManager/backend/__init__.py --- update-manager-17.10.11/UpdateManager/backend/__init__.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/backend/__init__.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,102 +1,61 @@ #!/usr/bin/env python -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- - +# -*- coding: utf-8 -*- """Integration of package managers into UpdateManager""" # (c) 2005-2009 Canonical, GPL -from __future__ import absolute_import +import os +import os.path -from gi.repository import GLib +from gi.repository import GObject -import os -from UpdateManager.Core.utils import inhibit_sleep -from UpdateManager.Dialogs import Dialog +class InstallBackend(GObject.GObject): + """The abstract backend that can install/remove packages""" + __gsignals__ = {"action-done": (GObject.SignalFlags.RUN_FIRST, + None, + (GObject.TYPE_INT, # action id + GObject.TYPE_BOOLEAN, # authorized + GObject.TYPE_BOOLEAN) # success + ), + } -class InstallBackend(Dialog): - ACTION_UPDATE = 0 - ACTION_INSTALL = 1 - - def __init__(self, window_main, action): - Dialog.__init__(self, window_main) - self.action = action - self.sleep_cookie = None - - def start(self): - os.environ["APT_LISTCHANGES_FRONTEND"] = "none" - - # Do not suspend during the update process - self.sleep_cookie = inhibit_sleep() - - if self.action == self.ACTION_INSTALL: - # Get the packages which should be installed and update - pkgs_install = [] - pkgs_upgrade = [] - for pkg in self.window_main.cache: - if pkg.marked_install: - pkgname = pkg.name - if pkg.is_auto_installed: - pkgname += "#auto" - pkgs_install.append(pkgname) - elif pkg.marked_upgrade: - pkgs_upgrade.append(pkg.name) - self.commit(pkgs_install, pkgs_upgrade) - else: - self.update() + (INSTALL, UPDATE) = range(2) - def update(self): - """Run a update to refresh the package list""" - raise NotImplemented + def __init__(self, window_main): + """init backend + takes a gtk main window as parameter + """ + GObject.GObject.__init__(self) + self.window_main = window_main - def commit(self, pkgs_install, pkgs_upgrade): + def commit(self, pkgs_install, pkgs_upgrade, close_on_done): """Commit the cache changes """ raise NotImplemented - def _action_done(self, action, authorized, success, error_string, - error_desc): - - # If the progress dialog should be closed automatically afterwards - #settings = Gio.Settings.new("com.ubuntu.update-manager") - #close_after_install = settings.get_boolean( - # "autoclose-install-window") - # FIXME: confirm with mpt whether this should still be a setting - #close_after_install = False - - if action == self.ACTION_INSTALL: - if success: - self.window_main.start_available() - elif error_string: - self.window_main.start_error(False, error_string, error_desc) - else: - # exit gracefuly, we can't just exit as this will trigger - # a crash if system.exit() is called in a exception handler - GLib.timeout_add(1, self.window_main.exit) - else: - if error_string: - self.window_main.start_error(True, error_string, error_desc) - else: - is_cancelled_update = not success - self.window_main.start_available(is_cancelled_update) + def update(self): + """Run a update to refresh the package list""" + raise NotImplemented def get_backend(*args, **kwargs): """Select and return a package manager backend.""" # try aptdaemon if (os.path.exists("/usr/sbin/aptd") and - "UPDATE_MANAGER_FORCE_BACKEND_SYNAPTIC" not in os.environ): + not "UPDATE_MANAGER_FORCE_BACKEND_SYNAPTIC" in os.environ): # check if the gtkwidgets are installed as well try: - from .InstallBackendAptdaemon import InstallBackendAptdaemon + from InstallBackendAptdaemon import InstallBackendAptdaemon return InstallBackendAptdaemon(*args, **kwargs) except ImportError: import logging logging.exception("importing aptdaemon") # try synaptic if (os.path.exists("/usr/sbin/synaptic") and - "UPDATE_MANAGER_FORCE_BACKEND_APTDAEMON" not in os.environ): - from .InstallBackendSynaptic import InstallBackendSynaptic + not "UPDATE_MANAGER_FORCE_BACKEND_APTDAEMON" in os.environ): + from InstallBackendSynaptic import InstallBackendSynaptic return InstallBackendSynaptic(*args, **kwargs) # nothing found, raise raise Exception("No working backend found, please try installing " "synaptic or aptdaemon") + diff -Nru update-manager-17.10.11/UpdateManager/backend/InstallBackendAptdaemon.py update-manager-0.156.14.15/UpdateManager/backend/InstallBackendAptdaemon.py --- update-manager-17.10.11/UpdateManager/backend/InstallBackendAptdaemon.py 2017-08-07 20:33:49.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/backend/InstallBackendAptdaemon.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,58 +1,26 @@ #!/usr/bin/env python -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# (c) 2005-2012 Canonical, GPL -# (C) 2008-2009 Sebastian Heinlein - -from __future__ import print_function - -from gi.repository import Gtk +# -*- coding: utf-8 -*- +# (c) 2005-2009 Canonical, GPL from aptdaemon import client, errors from defer import inline_callbacks -from aptdaemon.gtk3widgets import (AptCancelButton, - AptConfigFileConflictDialog, - AptDetailsExpander, - AptMediumRequiredDialog, - AptProgressBar) -from aptdaemon.enums import (EXIT_SUCCESS, - EXIT_FAILED, - STATUS_COMMITTING, - get_error_description_from_enum, - get_error_string_from_enum, - get_status_string_from_enum) +from aptdaemon.gtk3widgets import AptProgressDialog +from aptdaemon.enums import EXIT_SUCCESS from UpdateManager.backend import InstallBackend from UpdateManager.UnitySupport import UnitySupport -from UpdateManager.Dialogs import BuilderDialog - -from gettext import gettext as _ import apt import dbus -import os +class InstallBackendAptdaemon(InstallBackend): -class InstallBackendAptdaemon(InstallBackend, BuilderDialog): """Makes use of aptdaemon to refresh the cache and to install updates.""" - def __init__(self, window_main, action): - InstallBackend.__init__(self, window_main, action) - ui_path = os.path.join(window_main.datadir, - "gtkbuilder/UpdateProgress.ui") - BuilderDialog.__init__(self, window_main, ui_path, - "pane_update_progress") - + def __init__(self, window_main): + InstallBackend.__init__(self, window_main) self.client = client.AptClient() self.unity = UnitySupport() - self._expanded_size = None - self.button_cancel = None - - def close(self): - if self.button_cancel: - self.button_cancel.clicked() - return True - else: - return False @inline_callbacks def update(self): @@ -63,20 +31,15 @@ pass try: trans = yield self.client.update_cache(defer=True) - yield self._show_transaction(trans, self.ACTION_UPDATE, - _("Checking for updates…"), False) + yield self._run_in_dialog(trans, self.UPDATE) except errors.NotAuthorizedError: - self._action_done(self.ACTION_UPDATE, - authorized=False, success=False, - error_string=None, error_desc=None) - except Exception as e: - self._action_done(self.ACTION_UPDATE, - authorized=True, success=False, - error_string=None, error_desc=None) + self.emit("action-done", self.UPDATE, False, False) + except: + self.emit("action-done", self.UPDATE, True, False) raise @inline_callbacks - def commit(self, pkgs_install, pkgs_upgrade): + def commit(self, pkgs_install, pkgs_upgrade, close_on_done): """Commit a list of package adds and removes""" try: apt.apt_pkg.pkgsystem_unlock() @@ -85,163 +48,42 @@ try: reinstall = remove = purge = downgrade = [] trans = yield self.client.commit_packages( - pkgs_install, reinstall, remove, purge, pkgs_upgrade, + pkgs_install, reinstall, remove, purge, pkgs_upgrade, downgrade, defer=True) trans.connect("progress-changed", self._on_progress_changed) - yield self._show_transaction(trans, self.ACTION_INSTALL, - _("Installing updates…"), True) + yield self._run_in_dialog(trans, self.INSTALL) except errors.NotAuthorizedError as e: - self._action_done(self.ACTION_INSTALL, - authorized=False, success=False, - error_string=None, error_desc=None) + self.emit("action-done", self.INSTALL, False, False) except dbus.DBusException as e: - #print(e, e.get_dbus_name()) + #print e, e.get_dbus_name() if e.get_dbus_name() != "org.freedesktop.DBus.Error.NoReply": raise - self._action_done(self.ACTION_INSTALL, - authorized=False, success=False, - error_string=None, error_desc=None) + self.emit("action-done", self.INSTALL, False, False) except Exception as e: - self._action_done(self.ACTION_INSTALL, - authorized=True, success=False, - error_string=None, error_desc=None) + self.emit("action-done", self.INSTALL, True, False) raise def _on_progress_changed(self, trans, progress): - #print("_on_progress_changed", progress) + #print "_on_progress_changed", progress self.unity.set_progress(progress) - def _on_details_changed(self, trans, details, label_details): - label_details.set_label(details) - - def _on_status_changed(self, trans, status, label_details, expander): - label_details.set_label(get_status_string_from_enum(status)) - # Also resize the window if we switch from download details to - # the terminal window - if (status == STATUS_COMMITTING and expander and - expander.terminal.get_visible()): - self._resize_to_show_details(expander) - @inline_callbacks - def _show_transaction(self, trans, action, header, show_details): - self.label_header.set_label(header) + def _run_in_dialog(self, trans, action): + dia = AptProgressDialog(trans, parent=self.window_main) + dia.set_icon_name("system-software-update") + dia.connect("finished", self._on_finished, action) + yield dia.run() - progressbar = AptProgressBar(trans) - progressbar.show() - self.progressbar_slot.add(progressbar) - - self.button_cancel = AptCancelButton(trans) - if action == self.ACTION_UPDATE: - self.button_cancel.set_label(Gtk.STOCK_STOP) - self.button_cancel.show() - self.button_cancel_slot.add(self.button_cancel) - - if show_details: - expander = AptDetailsExpander(trans) - expander.set_vexpand(True) - expander.set_hexpand(True) - expander.show_all() - expander.connect("notify::expanded", self._on_expanded) - self.expander_slot.add(expander) - self.expander_slot.show() - else: - expander = None - - trans.connect("status-details-changed", self._on_details_changed, - self.label_details) - trans.connect("status-changed", self._on_status_changed, - self.label_details, expander) - trans.connect("finished", self._on_finished, action) - trans.connect("medium-required", self._on_medium_required) - trans.connect("config-file-conflict", self._on_config_file_conflict) - - yield trans.set_debconf_frontend("gnome") - yield trans.run() - - def _on_expanded(self, expander, param): - # Make the dialog resizable if the expander is expanded - # try to restore a previous size - if not expander.get_expanded(): - self._expanded_size = (expander.terminal.get_visible(), - self.window_main.get_size()) - self.window_main.end_user_resizable() - elif self._expanded_size: - term_visible, (stored_width, stored_height) = self._expanded_size - # Check if the stored size was for the download details or - # the terminal widget - if term_visible != expander.terminal.get_visible(): - # The stored size was for the download details, so we need - # get a new size for the terminal widget - self._resize_to_show_details(expander) - else: - self.window_main.begin_user_resizable(stored_width, - stored_height) - else: - self._resize_to_show_details(expander) - - def _resize_to_show_details(self, expander): - """Resize the window to show the expanded details. - - Unfortunately the expander only expands to the preferred size of the - child widget (e.g showing all 80x24 chars of the Vte terminal) if - the window is rendered the first time and the terminal is also visible. - If the expander is expanded afterwards the window won't change its - size anymore. So we have to do this manually. See LP#840942 - """ - if expander.get_expanded(): - win_width, win_height = self.window_main.get_size() - exp_width = expander.get_allocation().width - exp_height = expander.get_allocation().height - if expander.terminal.get_visible(): - terminal_width = expander.terminal.get_char_width() * 80 - terminal_height = expander.terminal.get_char_height() * 24 - new_width = terminal_width - exp_width + win_width - new_height = terminal_height - exp_height + win_height - else: - new_width = win_width + 100 - new_height = win_height + 200 - self.window_main.begin_user_resizable(new_width, new_height) - - def _on_medium_required(self, transaction, medium, drive): - dialog = AptMediumRequiredDialog(medium, drive, self.window_main) - res = dialog.run() - dialog.hide() - if res == Gtk.ResponseType.OK: - transaction.provide_medium(medium) - else: - transaction.cancel() - - def _on_config_file_conflict(self, transaction, old, new): - dialog = AptConfigFileConflictDialog(old, new, self.window_main) - res = dialog.run() + def _on_finished(self, dialog, action): dialog.hide() - if res == Gtk.ResponseType.YES: - transaction.resolve_config_file_conflict(old, "replace") - else: - transaction.resolve_config_file_conflict(old, "keep") - - def _on_finished(self, trans, status, action): - error_string = None - error_desc = None - if status == EXIT_FAILED: - error_string = get_error_string_from_enum(trans.error.code) - error_desc = get_error_description_from_enum(trans.error.code) # tell unity to hide the progress again self.unity.set_progress(-1) - is_success = (status == EXIT_SUCCESS) - self._action_done(action, - authorized=True, success=is_success, - error_string=error_string, error_desc=error_desc) - + self.emit("action-done", action, + True, dialog._transaction.exit == EXIT_SUCCESS) if __name__ == "__main__": - import mock - options = mock.Mock() - data_dir = "/usr/share/update-manager" - - from UpdateManager.UpdateManager import UpdateManager - app = UpdateManager(data_dir, options) + b = InstallBackendAptdaemon(None) + b.commit(["2vcard"], [], False) - b = InstallBackendAptdaemon(app, None) - b.commit(["2vcard"], []) + from gi.repository import Gtk Gtk.main() diff -Nru update-manager-17.10.11/UpdateManager/backend/InstallBackendSynaptic.py update-manager-0.156.14.15/UpdateManager/backend/InstallBackendSynaptic.py --- update-manager-17.10.11/UpdateManager/backend/InstallBackendSynaptic.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/backend/InstallBackendSynaptic.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,5 +1,5 @@ #!/usr/bin/env python -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- +# -*- coding: utf-8 -*- # (c) 2005-2007 Canonical, GPL import apt_pkg @@ -7,13 +7,7 @@ import tempfile from gettext import gettext as _ -import gi -gi.require_version("Gtk", "3.0") from gi.repository import GObject -# Extra GdkX11 import for pygobject bug #673396 -# https://bugzilla.gnome.org/show_bug.cgi?id=673396 -from gi.repository import GdkX11 -GdkX11 # pyflakes from UpdateManager.backend import InstallBackend @@ -21,32 +15,6 @@ class InstallBackendSynaptic(InstallBackend): """ Install backend based on synaptic """ - def update(self): - opt = ["--update-at-startup"] - tempf = None - self._run_synaptic(self.ACTION_UPDATE, opt, tempf) - - def commit(self, pkgs_install, pkgs_upgrade, close_on_done=False): - # close when update was successful (its ok to use a Synaptic:: - # option here, it will not get auto-saved, because synaptic does - # not save options in non-interactive mode) - opt = [] - if close_on_done: - opt.append("-o") - opt.append("Synaptic::closeZvt=true") - # custom progress strings - opt.append("--progress-str") - opt.append("%s" % _("Please wait, this can take some time.")) - opt.append("--finish-str") - opt.append("%s" % _("Update is complete")) - tempf = tempfile.NamedTemporaryFile(mode="w+") - for pkg_name in pkgs_install + pkgs_upgrade: - tempf.write("%s\tinstall\n" % pkg_name) - opt.append("--set-selections-file") - opt.append("%s" % tempf.name) - tempf.flush() - self._run_synaptic(self.ACTION_INSTALL, opt, tempf) - def _run_synaptic(self, action, opt, tempf): """Execute synaptic.""" try: @@ -58,23 +26,44 @@ xid = win.get_xid() except AttributeError: xid = 0 - cmd = ["/usr/bin/pkexec", "/usr/sbin/synaptic", "--hide-main-window", + cmd = ["/usr/bin/gksu", + "--desktop", "/usr/share/applications/update-manager.desktop", + "--", "/usr/sbin/synaptic", "--hide-main-window", "--non-interactive", "--parent-window-id", - "%s" % xid] + "%s" % xid ] cmd.extend(opt) flags = GObject.SPAWN_DO_NOT_REAP_CHILD (pid, stdin, stdout, stderr) = GObject.spawn_async(cmd, flags=flags) - # Keep a reference to the data tuple passed to - # GObject.child_watch_add to avoid attempts to destroy it without a - # thread context: https://bugs.launchpad.net/bugs/724687 - self.child_data = (action, tempf) - GObject.child_watch_add(pid, self._on_synaptic_exit, self.child_data) + GObject.child_watch_add(pid, self._on_synaptic_exit, (action, tempf)) def _on_synaptic_exit(self, pid, condition, data): action, tempf = data if tempf: tempf.close() - self._action_done(action, - authorized=True, - success=os.WEXITSTATUS(condition) == 0, - error_string=None, error_desc=None) + self.emit("action-done", action, True, os.WEXITSTATUS(condition) == 0) + + def update(self): + opt = ["--update-at-startup"] + tempf = None + self._run_synaptic(self.UPDATE, opt, tempf) + + def commit(self, pkgs_install, pkgs_upgrade, close_on_done): + # close when update was successful (its ok to use a Synaptic:: + # option here, it will not get auto-saved, because synaptic does + # not save options in non-interactive mode) + opt = [] + if close_on_done: + opt.append("-o") + opt.append("Synaptic::closeZvt=true") + # custom progress strings + opt.append("--progress-str") + opt.append("%s" % _("Please wait, this can take some time.")) + opt.append("--finish-str") + opt.append("%s" % _("Update is complete")) + tempf = tempfile.NamedTemporaryFile() + for pkg_name in pkgs_install + pkgs_upgrade: + tempf.write("%s\tinstall\n" % pkg_name) + opt.append("--set-selections-file") + opt.append("%s" % tempf.name) + tempf.flush() + self._run_synaptic(self.INSTALL, opt, tempf) diff -Nru update-manager-17.10.11/UpdateManager/ChangelogViewer.py update-manager-0.156.14.15/UpdateManager/ChangelogViewer.py --- update-manager-17.10.11/UpdateManager/ChangelogViewer.py 2017-08-07 19:22:59.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/ChangelogViewer.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,44 +1,38 @@ -# ChangelogViewer.py -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# +# ReleaseNotesViewer.py +# # Copyright (c) 2006 Sebastian Heinlein # 2007 Canonical -# +# # Author: Sebastian Heinlein # Michael Vogt # -# This modul provides an inheritance of the Gtk.TextView that is +# This modul provides an inheritance of the Gtk.TextView that is # aware of http URLs and allows to open them in a browser. # It is based on the pygtk-demo "hypertext". -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA -from __future__ import absolute_import - -import gi -gi.require_version("Gtk", "3.0") from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GObject from gi.repository import Pango from gettext import gettext as _ -from DistUpgrade.ReleaseNotesViewer import open_url - +from ReleaseNotesViewer import open_url class ChangelogViewer(Gtk.TextView): def __init__(self, changelog=None): @@ -55,8 +49,6 @@ self.set_right_margin(4) self.set_left_margin(4) self.set_pixels_above_lines(4) - # fill the area - self.set_vexpand(True) self.buffer = Gtk.TextBuffer() self.set_buffer(self.buffer) self.connect("button-press-event", self.button_press_event) @@ -65,36 +57,32 @@ #self.buffer.connect("changed", self.search_links) self.buffer.connect_after("insert-text", self.on_insert_text) # search for links in the changelog and make them clickable - if changelog is not None: + if changelog != None: self.buffer.set_text(changelog) - + def create_context_menu(self, url): - """Create the context menu to be displayed when links are right - clicked""" + """Create the context menu to be displayed when links are right clicked""" self.menu = Gtk.Menu() - + # create menu items item_grey_link = Gtk.MenuItem() item_grey_link.set_label(url) - item_grey_link.connect("activate", self.handle_context_menu, "open", - url) + item_grey_link.connect("activate", self.handle_context_menu, "open", url) item_seperator = Gtk.MenuItem() item_open_link = Gtk.MenuItem() item_open_link.set_label(_("Open Link in Browser")) - item_open_link.connect("activate", self.handle_context_menu, "open", - url) + item_open_link.connect("activate", self.handle_context_menu, "open", url) item_copy_link = Gtk.MenuItem() item_copy_link.set_label(_("Copy Link to Clipboard")) - item_copy_link.connect("activate", self.handle_context_menu, "copy", - url) - + item_copy_link.connect("activate", self.handle_context_menu, "copy", url) + # add menu items self.menu.add(item_grey_link) self.menu.add(item_seperator) self.menu.add(item_open_link) self.menu.add(item_copy_link) self.menu.show_all() - + def handle_context_menu(self, menuitem, action, url): """Handle activate event for the links' context menu""" if action == "open": @@ -105,7 +93,7 @@ #cb = Gtk.Clipboard() #cb.set_text(url) display = Gdk.Display.get_default() - selection = Gdk.Atom.intern("CLIPBOARD", False) + selection = Gdk.Atom.intern ("CLIPBOARD", False) cb = Gtk.Clipboard.get_for_display(display, selection) cb.set_text(url, -1) cb.store() @@ -114,56 +102,53 @@ """Apply the tag that marks links to the specified buffer selection""" tags = start.get_tags() for tag in tags: - url = getattr(tag, "url", None) + url = tag.get_data("url") if url != "": return tag = self.buffer.create_tag(None, foreground="blue", underline=Pango.Underline.SINGLE) - tag.url = url - self.buffer.apply_tag(tag, start, end) + tag.set_data("url", url) + self.buffer.apply_tag(tag , start, end) - def on_insert_text(self, buffer, iter_end, content, *args): - """Search for http URLs in newly inserted text + def on_insert_text(self, buffer, iter_end, text, *args): + """Search for http URLs in newly inserted text and tag them accordingly""" # some convenient urls MALONE = "https://launchpad.net/bugs/" DEBIAN = "http://bugs.debian.org/" - CVE = "http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-" + CVE = "http://cve.mitre.org/cgi-bin/cvename.cgi?name=" # some convinient end-markers - ws = [" ", "\t", "\n"] - brak = [")", "]", ">"] - punct = [",", "!", ":"] - dot = ["."] + punct + ws = [" ","\t","\n"] + brak = [")","]",">"] + punct = [",","!",":"] + dot = ["."]+punct dot_cr = [".\n"] # search items are start-str, list-of-end-strs, url-prefix # a lot of this search is "TEH SUCK"(tm) because of limitations # in iter.forward_search() # - i.e. no insensitive searching, no regexp - search_items = [("http://", ws + brak + punct + dot_cr, "http://"), - ("LP#", ws + brak + dot, MALONE), - ("lp#", ws + brak + dot, MALONE), - ("LP: #", ws + brak + dot, MALONE), - ("lp: #", ws + brak + dot, MALONE), - ("LP:#", ws + brak + dot, MALONE), - ("lp:#", ws + brak + dot, MALONE), - ("Malone: #", ws + brak + dot, MALONE), - ("Malone:#", ws + brak + dot, MALONE), - ("Ubuntu: #", ws + brak + dot, MALONE), - ("Ubuntu:#", ws + brak + dot, MALONE), - ("Closes: #", ws + brak + dot, DEBIAN), - ("Closes:#", ws + brak + dot, DEBIAN), - ("closes:#", ws + brak + dot, DEBIAN), - ("closes: #", ws + brak + dot, DEBIAN), - ("CVE-", ws + brak + dot, CVE), - ] + search_items = [ ("http://", ws+brak+punct+dot_cr, "http://"), + ("LP#", ws+brak+dot, MALONE), + ("LP: #", ws+brak+dot, MALONE), + ("lp: #", ws+brak+dot, MALONE), + ("LP:#", ws+brak+dot, MALONE), + ("Malone: #", ws+brak+dot, MALONE), + ("Malone:#", ws+brak+dot, MALONE), + ("Ubuntu: #", ws+brak+dot, MALONE), + ("Ubuntu:#", ws+brak+dot, MALONE), + ("Closes: #",ws+brak+dot, DEBIAN), + ("Closes:#",ws+brak+dot, DEBIAN), + ("closes:#",ws+brak+dot, DEBIAN), + ("closes: #",ws+brak+dot, DEBIAN), + ("CVE-", ws+brak+dot, CVE), + ] + # init + iter = buffer.get_iter_at_offset(iter_end.get_offset() - len(text)) # search for the next match in the buffer for (start_str, end_list, url_prefix) in search_items: - # init - iter = buffer.get_iter_at_offset(iter_end.get_offset() - - len(content)) while True: ret = iter.forward_search(start_str, Gtk.TextSearchFlags.VISIBLE_ONLY, @@ -178,13 +163,13 @@ while True: # extend the selection to the complete search item if match_tmp.forward_char(): - text = match_end.get_text(match_tmp) + text = match_end.get_text(match_tmp) if text in end_list: break # move one char futher to get two char # end-markers (and back later) LP: #396393 match_tmp.forward_char() - text = match_end.get_text(match_tmp) + text = match_end.get_text(match_tmp) if text in end_list: break match_tmp.backward_char() @@ -217,24 +202,19 @@ # get the iter at the mouse position (x, y) = self.window_to_buffer_coords(Gtk.TextWindowType.WIDGET, int(event.x), int(event.y)) + iter = self.get_iter_at_location(x, y) + # call open_url or menu.popup if an URL is assigned to the iter - try: - iter = self.get_iter_at_location(x, y) - tags = iter.get_tags() - except AttributeError: - # GTK > 3.20 added a return type to this function - (over_text, iter) = self.get_iter_at_location(x, y) - tags = iter.get_tags() - + tags = iter.get_tags() for tag in tags: - if hasattr(tag, "url"): - if event.button == 1: - open_url(tag.url) + url = tag.get_data("url") + if url != None: + if event.button == 1: + open_url(url) break if event.button == 3: - self.create_context_menu(tag.url) - self.menu.popup(None, None, None, None, event.button, - event.time) + self.create_context_menu(url) + self.menu.popup(None, None, None, None, event.button, event.time) return True def motion_notify_event(self, text_view, event): @@ -245,15 +225,14 @@ self.check_hovering(x, y) self.get_window(Gtk.TextWindowType.TEXT).get_pointer() return False - + def visibility_notify_event(self, text_view, event): """callback if the widgets gets visible (e.g. moves to the foreground) that calls the check_hovering method with the mouse position coordinates""" - window = text_view.get_window(Gtk.TextWindowType.TEXT) - (screen, wx, wy, mod) = window.get_pointer() - (bx, by) = text_view.window_to_buffer_coords(Gtk.TextWindowType.WIDGET, - wx, wy) + (screen, wx, wy, mod) = text_view.get_window(Gtk.TextWindowType.TEXT).get_pointer() + (bx, by) = text_view.window_to_buffer_coords(Gtk.TextWindowType.WIDGET, wx, + wy) self.check_hovering(bx, by) return False @@ -262,31 +241,27 @@ a hand cursor""" _hovering = False # get the iter at the mouse position - try: - iter = self.get_iter_at_location(x, y) - tags = iter.get_tags() - except AttributeError: - # GTK > 3.20 added a return type to this function - (over_text, iter) = self.get_iter_at_location(x, y) - tags = iter.get_tags() - + iter = self.get_iter_at_location(x, y) + # set _hovering if the iter has the tag "url" + tags = iter.get_tags() for tag in tags: - if hasattr(tag, "url"): + url = tag.get_data("url") + if url != None: _hovering = True break # change the global hovering state - if _hovering != self.hovering or self.first: + if _hovering != self.hovering or self.first == True: self.first = False self.hovering = _hovering # Set the appropriate cursur icon if self.hovering: - self.get_window(Gtk.TextWindowType.TEXT).set_cursor( - Gdk.Cursor.new(Gdk.CursorType.HAND2)) + self.get_window(Gtk.TextWindowType.TEXT).\ + set_cursor(Gdk.Cursor.new(Gdk.CursorType.HAND2)) else: - self.get_window(Gtk.TextWindowType.TEXT).set_cursor( - Gdk.Cursor.new(Gdk.CursorType.LEFT_PTR)) + self.get_window(Gtk.TextWindowType.TEXT).\ + set_cursor(Gdk.Cursor.new(Gdk.CursorType.LEFT_PTR)) if __name__ == "__main__": diff -Nru update-manager-17.10.11/UpdateManager/check-meta-release.py update-manager-0.156.14.15/UpdateManager/check-meta-release.py --- update-manager-17.10.11/UpdateManager/check-meta-release.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/check-meta-release.py 2017-12-23 05:00:38.000000000 +0000 @@ -2,11 +2,11 @@ # # Author: Jonathan Riddell # -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -17,16 +17,14 @@ # Checks for new releases, run by Adept -from __future__ import absolute_import, print_function - -from .Core.MetaRelease import MetaReleaseCore +from Core.MetaRelease import MetaReleaseCore import time metaRelease = MetaReleaseCore(False, False) while metaRelease.downloading: time.sleep(1) -print("no_longer_supported:" + str(metaRelease.no_longer_supported)) +print "no_longer_supported:" + str(metaRelease.no_longer_supported) if metaRelease.new_dist is None: - print("new_dist_available:None") + print "new_dist_available:None" else: - print("new_dist_available:" + str(metaRelease.new_dist.version)) + print "new_dist_available:" + str(metaRelease.new_dist.version) diff -Nru update-manager-17.10.11/UpdateManager/Core/AlertWatcher.py update-manager-0.156.14.15/UpdateManager/Core/AlertWatcher.py --- update-manager-17.10.11/UpdateManager/Core/AlertWatcher.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/Core/AlertWatcher.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,36 +1,32 @@ -# AlertWatcher.py -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- +# AlertWatcher.py # # Copyright (c) 2010 Mohamed Amine IL Idrissi -# +# # Author: Mohamed Amine IL Idrissi -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA -from __future__ import absolute_import - from gi.repository import GObject import dbus from dbus.mainloop.glib import DBusGMainLoop - class AlertWatcher(GObject.GObject): """ a class that checks for alerts and reports them, like a battery or network warning """ - + __gsignals__ = {"network-alert": (GObject.SignalFlags.RUN_FIRST, None, (GObject.TYPE_INT,)), @@ -39,28 +35,25 @@ (GObject.TYPE_BOOLEAN,)), "network-3g-alert": (GObject.SignalFlags.RUN_FIRST, None, - (GObject.TYPE_BOOLEAN, - GObject.TYPE_BOOLEAN,)), + (GObject.TYPE_BOOLEAN, + GObject.TYPE_BOOLEAN,)), } - + def __init__(self): GObject.GObject.__init__(self) DBusGMainLoop(set_as_default=True) self.bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM) - # make it always connected if NM isn't available - self.network_state = 3 - + self.network_state = 3 # make it always connected if NM isn't available + def check_alert_state(self): try: obj = self.bus.get_object("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager") - obj.connect_to_signal( - "StateChanged", - self._on_network_state_changed, - dbus_interface="org.freedesktop.NetworkManager") + obj.connect_to_signal("StateChanged", + self._on_network_state_changed, + dbus_interface="org.freedesktop.NetworkManager") interface = dbus.Interface(obj, "org.freedesktop.DBus.Properties") - self.network_state = interface.Get( - "org.freedesktop.NetworkManager", "State") + self.network_state = interface.Get("org.freedesktop.NetworkManager", "State") self._network_alert(self.network_state) # power obj = self.bus.get_object('org.freedesktop.UPower', @@ -78,7 +71,7 @@ self._update_3g_state() def _update_3g_state(self): - from .roam import NetworkManagerHelper + from roam import NetworkManagerHelper nm = NetworkManagerHelper() on_3g = nm.is_active_connection_gsm_or_cdma() is_roaming = nm.is_active_connection_gsm_or_cdma_roaming() @@ -86,14 +79,16 @@ def _network_3g_alert(self, on_3g, is_roaming): self.emit("network-3g-alert", on_3g, is_roaming) - + def _network_alert(self, state): self.network_state = state self.emit("network-alert", state) - + def _power_changed(self): - obj = self.bus.get_object("org.freedesktop.UPower", - "/org/freedesktop/UPower") + obj = self.bus.get_object("org.freedesktop.UPower", \ + "/org/freedesktop/UPower") interface = dbus.Interface(obj, "org.freedesktop.DBus.Properties") on_battery = interface.Get("org.freedesktop.UPower", "OnBattery") self.emit("battery-alert", on_battery) + + diff -Nru update-manager-17.10.11/UpdateManager/Core/DistUpgradeFetcherCore.py update-manager-0.156.14.15/UpdateManager/Core/DistUpgradeFetcherCore.py --- update-manager-17.10.11/UpdateManager/Core/DistUpgradeFetcherCore.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/Core/DistUpgradeFetcherCore.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,292 @@ +# DistUpgradeFetcherCore.py +# +# Copyright (c) 2006 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +from string import Template +import os +import apt_pkg +import logging +import tarfile +import tempfile +import shutil +import sys +import GnuPGInterface +from gettext import gettext as _ +from aptsources.sourceslist import SourcesList + +from utils import get_dist, url_downloadable, country_mirror + +class DistUpgradeFetcherCore(object): + " base class (without GUI) for the upgrade fetcher " + + DEFAULT_MIRROR="http://archive.ubuntu.com/ubuntu" + DEFAULT_COMPONENT="main" + DEBUG = "DEBUG_UPDATE_MANAGER" in os.environ + + def __init__(self, new_dist, progress): + self.new_dist = new_dist + self.current_dist_name = get_dist() + self._progress = progress + # options to pass to the release upgrader when it is run + self.run_options = [] + + def _debug(self, msg): + " helper to show debug information " + if self.DEBUG: + sys.stderr.write(msg+"\n") + + def showReleaseNotes(self): + return True + + def error(self, summary, message): + """ dummy implementation for error display, should be overwriten + by subclasses that want to more fancy method + """ + print summary + print message + return False + + def authenticate(self): + if self.new_dist.upgradeToolSig: + f = self.tmpdir+"/"+os.path.basename(self.new_dist.upgradeTool) + sig = self.tmpdir+"/"+os.path.basename(self.new_dist.upgradeToolSig) + print _("authenticate '%(file)s' against '%(signature)s' ") % { + 'file' : os.path.basename(f), + 'signature' : os.path.basename(sig)} + if self.gpgauthenticate(f, sig): + return True + return False + + def gpgauthenticate(self, file, signature, + keyring='/etc/apt/trusted.gpg'): + """ authenticated a file against a given signature, if no keyring + is given use the apt default keyring + """ + gpg = GnuPGInterface.GnuPG() + gpg.options.extra_args = ['--no-options', + '--homedir',self.tmpdir, + '--no-default-keyring', + '--ignore-time-conflict', + '--keyring', keyring] + proc = gpg.run(['--verify', signature, file], + create_fhs=['status','logger','stderr']) + gpgres = proc.handles['status'].read() + try: + proc.wait() + except IOError,e: + # gnupg returned a problem (non-zero exit) + print "exception from gpg: %s" % e + print "Debug information: " + print proc.handles['status'].read() + print proc.handles['stderr'].read() + print proc.handles['logger'].read() + return False + if "VALIDSIG" in gpgres: + return True + print "invalid result from gpg:" + print gpgres + return False + + def extractDistUpgrader(self): + # extract the tarbal + fname = os.path.join(self.tmpdir,os.path.basename(self.uri)) + print _("extracting '%s'") % os.path.basename(fname) + if not os.path.exists(fname): + return False + try: + tar = tarfile.open(self.tmpdir+"/"+os.path.basename(self.uri),"r") + for tarinfo in tar: + tar.extract(tarinfo) + tar.close() + except tarfile.ReadError, e: + logging.error("failed to open tarfile (%s)" % e) + return False + return True + + def verifyDistUprader(self): + # FIXME: check a internal dependency file to make sure + # that the script will run correctly + + # see if we have a script file that we can run + self.script = script = "%s/%s" % (self.tmpdir, self.new_dist.name) + if not os.path.exists(script): + return self.error(_("Could not run the upgrade tool"), + _("Could not run the upgrade tool") + ". " + _("This is most likely a bug in the upgrade tool. " + "Please report it as a bug using the command 'ubuntu-bug update-manager'.")) + return True + + def mirror_from_sources_list(self, uri, default_uri): + """ + try to figure what the mirror is from current sources.list + + do this by looing for matching DEFAULT_COMPONENT, current dist + in sources.list and then doing a http HEAD/ftp size request + to see if the uri is available on this server + """ + self._debug("mirror_from_sources_list: %s" % self.current_dist_name) + sources = SourcesList(withMatcher=False) + seen = set() + for e in sources.list: + if e.disabled or e.invalid or not e.type == "deb": + continue + # check if we probed this mirror already + if e.uri in seen: + continue + # we are using the main mirror already, so we are fine + if (e.uri.startswith(default_uri) and + e.dist == self.current_dist_name and + self.DEFAULT_COMPONENT in e.comps): + return uri + elif (e.dist == self.current_dist_name and + "main" in e.comps): + mirror_uri = e.uri+uri[len(default_uri):] + if url_downloadable(mirror_uri, self._debug): + return mirror_uri + seen.add(e.uri) + self._debug("no mirror found") + return "" + + def _expandUri(self, uri): + """ + expand the uri so that it uses a mirror if the url starts + with a well know string (like archive.ubuntu.com) + """ + # try to guess the mirror from the sources.list + if uri.startswith(self.DEFAULT_MIRROR): + self._debug("trying to find suitable mirror") + new_uri = self.mirror_from_sources_list(uri, self.DEFAULT_MIRROR) + if new_uri: + return new_uri + # if that fails, use old method + uri_template = Template(uri) + m = country_mirror() + new_uri = uri_template.safe_substitute(countrymirror=m) + # be paranoid and check if the given uri is really downloadable + try: + if not url_downloadable(new_uri, self._debug): + raise Exception("failed to download %s" % new_uri) + except Exception,e: + self._debug("url '%s' could not be downloaded" % e) + # else fallback to main server + new_uri = uri_template.safe_substitute(countrymirror='') + return new_uri + + def fetchDistUpgrader(self): + " download the tarball with the upgrade script " + self.tmpdir = tmpdir = tempfile.mkdtemp(prefix="update-manager-") + os.chdir(tmpdir) + logging.debug("using tmpdir: '%s'" % tmpdir) + # turn debugging on here (if required) + if self.DEBUG > 0: + apt_pkg.Config.Set("Debug::Acquire::http","1") + apt_pkg.Config.Set("Debug::Acquire::ftp","1") + #os.listdir(tmpdir) + fetcher = apt_pkg.Acquire(self._progress) + if self.new_dist.upgradeToolSig != None: + uri = self._expandUri(self.new_dist.upgradeToolSig) + af1 = apt_pkg.AcquireFile(fetcher, + uri, + descr=_("Upgrade tool signature")) + # reference it here to shut pyflakes up + af1 + if self.new_dist.upgradeTool != None: + self.uri = self._expandUri(self.new_dist.upgradeTool) + af2 = apt_pkg.AcquireFile(fetcher, + self.uri, + descr=_("Upgrade tool")) + # reference it here to shut pyflakes up + af2 + result = fetcher.run() + if result != fetcher.RESULT_CONTINUE: + logging.warn("fetch result != continue (%s)" % result) + return False + # check that both files are really there and non-null + for f in [os.path.basename(self.new_dist.upgradeToolSig), + os.path.basename(self.new_dist.upgradeTool)]: + if not (os.path.exists(f) and os.path.getsize(f) > 0): + logging.warn("file '%s' missing" % f) + return False + return True + return False + + def runDistUpgrader(self): + args = [self.script]+self.run_options + if os.getuid() != 0: + os.execv("/usr/bin/sudo",["sudo"]+args) + else: + os.execv(self.script,args) + + def cleanup(self): + # cleanup + os.chdir("..") + # del tmpdir + shutil.rmtree(self.tmpdir) + + def run(self): + # see if we have release notes + if not self.showReleaseNotes(): + return + if not self.fetchDistUpgrader(): + self.error(_("Failed to fetch"), + _("Fetching the upgrade failed. There may be a network " + "problem. ")) + return + if not self.authenticate(): + self.error(_("Authentication failed"), + _("Authenticating the upgrade failed. There may be a problem " + "with the network or with the server. ")) + self.cleanup() + return + if not self.extractDistUpgrader(): + self.error(_("Failed to extract"), + _("Extracting the upgrade failed. There may be a problem " + "with the network or with the server. ")) + + return + if not self.verifyDistUprader(): + self.error(_("Verification failed"), + _("Verifying the upgrade failed. There may be a problem " + "with the network or with the server. ")) + self.cleanup() + return + try: + # check if we can execute, if we run it via sudo we will + # not know otherwise, sudo/gksu will not raise a exception + if not os.access(self.script, os.X_OK): + ex = OSError("Can not execute '%s'" % self.script) + ex.errno = 13 + raise ex + self.runDistUpgrader() + except OSError, e: + if e.errno == 13: + self.error(_("Can not run the upgrade"), + _("This usually is caused by a system where /tmp " + "is mounted noexec. Please remount without " + "noexec and run the upgrade again.")) + return False + else: + self.error(_("Can not run the upgrade"), + _("The error message is '%s'.") % e.strerror) + return True + +if __name__ == "__main__": + d = DistUpgradeFetcherCore(None,None) +# print d.authenticate('/tmp/Release','/tmp/Release.gpg') + print "got mirror: '%s'" % d.mirror_from_sources_list("http://archive.ubuntu.com/ubuntu/dists/intrepid-proposed/main/dist-upgrader-all/0.93.34/intrepid.tar.gz", "http://archive.ubuntu.com/ubuntu") diff -Nru update-manager-17.10.11/UpdateManager/Core/LivePatchSocket.py update-manager-0.156.14.15/UpdateManager/Core/LivePatchSocket.py --- update-manager-17.10.11/UpdateManager/Core/LivePatchSocket.py 2017-08-31 16:17:31.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/Core/LivePatchSocket.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,118 +0,0 @@ -# LivePatchSocket.py -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# Copyright (c) 2017 Canonical -# -# Author: Andrea Azzarone -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA - -from gi.repository import GLib -import http.client -import socket -import threading -import yaml - -HOST_NAME = '/var/snap/canonical-livepatch/current/livepatchd.sock' - - -class UHTTPConnection(http.client.HTTPConnection): - - def __init__(self, path): - http.client.HTTPConnection.__init__(self, 'localhost') - self.path = path - - def connect(self): - sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - sock.connect(self.path) - self.sock = sock - - -class LivePatchSocket(object): - - def __init__(self, http_conn=None): - if http_conn is None: - self.conn = UHTTPConnection(HOST_NAME) - else: - self.conn = http_conn - - def get_status(self, on_done): - - def do_call(): - try: - self.conn.request('GET', '/status?verbose=True') - r = self.conn.getresponse() - active = r.status == 200 - data = yaml.safe_load(r.read()) - except Exception as e: - active = False - data = dict() - check_state = LivePatchSocket.get_check_state(data) - patch_state = LivePatchSocket.get_patch_state(data) - fixes = LivePatchSocket.get_fixes(data) - GLib.idle_add(lambda: on_done( - active, check_state, patch_state, fixes)) - - thread = threading.Thread(target=do_call) - thread.start() - - @staticmethod - def get_check_state(data): - try: - status = data['status'] - kernel = next((k for k in status if k['running']), None) - return kernel['livepatch']['checkState'] - except Exception as e: - return 'check-failed' - - @staticmethod - def get_patch_state(data): - try: - status = data['status'] - kernel = next((k for k in status if k['running']), None) - return kernel['livepatch']['patchState'] - except Exception as e: - return 'unknown' - - @staticmethod - def get_fixes(data): - try: - status = data['status'] - kernel = next((k for k in status if k['running']), None) - fixes = kernel['livepatch']['fixes'] - return [LivePatchFix(f) - for f in fixes.replace('* ', '').split('\n') if len(f) > 0] - except Exception as e: - return list() - - -class LivePatchFix(object): - - def __init__(self, text): - patched_pattern = ' (unpatched)' - self.patched = text.find(patched_pattern) == -1 - self.name = text.replace(patched_pattern, '') - - def __eq__(self, other): - if isinstance(other, LivePatchFix): - return self.name == other.name and self.patched == other.patched - return NotImplemented - - def __ne__(self, other): - result = self.__eq__(other) - if result is NotImplemented: - return result - return not result diff -Nru update-manager-17.10.11/UpdateManager/Core/MetaRelease.py update-manager-0.156.14.15/UpdateManager/Core/MetaRelease.py --- update-manager-17.10.11/UpdateManager/Core/MetaRelease.py 2017-08-07 20:32:10.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/Core/MetaRelease.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,58 +1,37 @@ -# MetaRelease.py -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# +# MetaRelease.py +# # Copyright (c) 2004,2005 Canonical -# +# # Author: Michael Vogt -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA -from __future__ import absolute_import, print_function - -import apt import apt_pkg -try: - import configparser -except ImportError: - import ConfigParser as configparser -try: - from http.client import BadStatusLine -except ImportError: - from httplib import BadStatusLine +import ConfigParser +import httplib import logging -import email.utils +import rfc822 import os import socket import sys import time -import threading -try: - from urllib.parse import quote - from urllib.request import Request, urlopen - from urllib.error import HTTPError, URLError -except ImportError: - from urllib2 import HTTPError, Request, URLError, urlopen, quote - -from .utils import (get_lang, get_dist, get_dist_version, get_ubuntu_flavor, - get_ubuntu_flavor_name) - - -class MetaReleaseParseError(Exception): - pass +import thread +import urllib2 +from utils import get_lang, get_dist, get_ubuntu_flavor class Dist(object): def __init__(self, name, version, date, supported): @@ -67,11 +46,10 @@ # the server may report that the upgrade is broken currently self.upgrade_broken = None - class MetaReleaseCore(object): """ - A MetaReleaseCore object abstracts the list of released - distributions. + A MetaReleaseCore object astracts the list of released + distributions. """ DEBUG = "DEBUG_UPDATE_MANAGER" in os.environ @@ -80,44 +58,34 @@ CONF = "/etc/update-manager/release-upgrades" CONF_METARELEASE = "/etc/update-manager/meta-release" - def __init__(self, - useDevelopmentRelease=False, + def __init__(self, + useDevelopmentRelease=False, useProposed=False, forceLTS=False, - forceDownload=False, - cache=None): - self._debug("MetaRelease.__init__() useDevel=%s useProposed=%s" % - (useDevelopmentRelease, useProposed)) + forceDownload=False): + self._debug("MetaRelease.__init__() useDevel=%s useProposed=%s" % (useDevelopmentRelease, useProposed)) # force download instead of sending if-modified-since self.forceDownload = forceDownload - self.useDevelopmentRelease = useDevelopmentRelease # information about the available dists - self.downloaded = threading.Event() - self.upgradable_to = None + self.downloading = True self.new_dist = None - if cache is None: - cache = apt.Cache() - self.flavor = get_ubuntu_flavor(cache=cache) - self.flavor_name = get_ubuntu_flavor_name(cache=cache) self.current_dist_name = get_dist() - self.current_dist_version = get_dist_version() self.no_longer_supported = None # default (if the conf file is missing) - base_uri = "http://changelogs.ubuntu.com/" - self.METARELEASE_URI = base_uri + "meta-release" - self.METARELEASE_URI_LTS = base_uri + "meta-release-lts" + self.METARELEASE_URI = "http://changelogs.ubuntu.com/meta-release" + self.METARELEASE_URI_LTS = "http://changelogs.ubuntu.com/meta-release-lts" self.METARELEASE_URI_UNSTABLE_POSTFIX = "-development" self.METARELEASE_URI_PROPOSED_POSTFIX = "-development" # check the meta-release config first - parser = configparser.ConfigParser() + parser = ConfigParser.ConfigParser() if os.path.exists(self.CONF_METARELEASE): try: parser.read(self.CONF_METARELEASE) - except configparser.Error as e: + except ConfigParser.Error, e: sys.stderr.write("ERROR: failed to read '%s':\n%s" % ( - self.CONF_METARELEASE, e)) + self.CONF_METARELEASE, e)) return # make changing the metarelease file and the location # for the files easy @@ -129,25 +97,25 @@ "URI_PROPOSED_POSTFIX"]: if parser.has_option(sec, k): self._debug("%s: %s " % (self.CONF_METARELEASE, - parser.get(sec, k))) + parser.get(sec,k))) setattr(self, "%s_%s" % (sec, k), parser.get(sec, k)) # check the config file first to figure if we want lts upgrades only - parser = configparser.ConfigParser() + parser = ConfigParser.ConfigParser() if os.path.exists(self.CONF): try: parser.read(self.CONF) - except configparser.Error as e: + except ConfigParser.Error, e: sys.stderr.write("ERROR: failed to read '%s':\n%s" % ( - self.CONF, e)) + self.CONF, e)) return # now check which specific url to use - if parser.has_option("DEFAULT", "Prompt"): - type = parser.get("DEFAULT", "Prompt").lower() + if parser.has_option("DEFAULT","Prompt"): + type = parser.get("DEFAULT","Prompt").lower() if (type == "never" or type == "no"): # nothing to do for this object # FIXME: what about no longer supported? - self.downloaded.set() + self.downloading = False return elif type == "lts": self.METARELEASE_URI = self.METARELEASE_URI_LTS @@ -166,52 +134,33 @@ self._debug("_buildMetaReleaseFile failed") return # we start the download thread here and we have a timeout - threading.Thread(target=self.download).start() - #threading.Thread(target=self.check).start() + thread.start_new_thread(self.download, ()) + #t=thread.start_new_thread(self.check, ()) def _buildMetaReleaseFile(self): # build the metarelease_file name - self.METARELEASE_FILE = os.path.join( - "/var/lib/update-manager/", - os.path.basename(self.METARELEASE_URI)) + self.METARELEASE_FILE = os.path.join("/var/lib/update-manager/", + os.path.basename(self.METARELEASE_URI)) # check if we can write to the global location, if not, # write to homedir try: - open(self.METARELEASE_FILE, "a").close() - except IOError as e: + open(self.METARELEASE_FILE,"a") + except IOError, e: cache_dir = os.getenv( "XDG_CACHE_HOME", os.path.expanduser("~/.cache")) - # Take special care when creating this directory; ~/.cache needs - # to be created with mode 0700, but the other directories do - # not. - cache_parent_dir = os.path.split(cache_dir)[0] - if not os.path.exists(cache_parent_dir): - try: - os.makedirs(cache_parent_dir) - except OSError as e: - sys.stderr.write("mkdir() failed: '%s'" % e) - return False - if not os.path.exists(cache_dir): - try: - os.mkdir(cache_dir, 0o700) - except OSError as e: - sys.stderr.write("mkdir() failed: '%s'" % e) - return False path = os.path.join(cache_dir, 'update-manager-core') if not os.path.exists(path): - try: + try: os.mkdir(path) - except OSError as e: + except OSError, e: sys.stderr.write("mkdir() failed: '%s'" % e) - return False - self.METARELEASE_FILE = os.path.join( - path, - os.path.basename(self.METARELEASE_URI)) + return False + self.METARELEASE_FILE = os.path.join(path,os.path.basename(self.METARELEASE_URI)) # if it is empty, remove it to avoid I-M-S hits on empty file try: if os.path.getsize(self.METARELEASE_FILE) == 0: os.unlink(self.METARELEASE_FILE) - except Exception as e: + except Exception, e: pass return True @@ -220,7 +169,6 @@ supported """ self.no_longer_supported = dist - def new_dist_available(self, dist): """ virtual function that is called when a new distro release is available @@ -236,49 +184,37 @@ # parse the metarelease_information file index_tag = apt_pkg.TagFile(self.metarelease_information) - try: - while index_tag.step(): - for required_key in ("Dist", "Version", "Supported", "Date"): - if required_key not in index_tag.section: - raise MetaReleaseParseError( - "Required key '%s' missing" % required_key) + step_result = index_tag.step() + while step_result: + if "Dist" in index_tag.section: name = index_tag.section["Dist"] self._debug("found distro name: '%s'" % name) rawdate = index_tag.section["Date"] - parseddate = list(email.utils.parsedate(rawdate)) - parseddate[8] = 0 # assume no DST - date = time.mktime(tuple(parseddate)) + date = time.mktime(rfc822.parsedate(rawdate)) supported = int(index_tag.section["Supported"]) version = index_tag.section["Version"] # add the information to a new date object - dist = Dist(name, version, date, supported) + dist = Dist(name, version, date,supported) if "ReleaseNotes" in index_tag.section: dist.releaseNotesURI = index_tag.section["ReleaseNotes"] lang = get_lang() if lang: dist.releaseNotesURI += "?lang=%s" % lang if "ReleaseNotesHtml" in index_tag.section: - dist.releaseNotesHtmlUri = index_tag.section[ - "ReleaseNotesHtml"] + dist.releaseNotesHtmlUri = index_tag.section["ReleaseNotesHtml"] query = self._get_release_notes_uri_query_string(dist) if query: dist.releaseNotesHtmlUri += query if "UpgradeTool" in index_tag.section: - dist.upgradeTool = index_tag.section["UpgradeTool"] + dist.upgradeTool = index_tag.section["UpgradeTool"] if "UpgradeToolSignature" in index_tag.section: - dist.upgradeToolSig = index_tag.section[ - "UpgradeToolSignature"] + dist.upgradeToolSig = index_tag.section["UpgradeToolSignature"] if "UpgradeBroken" in index_tag.section: dist.upgrade_broken = index_tag.section["UpgradeBroken"] dists.append(dist) if name == current_dist_name: - current_dist = dist - except apt_pkg.Error: - raise MetaReleaseParseError("Unable to parse %s" % - self.METARELEASE_URI) - - self.metarelease_information.close() - self.metarelease_information = None + current_dist = dist + step_result = index_tag.step() # first check if the current runing distro is in the meta-release # information. if not, we assume that we run on something not @@ -287,27 +223,19 @@ self._debug("current dist not found in meta-release file\n") return False - # then see what we can upgrade to + # then see what we can upgrade to upgradable_to = "" for dist in dists: if dist.date > current_dist.date: - # Only offer to upgrade to an unsupported release if running - # with useDevelopmentRelease, this way one can upgrade from an - # LTS release to the next supported non-LTS release e.g. from - # 14.04 to 15.04. - if not dist.supported and not self.useDevelopmentRelease: - continue upgradable_to = dist self._debug("new dist: %s" % upgradable_to) break - # only warn if unsupported and a new dist is available (because + # only warn if unsupported and a new dist is available (because # the development version is also unsupported) if upgradable_to != "" and not current_dist.supported: - self.upgradable_to = upgradable_to self.dist_no_longer_supported(current_dist) if upgradable_to != "": - self.upgradable_to = upgradable_to self.new_dist_available(upgradable_to) # parsing done and sucessfully @@ -318,63 +246,58 @@ def download(self): self._debug("MetaRelease.download()") lastmodified = 0 - req = Request(self.METARELEASE_URI) + req = urllib2.Request(self.METARELEASE_URI) # make sure that we always get the latest file (#107716) req.add_header("Cache-Control", "No-Cache") req.add_header("Pragma", "no-cache") if os.access(self.METARELEASE_FILE, os.W_OK): try: lastmodified = os.stat(self.METARELEASE_FILE).st_mtime - except OSError as e: + except OSError, e: pass if lastmodified > 0 and not self.forceDownload: - req.add_header("If-Modified-Since", - time.asctime(time.gmtime(lastmodified))) + req.add_header("If-Modified-Since", time.asctime(time.gmtime(lastmodified))) try: # open - uri = urlopen(req, timeout=20) + uri=urllib2.urlopen(req, timeout=20) # sometime there is a root owned meta-relase file # there, try to remove it so that we get it # with proper permissions if (os.path.exists(self.METARELEASE_FILE) and - not os.access(self.METARELEASE_FILE, os.W_OK)): + not os.access(self.METARELEASE_FILE,os.W_OK)): try: os.unlink(self.METARELEASE_FILE) - except OSError as e: - print("Can't unlink '%s' (%s)" % (self.METARELEASE_FILE, - e)) + except OSError,e: + print "Can't unlink '%s' (%s)" % (self.METARELEASE_FILE,e) # we may get exception here on e.g. disk full try: - f = open(self.METARELEASE_FILE, "w+") + f=open(self.METARELEASE_FILE,"w+") for line in uri.readlines(): - f.write(line.decode("UTF-8")) + f.write(line) f.flush() - f.seek(0, 0) - self.metarelease_information = f - except IOError as e: + f.seek(0,0) + self.metarelease_information=f + except IOError, e: pass uri.close() # http error - except HTTPError as e: + except urllib2.HTTPError, e: # mvo: only reuse local info on "not-modified" if e.code == 304 and os.path.exists(self.METARELEASE_FILE): self._debug("reading file '%s'" % self.METARELEASE_FILE) - self.metarelease_information = open(self.METARELEASE_FILE, "r") + self.metarelease_information=open(self.METARELEASE_FILE,"r") else: self._debug("result of meta-release download: '%s'" % e) # generic network error - except (URLError, BadStatusLine, socket.timeout) as e: + except (urllib2.URLError, httplib.BadStatusLine, socket.timeout), e: self._debug("result of meta-release download: '%s'" % e) - print("Failed to connect to %s. Check your Internet connection " - "or proxy settings" % self.METARELEASE_URI) # now check the information we have - if self.metarelease_information is not None: + if self.metarelease_information != None: self._debug("have self.metarelease_information") try: self.parse() - except Exception as e: - logging.exception("parse failed for '%s'" % - self.METARELEASE_FILE) + except: + logging.exception("parse failed for '%s'" % self.METARELEASE_FILE) # no use keeping a broken file around os.remove(self.METARELEASE_FILE) # we don't want to keep a meta-release file around when it @@ -384,11 +307,7 @@ os.remove(self.METARELEASE_FILE) else: self._debug("NO self.metarelease_information") - self.downloaded.set() - - @property - def downloading(self): - return not self.downloaded.is_set() + self.downloading = False def _get_release_notes_uri_query_string(self, dist): q = "?" @@ -397,16 +316,17 @@ if lang: q += "lang=%s&" % lang # get the os - q += "os=%s&" % self.flavor + os = get_ubuntu_flavor() + q += "os=%s&" % os # get the version to upgrade to q += "ver=%s" % dist.version - # the archive didn't respond well to ? being %3F - return quote(q, '/?') + return q def _debug(self, msg): if self.DEBUG: - sys.stderr.write(msg + "\n") + sys.stderr.write(msg+"\n") if __name__ == "__main__": meta = MetaReleaseCore(False, False) + diff -Nru update-manager-17.10.11/UpdateManager/Core/MyCache.py update-manager-0.156.14.15/UpdateManager/Core/MyCache.py --- update-manager-17.10.11/UpdateManager/Core/MyCache.py 2017-08-07 20:34:24.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/Core/MyCache.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,57 +1,42 @@ -# MyCache.py -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# +# MyCache.py +# # Copyright (c) 2004-2008 Canonical -# +# # Author: Michael Vogt -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA -from __future__ import absolute_import, print_function - import warnings warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning) import apt import apt_pkg import logging import os -try: - from urllib.error import HTTPError - from urllib.request import urlopen - from urllib.parse import urlsplit -except ImportError: - from urllib2 import HTTPError, urlopen - from urlparse import urlsplit -try: - from http.client import BadStatusLine -except ImportError: - from httplib import BadStatusLine +import string +import urllib2 +import httplib +import urlparse import socket import re import DistUpgrade.DistUpgradeCache from gettext import gettext as _ -try: - from launchpadlib.launchpad import Launchpad -except ImportError: - Launchpad = None +from UpdateList import UpdateOrigin SYNAPTIC_PINFILE = "/var/lib/synaptic/preferences" -CHANGELOGS_POOL = "http://changelogs.ubuntu.com/changelogs/pool/" -CHANGELOGS_URI = CHANGELOGS_POOL + "%s/%s/%s/%s_%s/%s" - +CHANGELOGS_URI="http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/%s" class HttpsChangelogsUnsupportedError(Exception): """ https changelogs with credentials are unsupported because of the @@ -60,7 +45,6 @@ """ pass - class MyCache(DistUpgrade.DistUpgradeCache.MyCache): CHANGELOG_ORIGIN = "Ubuntu" @@ -69,7 +53,7 @@ apt.Cache.__init__(self, progress, rootdir) # raise if we have packages in reqreinst state # and let the caller deal with that (runs partial upgrade) - assert len(self.req_reinstall_pkgs) == 0 + assert len(self.reqReinstallPkgs) == 0 # check if the dpkg journal is ok (we need to do that here # too because libapt will only do it when it tries to lock # the packaging system) @@ -81,9 +65,8 @@ # on broken packages, try to fix via saveDistUpgrade() if self._depcache.broken_count > 0: self.saveDistUpgrade() - assert (self._depcache.broken_count == 0 and + assert (self._depcache.broken_count == 0 and self._depcache.del_count == 0) - self.launchpad = None def _dpkgJournalDirty(self): """ @@ -91,122 +74,121 @@ (similar to debSystem::CheckUpdates) """ d = os.path.dirname( - apt_pkg.config.find_file("Dir::State::status")) + "/updates" + apt_pkg.Config.find_file("Dir::State::status"))+"/updates" for f in os.listdir(d): if re.match("[0-9]+", f): return True return False def _initDepCache(self): - #apt_pkg.config.set("Debug::pkgPolicy","1") + #apt_pkg.Config.Set("Debug::pkgPolicy","1") #self.depcache = apt_pkg.GetDepCache(self.cache) #self._depcache = apt_pkg.GetDepCache(self._cache) self._depcache.read_pinfile() if os.path.exists(SYNAPTIC_PINFILE): self._depcache.read_pinfile(SYNAPTIC_PINFILE) self._depcache.init() - def clear(self): self._initDepCache() - @property - def required_download(self): + def requiredDownload(self): """ get the size of the packages that are required to download """ pm = apt_pkg.PackageManager(self._depcache) fetcher = apt_pkg.Acquire() pm.get_archives(fetcher, self._list, self._records) return fetcher.fetch_needed - @property - def install_count(self): + def installCount(self): return self._depcache.inst_count - - def keep_count(self): + def keepCount(self): return self._depcache.keep_count - - def _check_dependencies(self, target, deps): - """Return True if any of the dependencies in deps match target.""" - # TODO: handle virtual packages - for dep_or in deps: - if not dep_or: - continue - match = True - for base_dep in dep_or: - if (base_dep.name != target.package.shortname or - not apt_pkg.check_dep( - target.version, base_dep.relation, base_dep.version)): - match = False - if match: - return True - return False - - def find_removal_justification(self, pkg): - target = pkg.installed - if not target: - return False - for cpkg in self: - candidate = cpkg.candidate - if candidate is not None: - if (self._check_dependencies( - target, candidate.get_dependencies("Conflicts")) and - self._check_dependencies( - target, candidate.get_dependencies("Replaces"))): - logging.info( - "%s Conflicts/Replaces %s; allowing removal" % ( - candidate.package.shortname, pkg.shortname)) - return True - return False - def saveDistUpgrade(self): """ this functions mimics a upgrade but will never remove anything """ #self._apply_dselect_upgrade() self._depcache.upgrade(True) wouldDelete = self._depcache.del_count - if wouldDelete > 0: - deleted_pkgs = [pkg for pkg in self if pkg.marked_delete] - assert wouldDelete == len(deleted_pkgs) - for pkg in deleted_pkgs: - if self.find_removal_justification(pkg): - wouldDelete -= 1 - if wouldDelete > 0: + if self._depcache.del_count > 0: self.clear() - assert (self._depcache.broken_count == 0 and - self._depcache.del_count == 0) - else: - assert self._depcache.broken_count == 0 + assert self._depcache.broken_count == 0 and self._depcache.del_count == 0 #self._apply_dselect_upgrade() self._depcache.upgrade() return wouldDelete + def matchPackageOrigin(self, pkg, matcher): + """ match 'pkg' origin against 'matcher', take versions between + installedVersion and candidateVersion into account too + Useful if installed pkg A v1.0 is available in both + -updates (as v1.2) and -security (v1.1). we want to display + it as a security update then + """ + inst_ver = pkg._pkg.current_ver + cand_ver = self._depcache.get_candidate_ver(pkg._pkg) + # init matcher with candidateVer + update_origin = matcher[(None,None)] + verFileIter = None + for (verFileIter,index) in cand_ver.file_list: + if matcher.has_key((verFileIter.archive, verFileIter.origin)): + indexfile = pkg._pcache._list.find_index(verFileIter) + if indexfile: # and indexfile.IsTrusted: + match = matcher[verFileIter.archive, verFileIter.origin] + update_origin = match + break + else: + # add a node for each origin/archive combination + if verFileIter and verFileIter.origin and verFileIter.archive: + matcher[verFileIter.archive, verFileIter.origin] = UpdateOrigin(_("Other updates (%s)") % verFileIter.origin, 0) + update_origin = matcher[verFileIter.archive, verFileIter.origin] + # if the candidate comes from a unknown source (e.g. a PPA) skip + # skip the shadow logic below as it would put e.g. a PPA package + # in "Recommended updates" when the version in the PPA + # is higher than the one in %s-updates + if update_origin.importance <= 0: + return update_origin + # for known packages, check if we have higher versions that + # "shadow" this one + for ver in pkg._pkg.version_list: + # discard is < than installed ver + if (inst_ver and + apt_pkg.VersionCompare(ver.ver_str, inst_ver.ver_str) <= 0): + #print "skipping '%s' " % ver.ver_str + continue + # check if we have a match + for(verFileIter,index) in ver.file_list: + if matcher.has_key((verFileIter.archive, verFileIter.origin)): + indexfile = pkg._pcache._list.find_index(verFileIter) + if indexfile: # and indexfile.IsTrusted: + match = matcher[verFileIter.archive, verFileIter.origin] + if match.importance > update_origin.importance: + update_origin = match + return update_origin def _strip_epoch(self, verstr): " strip of the epoch " - vers_no_epoch = verstr.split(":") - if len(vers_no_epoch) > 1: - verstr = "".join(vers_no_epoch[1:]) + l = string.split(verstr,":") + if len(l) > 1: + verstr = "".join(l[1:]) return verstr - - def _get_changelog_or_news(self, name, fname, strict_versioning=False, - changelogs_uri=None): + + def _get_changelog_or_news(self, name, fname, strict_versioning=False, changelogs_uri=None): " helper that fetches the file in question " # don't touch the gui in this function, it needs to be thread-safe pkg = self[name] # get the src package name - srcpkg = pkg.candidate.source_name + srcpkg = pkg.sourcePackageName - # assume "main" section + # assume "main" section src_section = "main" # use the section of the candidate as a starting point section = pkg._pcache._depcache.get_candidate_ver(pkg._pkg).section # get the source version, start with the binaries version - srcver_epoch = pkg.candidate.version + srcver_epoch = pkg.candidateVersion srcver = self._strip_epoch(srcver_epoch) - #print("bin: %s" % binver) + #print "bin: %s" % binver - split_section = section.split("/") - if len(split_section) > 1: - src_section = split_section[0] + l = section.split("/") + if len(l) > 1: + src_section = l[0] # lib is handled special prefix = srcpkg[0] @@ -219,106 +201,57 @@ if changelogs_uri: uri = changelogs_uri else: - uri = CHANGELOGS_URI % (src_section, prefix, srcpkg, srcpkg, - srcver, fname) + uri = CHANGELOGS_URI % (src_section,prefix,srcpkg,srcpkg, srcver, fname) # https uris are not supported when they contain a username/password # because the urllib2 https implementation will not check certificates # and so its possible to do a man-in-the-middle attack to steal the # credentials - res = urlsplit(uri) - if res.scheme == "https" and res.username: + res = urlparse.urlsplit(uri) + if res.scheme == "https" and res.username != "": raise HttpsChangelogsUnsupportedError( "https locations with username/password are not" "supported to fetch changelogs") - # print("Trying: %s " % uri) - changelog = urlopen(uri) - #print(changelog.read()) + # print "Trying: %s " % uri + changelog = urllib2.urlopen(uri) + #print changelog.read() # do only get the lines that are new alllines = "" regexp = "^%s \((.*)\)(.*)$" % (re.escape(srcpkg)) - + while True: - line = changelog.readline().decode("UTF-8", "replace") + line = changelog.readline() if line == "": break - match = re.match(regexp, line) + match = re.match(regexp,line) if match: # strip epoch from installed version # and from changelog too - installed = getattr(pkg.installed, "version", None) + installed = pkg.installedVersion if installed and ":" in installed: - installed = installed.split(":", 1)[1] + installed = installed.split(":",1)[1] changelogver = match.group(1) if changelogver and ":" in changelogver: - changelogver = changelogver.split(":", 1)[1] - # we test for "==" here for changelogs + changelogver = changelogver.split(":",1)[1] + # we test for "==" here for changelogs # to ensure that the version # is actually really in the changelog - if not # just display it all, this catches cases like: # gcc-defaults with "binver=4.3.1" and srcver=1.76 - # + # # for NEWS.Debian we do require the changelogver > installed if strict_versioning: - if (installed and - apt_pkg.version_compare(changelogver, - installed) < 0): + if (installed and + apt_pkg.VersionCompare(changelogver,installed)<0): break else: - if (installed and - apt_pkg.version_compare(changelogver, - installed) == 0): + if (installed and + apt_pkg.VersionCompare(changelogver,installed)==0): break alllines = alllines + line return alllines - def _extract_ppa_changelog_uri(self, name): - """Return the changelog URI from the Launchpad API - - Return None in case of an error. - """ - if not Launchpad: - logging.warning("Launchpadlib not available, cannot retrieve PPA " - "changelog") - return None - - cdt = self[name].candidate - for uri in cdt.uris: - if urlsplit(uri).hostname != 'ppa.launchpad.net': - continue - match = re.search('http.*/(.*)/(.*)/ubuntu/.*', uri) - if match is not None: - user, ppa = match.group(1), match.group(2) - break - else: - logging.error("Unable to find a valid PPA candidate URL.") - return - - # Login on launchpad if we are not already - if self.launchpad is None: - self.launchpad = Launchpad.login_anonymously('update-manager', - 'production', - version='devel') - - archive = self.launchpad.archives.getByReference( - reference='~%s/ubuntu/%s' % (user, ppa) - ) - if archive is None: - logging.error("Unable to retrieve the archive from the Launchpad " - "API.") - return - - spphs = archive.getPublishedSources(source_name=cdt.source_name, - exact_match=True, - version=cdt.version) - if not spphs: - logging.error("No published sources were retrieved from the " - "Launchpad API.") - return - - return spphs[0].changelogUrl() - def _guess_third_party_changelogs_uri_by_source(self, name): pkg = self[name] deb_uri = pkg.candidate.uri @@ -345,17 +278,18 @@ pkg = self[name] deb_uri = pkg.candidate.uri if deb_uri: - return "%s.changelog" % deb_uri.rsplit(".", 1)[0] + return "%s.changelog" % string.rsplit(deb_uri, ".", 1)[0] return None + def get_news_and_changelog(self, name, lock): self.get_news(name) self.get_changelog(name) try: - lock.release() - except Exception as e: + lock.release() + except: pass - + def get_news(self, name): " get the NEWS.Debian file from the changelogs location " try: @@ -364,38 +298,24 @@ return if news: self.all_news[name] = news - - def _fetch_changelog_for_third_party_package(self, name, origins): - # Special case for PPAs - changelogs_uri_ppa = None - for origin in origins: - if origin.origin.startswith('LP-PPA-'): - try: - changelogs_uri_ppa = self._extract_ppa_changelog_uri(name) - break - except Exception: - logging.exception("Unable to connect to the Launchpad " - "API.") + + def _fetch_changelog_for_third_party_package(self, name): # Try non official changelog location - changelogs_uri_binary = \ - self._guess_third_party_changelogs_uri_by_binary(name) - changelogs_uri_source = \ - self._guess_third_party_changelogs_uri_by_source(name) + changelogs_uri_binary = self._guess_third_party_changelogs_uri_by_binary(name) + changelogs_uri_source = self._guess_third_party_changelogs_uri_by_source(name) error_message = "" - for changelogs_uri in [changelogs_uri_ppa, - changelogs_uri_binary, - changelogs_uri_source]: + for changelogs_uri in [changelogs_uri_binary,changelogs_uri_source]: if changelogs_uri: try: changelog = self._get_changelog_or_news( name, "changelog", False, changelogs_uri) self.all_changes[name] += changelog - except (HTTPError, HttpsChangelogsUnsupportedError): + except (urllib2.HTTPError, HttpsChangelogsUnsupportedError) as e: # no changelogs_uri or 404 error_message = _( "This update does not come from a " "source that supports changelogs.") - except (IOError, BadStatusLine, socket.error): + except (IOError, httplib.BadStatusLine, socket.error) as e: # network errors and others logging.exception("error on changelog fetching") error_message = _( @@ -405,37 +325,33 @@ def get_changelog(self, name): " get the changelog file from the changelog location " - origins = self[name].candidate.origins - self.all_changes[name] = _("Changes for %s versions:\n" - "Installed version: %s\n" - "Available version: %s\n\n") % \ - (name, getattr(self[name].installed, "version", None), - self[name].candidate.version) - if self.CHANGELOG_ORIGIN not in [o.origin for o in origins]: - self._fetch_changelog_for_third_party_package(name, origins) + origins = self[name].candidateOrigin + self.all_changes[name] = _("Changes for the versions:\nInstalled version: %s\nAvailable version: %s\n\n") % (self[name].installedVersion, self[name].candidateVersion) + if not self.CHANGELOG_ORIGIN in [o.origin for o in origins]: + self._fetch_changelog_for_third_party_package(name) return # fixup epoch handling version - srcpkg = self[name].candidate.source_name - srcver_epoch = self[name].candidate.version.replace(':', '%3A') + srcpkg = self[name].sourcePackageName + srcver_epoch = self[name].candidateVersion.replace(':', '%3A') try: changelog = self._get_changelog_or_news(name, "changelog") if len(changelog) == 0: - changelog = _("The changelog does not contain any relevant " - "changes.\n\n" - "Please use http://launchpad.net/ubuntu/+source/" - "%s/%s/+changelog\n" - "until the changes become available or try " - "again later.") % (srcpkg, srcver_epoch) - except HTTPError as e: + changelog = _("The changelog does not contain any relevant changes.\n\n" + "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" + "until the changes become available or try again " + "later.") % (srcpkg, srcver_epoch) + except urllib2.HTTPError, e: changelog = _("The list of changes is not available yet.\n\n" - "Please use http://launchpad.net/ubuntu/+source/" - "%s/%s/+changelog\n" + "Please use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n" "until the changes become available or try again " "later.") % (srcpkg, srcver_epoch) - except (IOError, BadStatusLine, socket.error) as e: - print("caught exception: ", e) + except (IOError, httplib.BadStatusLine, socket.error), e: + print "caught exception: ", e changelog = _("Failed to download the list " "of changes. \nPlease " "check your Internet " "connection.") self.all_changes[name] += changelog + + + diff -Nru update-manager-17.10.11/UpdateManager/Core/roam.py update-manager-0.156.14.15/UpdateManager/Core/roam.py --- update-manager-17.10.11/UpdateManager/Core/roam.py 2017-08-07 19:04:21.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/Core/roam.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,36 +1,32 @@ -# utils.py -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# +# utils.py +# # Copyright (c) 2011 Canonical -# +# # Author: Alex Chiang # Michael Vogt -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA -from __future__ import print_function - import dbus import sys - class ModemManagerHelper(object): - # data taken from + # data taken from # http://projects.gnome.org/NetworkManager/developers/mm-spec-04.html MM_DBUS_IFACE = "org.freedesktop.ModemManager" MM_DBUS_IFACE_MODEM = MM_DBUS_IFACE + ".Modem" @@ -40,23 +36,23 @@ MM_MODEM_TYPE_CDMA = 2 # GSM - # Not registered, not searching for new operator to register. + # Not registered, not searching for new operator to register. MM_MODEM_GSM_NETWORK_REG_STATUS_IDLE = 0 - # Registered on home network. + # Registered on home network. MM_MODEM_GSM_NETWORK_REG_STATUS_HOME = 1 - # Not registered, searching for new operator to register with. + # Not registered, searching for new operator to register with. MM_MODEM_GSM_NETWORK_REG_STATUS_SEARCHING = 2 - # Registration denied. + # Registration denied. MM_MODEM_GSM_NETWORK_REG_STATUS_DENIED = 3 - # Unknown registration status. + # Unknown registration status. MM_MODEM_GSM_NETWORK_REG_STATUS_UNKNOWN = 4 - # Registered on a roaming network. + # Registered on a roaming network. MM_MODEM_GSM_NETWORK_REG_STATUS_ROAMING = 5 # CDMA # Registration status is unknown or the device is not registered. MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN = 0 - # Registered, but roaming status is unknown or cannot be provided + # Registered, but roaming status is unknown or cannot be provided # by the device. The device may or may not be roaming. MM_MODEM_CDMA_REGISTRATION_STATE_REGISTERED = 1 # Currently registered on the home network. @@ -66,7 +62,7 @@ def __init__(self): self.bus = dbus.SystemBus() - self.proxy = self.bus.get_object("org.freedesktop.ModemManager", + self.proxy = self.bus.get_object("org.freedesktop.ModemManager", "/org/freedesktop/ModemManager") modem_manager = dbus.Interface(self.proxy, self.MM_DBUS_IFACE) self.modems = modem_manager.EnumerateDevices() @@ -80,14 +76,12 @@ def is_gsm_roaming(self): for m in self.modems: dev = self.bus.get_object(self.MM_DBUS_IFACE, m) - type = self.get_dbus_property(dev, self.MM_DBUS_IFACE_MODEM, - "Type") + type = self.get_dbus_property(dev, self.MM_DBUS_IFACE_MODEM, "Type") if type != self.MM_MODEM_TYPE_GSM: continue - net = dbus.Interface(dev, - self.MM_DBUS_IFACE_MODEM + ".Gsm.Network") + net = dbus.Interface(dev, self.MM_DBUS_IFACE_MODEM + ".Gsm.Network") reg = net.GetRegistrationInfo() - # Be conservative about roaming. If registration unknown, + # Be conservative about roaming. If registration unknown, # assume yes. # MM_MODEM_GSM_NETWORK_REG_STATUS if reg[0] in (self.MM_MODEM_GSM_NETWORK_REG_STATUS_UNKNOWN, @@ -98,13 +92,12 @@ def is_cdma_roaming(self): for m in self.modems: dev = self.bus.get_object(self.MM_DBUS_IFACE, m) - type = self.get_dbus_property(dev, self.MM_DBUS_IFACE_MODEM, - "Type") + type = self.get_dbus_property(dev, self.MM_DBUS_IFACE_MODEM, "Type") if type != self.MM_MODEM_TYPE_CDMA: continue cdma = dbus.Interface(dev, self.MM_DBUS_IFACE_MODEM + ".Cdma") (cmda_1x, evdo) = cdma.GetRegistrationState() - # Be conservative about roaming. If registration unknown, + # Be conservative about roaming. If registration unknown, # assume yes. # MM_MODEM_CDMA_REGISTRATION_STATE roaming_states = (self.MM_MODEM_CDMA_REGISTRATION_STATE_REGISTERED, @@ -116,13 +109,12 @@ return True return False - class NetworkManagerHelper(object): NM_DBUS_IFACE = "org.freedesktop.NetworkManager" # connection states # Old enum values are for NM 0.7 - + # The NetworkManager daemon is in an unknown state. NM_STATE_UNKNOWN = 0 # The NetworkManager daemon is connecting a device. @@ -140,20 +132,20 @@ NM_STATE_CONNECTED_SITE, NM_STATE_CONNECTED_GLOBAL] - # The device type is unknown. + # The device type is unknown. NM_DEVICE_TYPE_UNKNOWN = 0 - # The device is wired Ethernet device. + # The device is wired Ethernet device. NM_DEVICE_TYPE_ETHERNET = 1 - # The device is an 802.11 WiFi device. + # The device is an 802.11 WiFi device. NM_DEVICE_TYPE_WIFI = 2 - # The device is a GSM-based cellular WAN device. + # The device is a GSM-based cellular WAN device. NM_DEVICE_TYPE_GSM = 3 - # The device is a CDMA/IS-95-based cellular WAN device. + # The device is a CDMA/IS-95-based cellular WAN device. NM_DEVICE_TYPE_CDMA = 4 def __init__(self): self.bus = dbus.SystemBus() - self.proxy = self.bus.get_object("org.freedesktop.NetworkManager", + self.proxy = self.bus.get_object("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager") @staticmethod @@ -194,19 +186,18 @@ res |= mmhelper.is_cdma_roaming() return res - if __name__ == "__main__": - + # test code if sys.argv[1:] and sys.argv[1] == "--test": mmhelper = ModemManagerHelper() - print("is_gsm_roaming", mmhelper.is_gsm_roaming()) - print("is_cdma_romaing", mmhelper.is_cdma_roaming()) + print "is_gsm_roaming", mmhelper.is_gsm_roaming() + print "is_cdma_romaing", mmhelper.is_cdma_roaming() # roaming? nmhelper = NetworkManagerHelper() is_roaming = nmhelper.is_active_connection_gsm_or_cdma_roaming() - print("roam: ", is_roaming) + print "roam: ", is_roaming if is_roaming: sys.exit(1) sys.exit(0) diff -Nru update-manager-17.10.11/UpdateManager/Core/UpdateList.py update-manager-0.156.14.15/UpdateManager/Core/UpdateList.py --- update-manager-17.10.11/UpdateManager/Core/UpdateList.py 2017-08-07 22:42:24.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/Core/UpdateList.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,513 +1,100 @@ -# UpdateList.py -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# Copyright (c) 2004-2013 Canonical -# +# UpdateList.py +# +# Copyright (c) 2004-2008 Canonical +# # Author: Michael Vogt -# Dylan McCall -# Michael Terry -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA -from __future__ import print_function - import warnings -warnings.filterwarnings("ignore", "Accessed deprecated property", - DeprecationWarning) +warnings.filterwarnings("ignore", "Accessed deprecated property", DeprecationWarning) from gettext import gettext as _ -import apt -import logging -import itertools -import platform import os -import random -import glob - -from gi.repository import Gio - -from UpdateManager.Core import utils - - -class UpdateItem(): - def __init__(self, pkg, name, icon): - self.icon = icon - self.name = name - self.pkg = pkg - - def is_selected(self): - return self.pkg.marked_install or self.pkg.marked_upgrade - - -class UpdateGroup(UpdateItem): - _depcache = {} - - def __init__(self, pkg, name, icon): - UpdateItem.__init__(self, pkg, name, icon) - self._items = set() - self._deps = set() - self.core_item = None - if pkg is not None: - self.core_item = UpdateItem(pkg, name, icon) - self._items.add(self.core_item) - - @property - def items(self): - all_items = [] - all_items.extend(self._items) - return sorted(all_items, key=lambda a: a.name.lower()) - - def add(self, pkg, cache=None, eventloop_callback=None): - name = utils.get_package_label(pkg) - icon = Gio.ThemedIcon.new("package") - self._items.add(UpdateItem(pkg, name, icon)) - # If the pkg is in self._deps, stop here. We have already calculated - # the recursive dependencies for this package, no need to do it again. - if cache and pkg.name in cache and pkg.name not in self._deps: - if not self._deps: - # Initial deps haven't been calculated. As we're checking - # whether _deps is empty in is_dependency, we must init now or - # it won't be done at all. - self._init_deps(cache, eventloop_callback) - self._add_deps(pkg, cache, eventloop_callback) - - def contains(self, item): - return item in self._items - - def _init_deps(self, cache, eventloop_callback): - for item in self._items: - if item.pkg and item.pkg.name not in self._deps: - self._add_deps(item.pkg, cache, eventloop_callback) - - def _add_deps(self, pkg, cache, eventloop_callback): - """Adds pkg and dependencies of pkg to the dependency list.""" - if pkg is None or pkg.candidate is None or pkg.name in self._deps: - # This shouldn't really happen. If we land here often, it's a sign - # that something has gone wrong. Unless all pkgs are None it's not - # a critical issue - a hit to the performance at most. - reason = ((not pkg or not pkg.candidate) and - "Package was None or didn't have a candidate." or - "%s already in _deps." % pkg.name) - logging.debug("Useless call to _add_deps. %s" % reason) - return - if len(self._deps) % 200 == 0 and callable(eventloop_callback): - # Don't spin the loop every time _add_deps is called. - eventloop_callback() - - self._deps.add(pkg.name) - - if pkg.name in self._depcache: - for dep in self._depcache[pkg.name]: - if dep not in self._deps and dep in cache: - self._add_deps(cache[dep], cache, eventloop_callback) - else: - candidate = pkg.candidate - dependencies = candidate.get_dependencies('Depends', 'Recommends') - for dependency_pkg in itertools.chain.from_iterable(dependencies): - name = dependency_pkg.name - if name not in self._deps and name in cache: - self._depcache.setdefault(pkg.name, []).append(name) - self._add_deps(cache[name], cache, eventloop_callback) - - def is_dependency(self, maybe_dep, cache=None, eventloop_callback=None): - if not self._deps and cache: - self._init_deps(cache, eventloop_callback) - - return maybe_dep.name in self._deps - - def packages_are_selected(self): - for item in self.items: - if item.is_selected(): - return True - return False - - def selection_is_inconsistent(self): - pkgs_installing = [item for item in self.items if item.is_selected()] - return (len(pkgs_installing) > 0 and - len(pkgs_installing) < len(self.items)) - - def get_total_size(self): - size = 0 - for item in self.items: - size += getattr(item.pkg.candidate, "size", 0) - return size - - -class UpdateApplicationGroup(UpdateGroup): - def __init__(self, pkg, application): - name = application.get_display_name() - icon = application.get_icon() - super(UpdateApplicationGroup, self).__init__(pkg, name, icon) - - -class UpdatePackageGroup(UpdateGroup): - def __init__(self, pkg): - name = utils.get_package_label(pkg) - icon = Gio.ThemedIcon.new("package") - super(UpdatePackageGroup, self).__init__(pkg, name, icon) - - -class UpdateSystemGroup(UpdateGroup): - def __init__(self, cache): - # Translators: the %s is a distro name, like 'Ubuntu' and 'base' as in - # the core components and packages. - name = _("%s base") % utils.get_ubuntu_flavor_name(cache=cache) - icon = Gio.ThemedIcon.new("distributor-logo") - super(UpdateSystemGroup, self).__init__(None, name, icon) - - -class UpdateOrigin(): - def __init__(self, desc, importance): - self.packages = [] - self.importance = importance - self.description = desc - - -class UpdateList(): - """ - class that contains the list of available updates in - self.pkgs[origin] where origin is the user readable string - """ - - # the key in the debian/control file used to add the phased - # updates percentage - PHASED_UPDATES_KEY = "Phased-Update-Percentage" - - # the file that contains the uniq machine id - UNIQ_MACHINE_ID_FILE = "/etc/machine-id" - # use the dbus one as a fallback - UNIQ_MACHINE_ID_FILE_FALLBACK = "/var/lib/dbus/machine-id" - - APP_INSTALL_PATTERN = "/usr/share/app-install/desktop/%s:*.desktop" - - # the configuration key to turn phased-updates always on - ALWAYS_INCLUDE_PHASED_UPDATES = ( - "Update-Manager::Always-Include-Phased-Updates") - # ... or always off - NEVER_INCLUDE_PHASED_UPDATES = ( - "Update-Manager::Never-Include-Phased-Updates") - - def __init__(self, parent, dist=None): - self.dist = dist if dist else platform.dist()[2] - self.distUpgradeWouldDelete = 0 - self.update_groups = [] - self.security_groups = [] - self.num_updates = 0 - self.random = random.Random() - self.ignored_phased_updates = [] - # a stable machine uniq id - try: - with open(self.UNIQ_MACHINE_ID_FILE) as f: - self.machine_uniq_id = f.read() - except FileNotFoundError: - with open(self.UNIQ_MACHINE_ID_FILE_FALLBACK) as f: - self.machine_uniq_id = f.read() - - if 'XDG_DATA_DIRS' in os.environ and os.environ['XDG_DATA_DIRS']: - data_dirs = os.environ['XDG_DATA_DIRS'] - else: - data_dirs = '/usr/local/share/:/usr/share/' - self.application_dirs = [os.path.join(base, 'applications') - for base in data_dirs.split(':')] - - if 'XDG_CURRENT_DESKTOP' in os.environ: - self.current_desktop = os.environ.get('XDG_CURRENT_DESKTOP') - else: - self.current_desktop = '' - self.desktop_cache = {} - - def _file_is_application(self, file_path): - # WARNING: This is called often if there's a lot of updates. A poor - # performing call here has a huge impact on the overall performance! - if not file_path.endswith(".desktop"): - # First the obvious case: If the path doesn't end in a .desktop - # extension, this isn't a desktop file. - return False - - file_path = os.path.abspath(file_path) - for app_dir in self.application_dirs: - if file_path.startswith(app_dir): - return True - return False - - def _rate_application_for_package(self, application, pkg): - score = 0 - desktop_file = os.path.basename(application.get_filename()) - application_id = os.path.splitext(desktop_file)[0] - - if application.should_show(): - score += 1 - - if application_id == pkg.name: - score += 5 - - return score - - def _get_application_for_package(self, pkg): - desktop_files = [] - rated_applications = [] - - for installed_file in pkg.installed_files: - if self._file_is_application(installed_file): - desktop_files.append(installed_file) - - if pkg.name in self.desktop_cache: - desktop_files += self.desktop_cache[pkg.name] - - for desktop_file in desktop_files: - try: - application = Gio.DesktopAppInfo.new_from_filename( - desktop_file) - application.set_desktop_env(self.current_desktop) - except Exception as e: - logging.warning("Error loading .desktop file %s: %s" % - (desktop_file, e)) - continue - score = self._rate_application_for_package(application, pkg) - if score > 0: - rated_applications.append((score, application)) - - rated_applications.sort(key=lambda app: app[0], reverse=True) - if len(rated_applications) > 0: - return rated_applications[0][1] - else: - return None - - def _populate_desktop_cache(self, pkg_names): - if not pkg_names: - # No updates; This shouldn't have happened. - logging.warning("_populate_desktop_cache called with empty list " - "of packages.") - return - elif len(pkg_names) == 1: - # One update; Let glob do the matching. - pattern = self.APP_INSTALL_PATTERN % pkg_names[0] - else: - # More than one update available. Glob all desktop files and store - # those that match an upgradeable package. - pattern = self.APP_INSTALL_PATTERN % "*" - - for desktop_file in glob.iglob(pattern): - try: - pkg = desktop_file.split('/')[-1].split(":")[0] - except IndexError: - # app-install-data desktop file had an unexpected naming - # convention. As we can't extract the package name from - # the path, just ignore it. - logging.error("Could not extract package name from '%s'. " - "File ignored." % desktop_file) - continue - - if pkg in pkg_names: - self.desktop_cache.setdefault(pkg, []).append(desktop_file) - logging.debug("App candidate for %s: %s" % - (pkg, desktop_file)) - - def _is_security_update(self, pkg): - """ This will test if the pkg is a security update. - This includes if there is a newer version in -updates, but also - an older update available in -security. For example, if - installed pkg A v1.0 is available in both -updates (as v1.2) and - -security (v1.1). we want to display it as a security update. - - :return: True if the update comes from the security pocket - """ - if not self.dist: - return False - inst_ver = pkg._pkg.current_ver - for ver in pkg._pkg.version_list: - # discard is < than installed ver - if (inst_ver and - apt.apt_pkg.version_compare(ver.ver_str, - inst_ver.ver_str) <= 0): - continue - # check if we have a match - for (verFileIter, index) in ver.file_list: - if verFileIter.archive == "%s-security" % self.dist and \ - verFileIter.origin == "Ubuntu": - indexfile = pkg._pcache._list.find_index(verFileIter) - if indexfile: # and indexfile.IsTrusted: - return True - return False - - def _is_ignored_phased_update(self, pkg): - """ This will test if the pkg is a phased update and if - it needs to get installed or ignored. - - :return: True if the updates should be ignored - """ - # allow the admin to override this - if apt.apt_pkg.config.find_b( - self.ALWAYS_INCLUDE_PHASED_UPDATES, False): - return False - - if self.PHASED_UPDATES_KEY in pkg.candidate.record: - if apt.apt_pkg.config.find_b( - self.NEVER_INCLUDE_PHASED_UPDATES, False): - logging.info("holding back phased update per configuration") - return True - - # its important that we always get the same result on - # multiple runs of the update-manager, so we need to - # feed a seed that is a combination of the pkg/ver/machine - self.random.seed("%s-%s-%s" % ( - pkg.candidate.source_name, pkg.candidate.version, - self.machine_uniq_id)) - threshold = pkg.candidate.record[self.PHASED_UPDATES_KEY] - percentage = self.random.randint(0, 100) - if percentage > int(threshold): - logging.info("holding back phased update %s (%s < %s)" % ( - pkg.name, threshold, percentage)) - return True - return False - - def _get_linux_packages(self): - "Return all binary packages made by the linux-meta source package" - # Hard code this rather than generate from source info in cache because - # that might only be available if we have deb-src lines. I think we - # could also generate it by iterating over all the binary package info - # we have, but that is costly. These don't change often. - return ['linux', - 'linux-cloud-tools-generic', - 'linux-cloud-tools-lowlatency', - 'linux-cloud-tools-virtual', - 'linux-crashdump', - 'linux-generic', - 'linux-generic-lpae', - 'linux-headers-generic', - 'linux-headers-generic-lpae', - 'linux-headers-lowlatency', - 'linux-headers-lowlatency-lpae', - 'linux-headers-server', - 'linux-headers-virtual', - 'linux-image', - 'linux-image-extra-virtual', - 'linux-image-generic', - 'linux-image-generic-lpae', - 'linux-image-lowlatency', - 'linux-image-virtual', - 'linux-lowlatency', - 'linux-signed-generic', - 'linux-signed-image-generic', - 'linux-signed-image-lowlatency', - 'linux-signed-lowlatency', - 'linux-source', - 'linux-tools-generic', - 'linux-tools-generic-lpae', - 'linux-tools-lowlatency', - 'linux-tools-virtual', - 'linux-virtual'] - - def _make_groups(self, cache, pkgs, eventloop_callback): - if not pkgs: - return [] - ungrouped_pkgs = [] - app_groups = [] - pkg_groups = [] - - for pkg in pkgs: - app = self._get_application_for_package(pkg) - if app is not None: - app_group = UpdateApplicationGroup(pkg, app) - app_groups.append(app_group) - else: - ungrouped_pkgs.append(pkg) - - # Stick together applications and their immediate dependencies - for pkg in list(ungrouped_pkgs): - dep_groups = [] - for group in app_groups: - if group.is_dependency(pkg, cache, eventloop_callback): - dep_groups.append(group) - if len(dep_groups) > 1: - break - if len(dep_groups) == 1: - dep_groups[0].add(pkg, cache, eventloop_callback) - ungrouped_pkgs.remove(pkg) - - system_group = None - if ungrouped_pkgs: - # Separate out system base packages. If we have already found an - # application for all updates, don't bother. - meta_group = UpdateGroup(None, None, None) - flavor_package = utils.get_ubuntu_flavor_package(cache=cache) - meta_pkgs = [flavor_package, "ubuntu-standard", "ubuntu-minimal"] - meta_pkgs.extend(self._get_linux_packages()) - for pkg in meta_pkgs: - if pkg in cache: - meta_group.add(cache[pkg]) - for pkg in ungrouped_pkgs: - if meta_group.is_dependency(pkg, cache, eventloop_callback): - if system_group is None: - system_group = UpdateSystemGroup(cache) - system_group.add(pkg) - else: - pkg_groups.append(UpdatePackageGroup(pkg)) - - app_groups.sort(key=lambda a: a.name.lower()) - pkg_groups.sort(key=lambda a: a.name.lower()) - if system_group: - pkg_groups.append(system_group) - - return app_groups + pkg_groups - - def update(self, cache, eventloop_callback=None): - self.held_back = [] - - # do the upgrade - self.distUpgradeWouldDelete = cache.saveDistUpgrade() - - security_pkgs = [] - upgrade_pkgs = [] - - # Find all upgradable packages - for pkg in cache: - if pkg.is_upgradable or pkg.marked_install: - if getattr(pkg.candidate, "origins", None) is None: - # can happen for e.g. locked packages - # FIXME: do something more sensible here (but what?) - print("WARNING: upgradable but no candidate.origins?!?: ", - pkg.name) - continue - - # see if its a phased update and *not* a security update - # keep track of packages for which the update percentage was - # not met for testing - is_security_update = self._is_security_update(pkg) - if not is_security_update: - if self._is_ignored_phased_update(pkg): - self.ignored_phased_updates.append(pkg) - pkg.mark_keep() - continue - - if is_security_update: - security_pkgs.append(pkg) - else: - upgrade_pkgs.append(pkg) - self.num_updates = self.num_updates + 1 +import sys - if pkg.is_upgradable and not (pkg.marked_upgrade or - pkg.marked_install): - self.held_back.append(pkg.name) +class UpdateOrigin(object): + def __init__(self, desc, importance): + self.packages = [] + self.importance = importance + self.description = desc + +class UpdateList(object): + """ + class that contains the list of available updates in + self.pkgs[origin] where origin is the user readable string + """ + + def __init__(self, parent): + # a map of packages under their origin + try: + pipe = os.popen("lsb_release -c -s") + dist = pipe.read().strip() + del pipe + except Exception, e: + print "Error in lsb_release: %s" % e + parent.error(_("Failed to detect distribution"), + _("A error '%s' occurred while checking what system " + "you are using.") % e) + sys.exit(1) + self.distUpgradeWouldDelete = 0 + self.pkgs = {} + self.num_updates = 0 + self.matcher = self.initMatcher(dist) + + def initMatcher(self, dist): + # (origin, archive, description, importance) + matcher_templates = [ + ("%s-security" % dist, "Ubuntu", _("Important security updates"),10), + ("%s-updates" % dist, "Ubuntu", _("Recommended updates"), 9), + ("%s-proposed" % dist, "Ubuntu", _("Proposed updates"), 8), + ("%s-backports" % dist, "Ubuntu", _("Backports"), 7), + (dist, "Ubuntu", _("Distribution updates"), 6) + ] + matcher = {} + for (origin, archive, desc, importance) in matcher_templates: + matcher[(origin, archive)] = UpdateOrigin(desc, importance) + matcher[(None,None)] = UpdateOrigin(_("Other updates"), -1) + return matcher + + def update(self, cache): + self.held_back = [] + + # do the upgrade + self.distUpgradeWouldDelete = cache.saveDistUpgrade() + + #dselect_upgrade_origin = UpdateOrigin(_("Previous selected"), 1) + + # sort by origin + for pkg in cache: + if pkg.is_upgradable or pkg.marked_install: + if pkg.candidateOrigin == None: + # can happen for e.g. locked packages + # FIXME: do something more sensible here (but what?) + print "WARNING: upgradable but no canidateOrigin?!?: ", pkg.name + continue + # check where the package belongs + origin_node = cache.matchPackageOrigin(pkg, self.matcher) + if not self.pkgs.has_key(origin_node): + self.pkgs[origin_node] = [] + self.pkgs[origin_node].append(pkg) + self.num_updates = self.num_updates + 1 + if pkg.is_upgradable and not (pkg.marked_upgrade or pkg.marked_install): + self.held_back.append(pkg.name) + for l in self.pkgs.keys(): + self.pkgs[l].sort(lambda x,y: cmp(x.name,y.name)) + self.keepcount = cache._depcache.keep_count - if security_pkgs or upgrade_pkgs: - # There's updates available. Initiate the desktop file cache. - pkg_names = [p.name for p in security_pkgs + upgrade_pkgs] - self._populate_desktop_cache(pkg_names) - self.update_groups = self._make_groups(cache, upgrade_pkgs, - eventloop_callback) - self.security_groups = self._make_groups(cache, security_pkgs, - eventloop_callback) diff -Nru update-manager-17.10.11/UpdateManager/Core/utils.py update-manager-0.156.14.15/UpdateManager/Core/utils.py --- update-manager-17.10.11/UpdateManager/Core/utils.py 2017-08-09 23:10:05.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/Core/utils.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,34 +1,29 @@ -# utils.py -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# Copyright (c) 2004-2013 Canonical -# -# Authors: Michael Vogt -# Michael Terry -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as +# utils.py +# +# Copyright (c) 2004-2008 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA -from __future__ import print_function - from gettext import gettext as _ from gettext import ngettext from stat import (S_IMODE, ST_MODE, S_IXUSR) from math import ceil -import apt import apt_pkg apt_pkg.init_config() @@ -36,29 +31,16 @@ import logging import re import os +import os.path +import glob import subprocess import sys import time -try: - from urllib.request import ( - ProxyHandler, - Request, - build_opener, - install_opener, - urlopen, - ) - from urllib.parse import urlsplit -except ImportError: - from urllib2 import ( - ProxyHandler, - Request, - build_opener, - install_opener, - urlopen, - ) - from urlparse import urlsplit +import urllib2 +import urlparse from copy import copy +from urlparse import urlsplit class ExecutionTime(object): @@ -70,13 +52,10 @@ """ def __init__(self, info=""): self.info = info - def __enter__(self): self.now = time.time() - def __exit__(self, type, value, stack): - print("%s: %s" % (self.info, time.time() - self.now)) - + print "%s: %s" % (self.info, time.time() - self.now) def get_string_with_no_auth_from_source_entry(entry): tmp = copy(entry) @@ -87,6 +66,13 @@ tmp.uri = tmp.uri.replace(url_parts.password, "hidden-p") return str(tmp) +def estimate_kernel_size_in_boot(): + """ estimate the amount of space that the current kernel takes in /boot """ + size = 0 + kver = os.uname()[2] + for f in glob.glob("/boot/*%s*" % kver): + size += os.path.getsize(f) + return size def is_unity_running(): """ return True if Unity is currently running """ @@ -95,29 +81,26 @@ import dbus bus = dbus.SessionBus() unity_running = bus.name_has_owner("com.canonical.Unity") - except Exception as e: + except: logging.exception("could not check for Unity dbus service") return unity_running - def is_child_of_process_name(processname, pid=None): if not pid: pid = os.getpid() while pid > 0: stat_file = "/proc/%s/stat" % pid - with open(stat_file) as stat_f: - stat = stat_f.read() + stat = open(stat_file).read() # extract command (inside ()) - command = stat.partition("(")[2].rpartition(")")[0] + command = stat.partition("(")[2].partition(")")[0] if command == processname: return True # get parent (second to the right of command) and check that next - pid = int(stat.rpartition(")")[2].split()[1]) + pid = int(stat.partition(")")[2].split()[1]) return False - def inside_chroot(): - """ returns True if we are inside a chroot + """ returns True if we are inside a chroot """ # if there is no proc or no pid 1 we are very likely inside a chroot if not os.path.exists("/proc") or not os.path.exists("/proc/1"): @@ -125,7 +108,6 @@ # if the inode is differnt for pid 1 "/" and our "/" return os.stat("/") != os.stat("/proc/1/root") - def wrap(t, width=70, subsequent_indent=""): """ helpers inspired after textwrap - unfortunately we can not use textwrap directly because it break @@ -133,334 +115,277 @@ """ out = "" for s in t.split(): - if (len(out) - out.rfind("\n")) + len(s) > width: + if (len(out)-out.rfind("\n")) + len(s) > width: out += "\n" + subsequent_indent out += s + " " return out - - + def twrap(s, **kwargs): msg = "" paras = s.split("\n") for par in paras: s = wrap(par, **kwargs) - msg += s + "\n" + msg += s+"\n" return msg - def lsmod(): - " return list of loaded modules (or [] if lsmod is not found) " - modules = [] - # FIXME raise? - if not os.path.exists("/sbin/lsmod"): - return [] - p = subprocess.Popen(["/sbin/lsmod"], stdout=subprocess.PIPE, - universal_newlines=True) - lines = p.communicate()[0].split("\n") - # remove heading line: "Modules Size Used by" - del lines[0] - # add lines to list, skip empty lines - for line in lines: - if line: - modules.append(line.split()[0]) - return modules - + " return list of loaded modules (or [] if lsmod is not found) " + modules=[] + # FIXME raise? + if not os.path.exists("/sbin/lsmod"): + return [] + p=subprocess.Popen(["/sbin/lsmod"], stdout=subprocess.PIPE) + lines=p.communicate()[0].split("\n") + # remove heading line: "Modules Size Used by" + del lines[0] + # add lines to list, skip empty lines + for line in lines: + if line: + modules.append(line.split()[0]) + return modules def check_and_fix_xbit(path): - " check if a given binary has the executable bit and if not, add it" - if not os.path.exists(path): - return - mode = S_IMODE(os.stat(path)[ST_MODE]) - if not ((mode & S_IXUSR) == S_IXUSR): - os.chmod(path, mode | S_IXUSR) - + " check if a given binary has the executable bit and if not, add it" + if not os.path.exists(path): + return + mode = S_IMODE(os.stat(path)[ST_MODE]) + if not ((mode & S_IXUSR) == S_IXUSR): + os.chmod(path, mode | S_IXUSR) def country_mirror(): - " helper to get the country mirror from the current locale " - # special cases go here - lang_mirror = {'c': ''} - # no lang, no mirror - if 'LANG' not in os.environ: - return '' - lang = os.environ['LANG'].lower() - # check if it is a special case - if lang[:5] in lang_mirror: - return lang_mirror[lang[:5]] - # now check for the most comon form (en_US.UTF-8) - if "_" in lang: - country = lang.split(".")[0].split("_")[1] - if "@" in country: - country = country.split("@")[0] - return country + "." - else: - return lang[:2] + "." + " helper to get the country mirror from the current locale " + # special cases go here + lang_mirror = { 'c' : '', + } + # no lang, no mirror + if not 'LANG' in os.environ: return '' - + lang = os.environ['LANG'].lower() + # check if it is a special case + if lang[:5] in lang_mirror: + return lang_mirror[lang[:5]] + # now check for the most comon form (en_US.UTF-8) + if "_" in lang: + country = lang.split(".")[0].split("_")[1] + if "@" in country: + country = country.split("@")[0] + return country+"." + else: + return lang[:2]+"." + return '' def get_dist(): - " return the codename of the current runing distro " - # support debug overwrite - dist = os.environ.get("META_RELEASE_FAKE_CODENAME") - if dist: - logging.warning("using fake release name '%s' (because of " - "META_RELEASE_FAKE_CODENAME environment) " % dist) - return dist - # then check the real one - from subprocess import Popen, PIPE - p = Popen(["lsb_release", "-c", "-s"], stdout=PIPE, - universal_newlines=True) - res = p.wait() - if res != 0: - sys.stderr.write("lsb_release returned exitcode: %i\n" % res) - return "unknown distribution" - dist = p.stdout.readline().strip() - p.stdout.close() - return dist - - -def get_dist_version(): - " return the version of the current running distro " - # support debug overwrite - desc = os.environ.get("META_RELEASE_FAKE_VERSION") - if desc: - logging.warning("using fake release version '%s' (because of " - "META_RELEASE_FAKE_VERSION environment) " % desc) - return desc - # then check the real one - from subprocess import Popen, PIPE - p = Popen(["lsb_release", "-r", "-s"], stdout=PIPE, - universal_newlines=True) - res = p.wait() - if res != 0: - sys.stderr.write("lsb_release returned exitcode: %i\n" % res) - return "unknown distribution" - desc = p.stdout.readline().strip() - p.stdout.close() - return desc - + " return the codename of the current runing distro " + # support debug overwrite + dist = os.environ.get("META_RELEASE_FAKE_CODENAME") + if dist: + logging.warn("using fake release name '%s' (because of META_RELEASE_FAKE_CODENAME environment) " % dist) + return dist + # then check the real one + from subprocess import Popen, PIPE + p = Popen(["lsb_release","-c","-s"],stdout=PIPE) + res = p.wait() + if res != 0: + sys.stderr.write("lsb_release returned exitcode: %i\n" % res) + return "unknown distribution" + dist = p.stdout.readline().strip() + return dist -class HeadRequest(Request): +class HeadRequest(urllib2.Request): def get_method(self): return "HEAD" - def url_downloadable(uri, debug_func=None): - """ - helper that checks if the given uri exists and is downloadable - (supports optional debug_func function handler to support - e.g. logging) - - Supports http (via HEAD) and ftp (via size request) - """ - if not debug_func: - lambda x: True - debug_func("url_downloadable: %s" % uri) - (scheme, netloc, path, querry, fragment) = urlsplit(uri) - debug_func("s='%s' n='%s' p='%s' q='%s' f='%s'" % (scheme, netloc, path, - querry, fragment)) - if scheme == "http": - try: - http_file = urlopen(HeadRequest(uri)) - http_file.close() - if http_file.code == 200: - return True - return False - except Exception as e: - debug_func("error from httplib: '%s'" % e) - return False - elif scheme == "ftp": - import ftplib - try: - f = ftplib.FTP(netloc) - f.login() - f.cwd(os.path.dirname(path)) - size = f.size(os.path.basename(path)) - f.quit() - if debug_func: - debug_func("ftplib.size() returned: %s" % size) - if size != 0: - return True - except Exception as e: - if debug_func: - debug_func("error from ftplib: '%s'" % e) - return False - return False - + """ + helper that checks if the given uri exists and is downloadable + (supports optional debug_func function handler to support + e.g. logging) + + Supports http (via HEAD) and ftp (via size request) + """ + if not debug_func: + lambda x: True + debug_func("url_downloadable: %s" % uri) + (scheme, netloc, path, querry, fragment) = urlparse.urlsplit(uri) + debug_func("s='%s' n='%s' p='%s' q='%s' f='%s'" % (scheme, netloc, path, querry, fragment)) + if scheme == "http": + try: + http_file = urllib2.urlopen(HeadRequest(uri)) + http_file.close() + if http_file.code == 200: + return True + return False + except Exception, e: + debug_func("error from httplib: '%s'" % e) + return False + elif scheme == "ftp": + import ftplib + try: + f = ftplib.FTP(netloc) + f.login() + f.cwd(os.path.dirname(path)) + size = f.size(os.path.basename(path)) + f.quit() + if debug_func: + debug_func("ftplib.size() returned: %s" % size) + if size != 0: + return True + except Exception, e: + if debug_func: + debug_func("error from ftplib: '%s'" % e) + return False + return False def init_proxy(gsettings=None): - """ init proxy settings - - * first check for http_proxy environment (always wins), - * then check the apt.conf http proxy, - * then look into synaptics conffile - * then into gconf (if gconfclient was supplied) - """ - SYNAPTIC_CONF_FILE = "/root/.synaptic/synaptic.conf" - proxy = None - # generic apt config wins - if apt_pkg.config.find("Acquire::http::Proxy") != '': - proxy = apt_pkg.config.find("Acquire::http::Proxy") - # then synaptic - elif os.path.exists(SYNAPTIC_CONF_FILE): - cnf = apt_pkg.Configuration() - apt_pkg.read_config_file(cnf, SYNAPTIC_CONF_FILE) - use_proxy = cnf.find_b("Synaptic::useProxy", False) - if use_proxy: - proxy_host = cnf.find("Synaptic::httpProxy") - proxy_port = str(cnf.find_i("Synaptic::httpProxyPort")) - if proxy_host and proxy_port: - proxy = "http://%s:%s/" % (proxy_host, proxy_port) - # if we have a proxy, set it - if proxy: - # basic verification - if not re.match("http://\w+", proxy): - print("proxy '%s' looks invalid" % proxy, file=sys.stderr) - return - proxy_support = ProxyHandler({"http": proxy}) - opener = build_opener(proxy_support) - install_opener(opener) - os.putenv("http_proxy", proxy) - return proxy + """ init proxy settings + * first check for http_proxy environment (always wins), + * then check the apt.conf http proxy, + * then look into synaptics conffile + * then into gconf (if gconfclient was supplied) + """ + SYNAPTIC_CONF_FILE = "/root/.synaptic/synaptic.conf" + proxy = None + # generic apt config wins + if apt_pkg.config.find("Acquire::http::Proxy") != '': + proxy = apt_pkg.config.find("Acquire::http::Proxy") + # then synaptic + elif os.path.exists(SYNAPTIC_CONF_FILE): + cnf = apt_pkg.Configuration() + apt_pkg.read_config_file(cnf, SYNAPTIC_CONF_FILE) + use_proxy = cnf.find_b("Synaptic::useProxy", False) + if use_proxy: + proxy_host = cnf.find("Synaptic::httpProxy") + proxy_port = str(cnf.find_i("Synaptic::httpProxyPort")) + if proxy_host and proxy_port: + proxy = "http://%s:%s/" % (proxy_host, proxy_port) + # gconf is no more + # elif gconfclient: + # try: # see LP: #281248 + # if gconfclient.get_bool("/system/http_proxy/use_http_proxy"): + # host = gconfclient.get_string("/system/http_proxy/host") + # port = gconfclient.get_int("/system/http_proxy/port") + # use_auth = gconfclient.get_bool("/system/http_proxy/use_authentication") + # if host and port: + # if use_auth: + # auth_user = gconfclient.get_string("/system/http_proxy/authentication_user") + # auth_pw = gconfclient.get_string("/system/http_proxy/authentication_password") + # proxy = "http://%s:%s@%s:%s/" % (auth_user,auth_pw,host, port) + # else: + # proxy = "http://%s:%s/" % (host, port) + # except Exception, e: + # print "error from gconf: %s" % e + # if we have a proxy, set it + if proxy: + # basic verification + if not re.match("http://\w+", proxy): + print >> sys.stderr, "proxy '%s' looks invalid" % proxy + return + proxy_support = urllib2.ProxyHandler({"http":proxy}) + opener = urllib2.build_opener(proxy_support) + urllib2.install_opener(opener) + os.putenv("http_proxy",proxy) + return proxy def on_battery(): - """ - Check via dbus if the system is running on battery. - This function is using UPower per default, if UPower is not - available it falls-back to DeviceKit.Power. - """ + """ + Check via dbus if the system is running on battery. + This function is using UPower per default, if UPower is not + available it falls-back to DeviceKit.Power. + """ + try: + import dbus + bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM) try: - import dbus - bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM) - try: - devobj = bus.get_object('org.freedesktop.UPower', - '/org/freedesktop/UPower') - dev = dbus.Interface(devobj, 'org.freedesktop.DBus.Properties') - return dev.Get('org.freedesktop.UPower', 'OnBattery') - except dbus.exceptions.DBusException as e: - error_unknown = 'org.freedesktop.DBus.Error.ServiceUnknown' - if e._dbus_error_name != error_unknown: - raise - devobj = bus.get_object('org.freedesktop.DeviceKit.Power', - '/org/freedesktop/DeviceKit/Power') - dev = dbus.Interface(devobj, "org.freedesktop.DBus.Properties") - return dev.Get("org.freedesktop.DeviceKit.Power", "on_battery") - except Exception as e: - #import sys - #print("on_battery returned error: ", e, file=sys.stderr) - return False - + devobj = bus.get_object('org.freedesktop.UPower', + '/org/freedesktop/UPower') + dev = dbus.Interface(devobj, 'org.freedesktop.DBus.Properties') + return dev.Get('org.freedesktop.UPower', 'OnBattery') + except dbus.exceptions.DBusException, e: + if e._dbus_error_name != 'org.freedesktop.DBus.Error.ServiceUnknown': + raise + devobj = bus.get_object('org.freedesktop.DeviceKit.Power', + '/org/freedesktop/DeviceKit/Power') + dev = dbus.Interface(devobj, "org.freedesktop.DBus.Properties") + return dev.Get("org.freedesktop.DeviceKit.Power", "on_battery") + except Exception, e: + #import sys + #print >>sys.stderr, "on_battery returned error: ", e + return False def inhibit_sleep(): - """ - Send a dbus signal to logind to not suspend the system, it will be - released when the return value drops out of scope - """ - try: - from gi.repository import Gio, GLib - connection = Gio.bus_get_sync(Gio.BusType.SYSTEM) - - var, fdlist = connection.call_with_unix_fd_list_sync( - 'org.freedesktop.login1', '/org/freedesktop/login1', - 'org.freedesktop.login1.Manager', 'Inhibit', - GLib.Variant('(ssss)', - ('shutdown:sleep', - 'UpdateManager', 'Updating System', - 'block')), - None, 0, -1, None, None) - inhibitor = Gio.UnixInputStream(fd=fdlist.steal_fds()[var[0]]) - - return inhibitor - except Exception: - #print("could not send the dbus Inhibit signal: %s" % e) - return False + """ + Send a dbus signal to power-manager to not suspend + the system, using the freedesktop common interface + """ + try: + import dbus + bus = dbus.Bus(dbus.Bus.TYPE_SESSION) + devobj = bus.get_object('org.freedesktop.PowerManagement', + '/org/freedesktop/PowerManagement/Inhibit') + dev = dbus.Interface(devobj, "org.freedesktop.PowerManagement.Inhibit") + cookie = dev.Inhibit('UpdateManager', 'Updating system') + return (dev, cookie) + except Exception: + #print "could not send the dbus Inhibit signal: %s" % e + return (False, False) + +def allow_sleep(dev, cookie): + """Send a dbus signal to gnome-power-manager to allow a suspending + the system""" + try: + dev.UnInhibit(cookie) + except Exception, e: + print "could not send the dbus UnInhibit signal: %s" % e def str_to_bool(str): - if str == "0" or str.upper() == "FALSE": - return False - return True + if str == "0" or str.upper() == "FALSE": + return False + return True +def utf8(str): + return unicode(str, 'latin1').encode('utf-8') def get_lang(): import logging try: (locale_s, encoding) = locale.getdefaultlocale() return locale_s - except Exception: + except Exception: logging.exception("gedefaultlocale() failed") return None - -def get_ubuntu_flavor(cache=None): +def get_ubuntu_flavor(): """ try to guess the flavor based on the running desktop """ - # this will (of course) not work in a server environment, + # this will (of course) not work in a server environment, # but the main use case for this is to show the right - # release notes. - pkg = get_ubuntu_flavor_package(cache=cache) - return pkg.split('-', 1)[0] - - -def _load_meta_pkg_list(): - # This could potentially introduce a circular dependency, but the config - # parser logic is simple, and doesn't rely on any UpdateManager code. - from DistUpgrade.DistUpgradeConfigParser import DistUpgradeConfig - parser = DistUpgradeConfig('/usr/share/ubuntu-release-upgrader') - return parser.getlist('Distro', 'MetaPkgs') - - -def get_ubuntu_flavor_package(cache=None): - """ try to guess the flavor metapackage based on the running desktop """ - # From spec, first if ubuntu-desktop is installed, use that. - # Second, grab first installed one from DistUpgrade.cfg. - # Lastly, fallback to ubuntu-desktop again. - meta_pkgs = ['ubuntu-desktop'] + # release notes + denv = os.environ.get("DESKTOP_SESSION", "") + if "gnome" in denv: + return "ubuntu" + elif "kde" in denv: + return "kubuntu" + elif "xfce" in denv or "xubuntu" in denv: + return "xubuntu" + elif "LXDE" in denv or "Lubuntu" in denv: + return "lubuntu" + # default to ubuntu if nothing more specific is found + return "ubuntu" - try: - meta_pkgs.extend(sorted(_load_meta_pkg_list())) - except Exception as e: - print('Could not load list of meta packages:', e) - - if cache is None: - cache = apt.Cache() - for meta_pkg in meta_pkgs: - cache_pkg = cache[meta_pkg] if meta_pkg in cache else None - if cache_pkg and cache_pkg.is_installed: - return meta_pkg - return 'ubuntu-desktop' - - -def get_ubuntu_flavor_name(cache=None): - """ try to guess the flavor name based on the running desktop """ - pkg = get_ubuntu_flavor_package(cache=cache) - lookup = {'ubuntustudio-desktop': 'Ubuntu Studio'} - if pkg in lookup: - return lookup[pkg] - elif pkg.endswith('-desktop'): - return capitalize_first_word(pkg.rsplit('-desktop', 1)[0]) - elif pkg.endswith('-netbook'): - return capitalize_first_word(pkg.rsplit('-netbook', 1)[0]) - else: - return 'Ubuntu' - - -# Unused by update-manager, but still used by ubuntu-release-upgrader def error(parent, summary, message): - import gi - gi.require_version("Gtk", "3.0") - from gi.repository import Gtk, Gdk - d = Gtk.MessageDialog(parent=parent, - flags=Gtk.DialogFlags.MODAL, - type=Gtk.MessageType.ERROR, - buttons=Gtk.ButtonsType.CLOSE) - d.set_markup("%s\n\n%s" % (summary, message)) - d.realize() - d.get_window().set_functions(Gdk.WMFunction.MOVE) - d.set_title("") - d.run() - d.destroy() - return False - + from gi.repository import Gtk, Gdk + d = Gtk.MessageDialog(parent=parent, + flags=Gtk.DialogFlags.MODAL, + type=Gtk.MessageType.ERROR, + buttons=Gtk.ButtonsType.CLOSE) + d.set_markup("%s\n\n%s" % (summary, message)) + d.realize() + d.get_window().set_functions(Gdk.WMFunction.MOVE) + d.set_title("") + d.run() + d.destroy() + return False def humanize_size(bytes): """ @@ -468,19 +393,16 @@ """ if bytes < 1000 * 1000: - # to have 0 for 0 bytes, 1 for 0-1000 bytes and for 1 and above - # round up - size_in_kb = int(ceil(bytes / float(1000))) + # to have 0 for 0 bytes, 1 for 0-1000 bytes and for 1 and above round up + size_in_kb = int(ceil(bytes/float(1000))); # TRANSLATORS: download size of small updates, e.g. "250 kB" - return ngettext("%(size).0f kB", "%(size).0f kB", size_in_kb) % { - "size": size_in_kb} + return ngettext("%(size).0f kB", "%(size).0f kB", size_in_kb) % { "size" : size_in_kb } else: # TRANSLATORS: download size of updates, e.g. "2.3 MB" return locale.format_string(_("%.1f MB"), bytes / 1000.0 / 1000.0) - def get_arch(): - return apt_pkg.config.find("APT::Architecture") + return apt_pkg.Config.find("APT::Architecture") def is_port_already_listening(port): @@ -492,68 +414,48 @@ # state (st) that we care about STATE_LISTENING = '0A' # read the data - with open("/proc/net/tcp") as net_tcp: - for line in net_tcp.readlines(): - line = line.strip() - if not line: - continue - # split, values are: - # sl local_address rem_address st tx_queue rx_queue tr - # tm->when retrnsmt uid timeout inode - values = line.split() - state = values[INDEX_STATE] - if state != STATE_LISTENING: - continue - local_port_str = values[INDEX_LOCAL_ADDR].split(":")[1] - local_port = int(local_port_str, 16) - if local_port == port: - return True + for line in open("/proc/net/tcp"): + line = line.strip() + if not line: + continue + # split, values are: + # sl local_address rem_address st tx_queue rx_queue tr tm->when retrnsmt uid timeout inode + values = line.split() + state = values[INDEX_STATE] + if state != STATE_LISTENING: + continue + local_port_str = values[INDEX_LOCAL_ADDR].split(":")[1] + local_port = int(local_port_str, 16) + if local_port == port: + return True return False def iptables_active(): """ Return True if iptables is active """ # FIXME: is there a better way? - iptables_empty = """Chain INPUT (policy ACCEPT) -target prot opt source destination + iptables_empty="""Chain INPUT (policy ACCEPT) +target prot opt source destination Chain FORWARD (policy ACCEPT) -target prot opt source destination +target prot opt source destination Chain OUTPUT (policy ACCEPT) -target prot opt source destination +target prot opt source destination """ if os.getuid() != 0: - raise OSError("Need root to check the iptables state") + raise OSError, "Need root to check the iptables state" if not os.path.exists("/sbin/iptables"): return False - out = subprocess.Popen(["iptables", "-nL"], - stdout=subprocess.PIPE, - universal_newlines=True).communicate()[0] + out = subprocess.Popen(["iptables", "-L"], + stdout=subprocess.PIPE).communicate()[0] if out == iptables_empty: return False return True -def capitalize_first_word(string): - """ this uppercases the first word's first letter - """ - if len(string) > 1 and string[0].isalpha() and not string[0].isupper(): - return string[0].capitalize() + string[1:] - return string - - -def get_package_label(pkg): - """ this takes a package synopsis and uppercases the first word's - first letter - """ - name = getattr(pkg.candidate, "summary", "") - return capitalize_first_word(name) - - if __name__ == "__main__": - #print(mirror_from_sources_list()) - #print(on_battery()) - #print(inside_chroot()) - #print(iptables_active()) - error(None, "bar", "baz") + #print mirror_from_sources_list() + #print on_battery() + #print inside_chroot() + print iptables_active() diff -Nru update-manager-17.10.11/UpdateManager/dialog_release_notes.ui update-manager-0.156.14.15/UpdateManager/dialog_release_notes.ui --- update-manager-17.10.11/UpdateManager/dialog_release_notes.ui 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/dialog_release_notes.ui 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,70 @@ + + Dialog + + + + 0 + 0 + 643 + 476 + + + + Dialog + + + + + + true + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + buttonBox + accepted() + Dialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + Dialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff -Nru update-manager-17.10.11/UpdateManager/Dialogs.py update-manager-0.156.14.15/UpdateManager/Dialogs.py --- update-manager-17.10.11/UpdateManager/Dialogs.py 2017-09-05 21:00:45.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/Dialogs.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,397 +0,0 @@ -# Dialogs.py -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# Copyright (c) 2012 Canonical -# -# Author: Michael Terry -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA - -from __future__ import absolute_import, print_function - -import gi -gi.require_version("Gtk", "3.0") -from gi.repository import Gtk -from gi.repository import Gdk -import warnings -warnings.filterwarnings( - "ignore", "Accessed deprecated property", DeprecationWarning) - -import logging -import datetime -import dbus -import os - -import HweSupportStatus.consts -from .Core.LivePatchSocket import LivePatchSocket - -from gettext import gettext as _ -from gettext import ngettext - - -class Dialog(object): - def __init__(self, window_main): - self.window_main = window_main - - def start(self): - pass - - def close(self): - return self.stop() - - def stop(self): - pass - - def run(self, parent=None): - pass - - -class BuilderDialog(Dialog, Gtk.Alignment): - def __init__(self, window_main, ui_path, root_widget): - Dialog.__init__(self, window_main) - Gtk.Alignment.__init__(self) - - builder = self._load_ui(ui_path, root_widget) - self.add(builder.get_object(root_widget)) - self.show() - - def _load_ui(self, path, root_widget, domain="update-manager"): - builder = Gtk.Builder() - builder.set_translation_domain(domain) - builder.add_objects_from_file(path, [root_widget]) - builder.connect_signals(self) - - for o in builder.get_objects(): - if issubclass(type(o), Gtk.Buildable): - name = Gtk.Buildable.get_name(o) - setattr(self, name, o) - else: - logging.debug("WARNING: can not get name for '%s'" % o) - - return builder - - def run(self, parent=None): - # FIXME: THIS WILL CRASH! - if parent: - self.window_dialog.set_transient_for(parent) - self.window_dialog.set_modal(True) - self.window_dialog.run() - - -class InternalDialog(BuilderDialog): - def __init__(self, window_main, content_widget=None): - ui_path = os.path.join(window_main.datadir, "gtkbuilder/Dialog.ui") - BuilderDialog.__init__(self, window_main, ui_path, "pane_dialog") - - self.focus_button = None - self.set_content_widget(content_widget) - self.connect("realize", self._on_realize) - - def _on_realize(self, user_data): - if self.focus_button: - self.focus_button.set_can_default(True) - self.focus_button.set_can_focus(True) - self.focus_button.grab_default() - self.focus_button.grab_focus() - - def add_button(self, label, callback, secondary=False): - # from_stock tries stock first and falls back to mnemonic - button = Gtk.Button.new_from_stock(label) - button.connect("clicked", lambda x: callback()) - button.show() - self.buttonbox.add(button) - self.buttonbox.set_child_secondary(button, secondary) - return button - - def add_settings_button(self): - if os.path.exists("/usr/bin/software-properties-gtk"): - return self.add_button(_("Settings…"), - self.on_settings_button_clicked, - secondary=True) - else: - return None - - def on_settings_button_clicked(self): - self.window_main.show_settings() - - def set_header(self, label): - if label: - self.label_header.set_markup( - "%s" % label) - self.label_header.set_visible(bool(label)) - - def set_desc(self, label): - if label: - self.label_desc.set_markup(label) - self.label_desc.set_visible(bool(label)) - - def set_content_widget(self, content_widget): - if content_widget: - self.main_container.add(content_widget) - self.main_container.set_visible(bool(content_widget)) - - def on_livepatch_status_ready(self, active, cs, ps, fixes): - self.set_desc(None) - - if not active: - return - - needs_reschedule = False - - if cs == "needs-check": - needs_reschedule = True - elif cs == "check-failed": - pass - elif cs == "checked": - if ps == "unapplied" or ps == "applying": - needs_reschedule = True - elif ps == "applied": - fixes = [fix for fix in fixes if fix.patched] - d = ngettext("%d Livepatch update applied since the last " - "restart.", - "%d Livepatch updates applied since the last " - "restart.", - len(fixes)) % len(fixes) - self.set_desc(d) - elif ps == "applied-with-bug" or ps == "apply-failed": - fixes = [fix for fix in fixes if fix.patched] - d = ngettext("%d Livepatch update failed to apply since the " - "last restart.", - "%d Livepatch updates failed to apply since the " - "last restart.", - len(fixes)) % len(fixes) - self.set_desc(d) - elif ps == "nothing-to-apply": - pass - elif ps == "unknown": - pass - - if needs_reschedule: - self.lp_socket.get_status(self.on_livepatch_status_ready) - - def check_livepatch_status(self): - self.lp_socket = LivePatchSocket() - self.lp_socket.get_status(self.on_livepatch_status_ready) - - -class StoppedUpdatesDialog(InternalDialog): - def __init__(self, window_main): - InternalDialog.__init__(self, window_main) - self.set_header(_("You stopped the check for updates.")) - self.add_settings_button() - self.add_button(_("_Check Again"), self.check) - self.focus_button = self.add_button(Gtk.STOCK_OK, - self.window_main.close) - - def check(self): - self.window_main.start_update() - - -class NoUpdatesDialog(InternalDialog): - def __init__(self, window_main, error_occurred=False): - InternalDialog.__init__(self, window_main) - if error_occurred: - self.set_header(_("No software updates are available.")) - else: - self.set_header(_("The software on this computer is up to date.")) - self.add_settings_button() - self.focus_button = self.add_button(Gtk.STOCK_OK, - self.window_main.close) - self.check_livepatch_status() - - -class DistUpgradeDialog(InternalDialog): - def __init__(self, window_main, meta_release): - InternalDialog.__init__(self, window_main) - self.meta_release = meta_release - self.set_header(_("The software on this computer is up to date.")) - # Translators: these are Ubuntu version names like "Ubuntu 12.04" - self.set_desc(_("However, %s %s is now available (you have %s).") % ( - meta_release.flavor_name, - meta_release.upgradable_to.version, - meta_release.current_dist_version)) - self.add_settings_button() - self.add_button(_("Upgrade…"), self.upgrade) - self.focus_button = self.add_button(Gtk.STOCK_OK, - self.window_main.close) - - def upgrade(self): - # Pass on several arguments - extra_args = "" - if self.window_main and self.window_main.options: - if self.window_main.options.devel_release: - extra_args = extra_args + " -d" - if self.window_main.options.use_proposed: - extra_args = extra_args + " -p" - os.execl("/bin/sh", "/bin/sh", "-c", - "/usr/bin/pkexec /usr/bin/do-release-upgrade " - "--frontend=DistUpgradeViewGtk3%s" % extra_args) - - -class HWEUpgradeDialog(InternalDialog): - def __init__(self, window_main): - InternalDialog.__init__(self, window_main) - self.set_header(_("New important security and hardware support " - "update.")) - if datetime.date.today() < HweSupportStatus.consts.HWE_EOL_DATE: - self.set_desc(_(HweSupportStatus.consts.Messages.HWE_SUPPORT_ENDS)) - else: - self.set_desc( - _(HweSupportStatus.consts.Messages.HWE_SUPPORT_HAS_ENDED)) - self.add_settings_button() - self.add_button(_("_Install…"), self.install) - self.focus_button = self.add_button(Gtk.STOCK_OK, - self.window_main.close) - - def install(self): - self.window_main.start_install(hwe_upgrade=True) - - -class UnsupportedDialog(DistUpgradeDialog): - def __init__(self, window_main, meta_release): - DistUpgradeDialog.__init__(self, window_main, meta_release) - # Translators: this is an Ubuntu version name like "Ubuntu 12.04" - self.set_header(_("Software updates are no longer provided for " - "%s %s.") % (meta_release.flavor_name, - meta_release.current_dist_version)) - # Translators: this is an Ubuntu version name like "Ubuntu 12.04" - self.set_desc(_("To stay secure, you should upgrade to %s %s.") % ( - meta_release.flavor_name, - meta_release.upgradable_to.version)) - - def run(self, parent): - # This field is used in tests/test_end_of_life.py - self.window_main.no_longer_supported_nag = self.window_dialog - DistUpgradeDialog.run(self, parent) - - -class PartialUpgradeDialog(InternalDialog): - def __init__(self, window_main): - InternalDialog.__init__(self, window_main) - self.set_header(_("Not all updates can be installed")) - self.set_desc(_( - """Run a partial upgrade, to install as many updates as possible. - - This can be caused by: - * A previous upgrade which didn't complete - * Problems with some of the installed software - * Unofficial software packages not provided by Ubuntu - * Normal changes of a pre-release version of Ubuntu""")) - self.add_settings_button() - self.add_button(_("_Partial Upgrade"), self.upgrade) - self.focus_button = self.add_button(_("_Continue"), Gtk.main_quit) - - def upgrade(self): - os.execl("/bin/sh", "/bin/sh", "-c", - "/usr/bin/pkexec " - "/usr/lib/ubuntu-release-upgrader/do-partial-upgrade " - "--frontend=DistUpgradeViewGtk3") - - def start(self): - Dialog.start(self) - # Block progress until user has answered this question - Gtk.main() - - -class ErrorDialog(InternalDialog): - def __init__(self, window_main, header, desc=None): - InternalDialog.__init__(self, window_main) - self.set_header(header) - if desc: - self.set_desc(desc) - self.label_desc.set_selectable(True) - self.add_settings_button() - self.focus_button = self.add_button(Gtk.STOCK_OK, - self.window_main.close) - - def start(self): - Dialog.start(self) - # The label likes to start selecting everything (b/c it got focus - # before we switched to our default button). - self.label_desc.select_region(0, 0) - - -class UpdateErrorDialog(ErrorDialog): - def __init__(self, window_main, header, desc=None): - ErrorDialog.__init__(self, window_main, header, desc) - # Get rid of normal error dialog button before adding our own - self.focus_button.destroy() - self.add_button(_("_Try Again"), self.update) - self.focus_button = self.add_button(Gtk.STOCK_OK, self.available) - - def update(self): - self.window_main.start_update() - - def available(self): - self.window_main.start_available(error_occurred=True) - - -class NeedRestartDialog(InternalDialog): - def __init__(self, window_main): - InternalDialog.__init__(self, window_main) - self.set_header( - _("The computer needs to restart to finish installing updates.")) - self.add_settings_button() - self.focus_button = self.add_button(_("Restart _Later"), - self.window_main.close) - self.add_button(_("_Restart Now"), self.restart) - - def start(self): - Dialog.start(self) - # Turn off close button - self.window_main.realize() - self.window_main.get_window().set_functions(Gdk.WMFunction.MOVE | - Gdk.WMFunction.MINIMIZE) - - def restart(self, *args, **kwargs): - self._request_reboot_via_session_manager() - self.window_main.close() - - def _request_reboot_via_session_manager(self): - try: - bus = dbus.SessionBus() - proxy_obj = bus.get_object("org.gnome.SessionManager", - "/org/gnome/SessionManager") - iface = dbus.Interface(proxy_obj, "org.gnome.SessionManager") - iface.RequestReboot() - except dbus.DBusException: - self._request_reboot_via_consolekit() - except Exception as e: - pass - - def _request_reboot_via_consolekit(self): - try: - bus = dbus.SystemBus() - proxy_obj = bus.get_object("org.freedesktop.ConsoleKit", - "/org/freedesktop/ConsoleKit/Manager") - iface = dbus.Interface( - proxy_obj, "org.freedesktop.ConsoleKit.Manager") - iface.Restart() - except dbus.DBusException: - self._request_reboot_via_logind() - except Exception as e: - pass - - def _request_reboot_via_logind(self): - try: - bus = dbus.SystemBus() - proxy_obj = bus.get_object("org.freedesktop.login1", - "/org/freedesktop/login1") - iface = dbus.Interface( - proxy_obj, "org.freedesktop.login1.Manager") - iface.Reboot(True) - except dbus.DBusException: - pass diff -Nru update-manager-17.10.11/UpdateManager/DistUpgradeFetcherKDE.py update-manager-0.156.14.15/UpdateManager/DistUpgradeFetcherKDE.py --- update-manager-17.10.11/UpdateManager/DistUpgradeFetcherKDE.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/DistUpgradeFetcherKDE.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,181 @@ +# DistUpgradeFetcherKDE.py +# +# Copyright (c) 2008 Canonical Ltd +# +# Author: Jonathan Riddell +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +from PyKDE4.kdecore import ki18n, KAboutData, KCmdLineOptions, KCmdLineArgs +from PyKDE4.kdeui import KIcon, KMessageBox, KApplication, KStandardGuiItem +from PyQt4.QtCore import QDir, QTimer +from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt4 import uic + +import apt_pkg +import sys + +from Core.utils import inhibit_sleep, allow_sleep +from Core.DistUpgradeFetcherCore import DistUpgradeFetcherCore +from gettext import gettext as _ +import urllib2 +import os + +from Core.MetaRelease import MetaReleaseCore +import time +import apt + +class DistUpgradeFetcherKDE(DistUpgradeFetcherCore): + """A small application run by Adept to download, verify + and run the dist-upgrade tool""" + + def __init__(self, useDevelopmentRelease=False, useProposed=False): + self.useDevelopmentRelease = useDevelopmentRelease + self.useProposed = useProposed + metaRelease = MetaReleaseCore(useDevelopmentRelease, useProposed) + while metaRelease.downloading: + time.sleep(0.2) + if metaRelease.new_dist is None and __name__ == "__main__": + sys.exit() + elif metaRelease.new_dist is None: + return + + self.progressDialogue = QDialog() + if os.path.exists("fetch-progress.ui"): + self.APPDIR = QDir.currentPath() + else: + self.APPDIR = "/usr/share/update-manager" + + uic.loadUi(self.APPDIR + "/fetch-progress.ui", self.progressDialogue) + self.progressDialogue.setWindowIcon(KIcon("system-software-update")) + self.progressDialogue.setWindowTitle(_("Upgrade")) + self.progress = KDEFetchProgressAdapter(self.progressDialogue.installationProgress, self.progressDialogue.installingLabel, None) + DistUpgradeFetcherCore.__init__(self,metaRelease.new_dist,self.progress) + + def error(self, summary, message): + KMessageBox.sorry(None, message, summary) + + def runDistUpgrader(self): + inhibit_sleep() + # now run it with sudo + if os.getuid() != 0: + os.execv("/usr/bin/kdesudo",["kdesudo", self.script + " --frontend=DistUpgradeViewKDE"]) + else: + os.execv(self.script,[self.script]+ ["--frontend=DistUpgradeViewKDE"] + self.run_options) + # we shouldn't come to this point, but if we do, undo our + # inhibit sleep + allow_sleep() + + def showReleaseNotes(self): + # FIXME: care about i18n! (append -$lang or something) + self.dialogue = QDialog() + uic.loadUi(self.APPDIR + "/dialog_release_notes.ui", self.dialogue) + upgradeButton = self.dialogue.buttonBox.button(QDialogButtonBox.Ok) + upgradeButton.setText(_("Upgrade")) + upgradeButton.setIcon(KIcon("dialog-ok")) + cancelButton = self.dialogue.buttonBox.button(QDialogButtonBox.Cancel) + cancelButton.setIcon(KIcon("dialog-cancel")) + self.dialogue.setWindowTitle(_("Release Notes")) + self.dialogue.show() + if self.new_dist.releaseNotesURI != None: + uri = self._expandUri(self.new_dist.releaseNotesURI) + # download/display the release notes + # FIXME: add some progress reporting here + result = None + try: + release_notes = urllib2.urlopen(uri) + notes = release_notes.read() + self.dialogue.scrolled_notes.setText(notes) + result = self.dialogue.exec_() + except urllib2.HTTPError: + primary = "%s" % \ + _("Could not find the release notes") + secondary = _("The server may be overloaded. ") + KMessageBox.sorry(None, primary + "
" + secondary, "") + except IOError: + primary = "%s" % \ + _("Could not download the release notes") + secondary = _("Please check your internet connection.") + KMessageBox.sorry(None, primary + "
" + secondary, "") + # user clicked cancel + if result == QDialog.Accepted: + self.progressDialogue.show() + return True + if __name__ == "__main__": + KApplication.kApplication().exit(1) + if self.useDevelopmentRelease or self.useProposed: + sys.exit() #FIXME why does KApplication.kApplication().exit() crash but this doesn't? + return False + +class KDEFetchProgressAdapter(apt.progress.FetchProgress): + def __init__(self,progress,label,parent): + self.progress = progress + self.label = label + self.parent = parent + + def start(self): + self.label.setText(_("Downloading additional package files...")) + self.progress.setValue(0) + + def stop(self): + pass + + def pulse(self): + apt.progress.FetchProgress.pulse(self) + self.progress.setValue(self.percent) + currentItem = self.currentItems + 1 + if currentItem > self.totalItems: + currentItem = self.totalItems + if self.currentCPS > 0: + self.label.setText(_("Downloading additional package files...") + _("File %s of %s at %sB/s") % (self.currentItems,self.totalItems,apt_pkg.SizeToStr(self.currentCPS))) + else: + self.label.setText(_("Downloading additional package files...") + _("File %s of %s") % (self.currentItems,self.totalItems)) + KApplication.kApplication().processEvents() + return True + + def mediaChange(self, medium, drive): + msg = _("Please insert '%s' into the drive '%s'") % (medium,drive) + #change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) + change = KMessageBox.questionYesNo(None, _("Media Change"), _("Media Change") + "
" + msg, KStandardGuiItem.ok(), KStandardGuiItem.cancel()) + if change == KMessageBox.Yes: + return True + return False + +if __name__ == "__main__": + + appName = "dist-upgrade-fetcher" + catalog = "" + programName = ki18n ("Dist Upgrade Fetcher") + version = "0.3.4" + description = ki18n ("Dist Upgrade Fetcher") + license = KAboutData.License_GPL + copyright = ki18n ("(c) 2008 Canonical Ltd") + text = ki18n ("none") + homePage = "https://launchpad.net/update-manager" + bugEmail = "" + + aboutData = KAboutData (appName, catalog, programName, version, description, license, copyright, text, homePage, bugEmail) + + aboutData.addAuthor(ki18n("Jonathan Riddell"), ki18n("Author")) + + options = KCmdLineOptions() + + KCmdLineArgs.init (sys.argv, aboutData) + KCmdLineArgs.addCmdLineOptions(options) + + app = KApplication() + fetcher = DistUpgradeFetcherKDE() + QTimer.singleShot(10, fetcher.run) + + app.exec_() diff -Nru update-manager-17.10.11/UpdateManager/DistUpgradeFetcher.py update-manager-0.156.14.15/UpdateManager/DistUpgradeFetcher.py --- update-manager-17.10.11/UpdateManager/DistUpgradeFetcher.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/DistUpgradeFetcher.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,140 @@ +# DistUpgradeFetcher.py +# +# Copyright (c) 2006 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +from gi.repository import Gtk, Gdk + +from ReleaseNotesViewer import ReleaseNotesViewer +from Core.utils import error, inhibit_sleep, allow_sleep +from Core.DistUpgradeFetcherCore import DistUpgradeFetcherCore +from gettext import gettext as _ +import urllib2 +import os +import socket + + +class DistUpgradeFetcherGtk(DistUpgradeFetcherCore): + + def __init__(self, new_dist, progress, parent): + DistUpgradeFetcherCore.__init__(self,new_dist,progress) + self.parent = parent + self.window_main = parent.window_main + + def error(self, summary, message): + return error(self.window_main, summary, message) + + def runDistUpgrader(self): + inhibit_sleep() + # now run it with sudo + if os.getuid() != 0: + os.execv("/usr/bin/gksu",["gksu", + "--desktop","/usr/share/applications/update-manager.desktop", + "--", + self.script]+self.run_options) + else: + os.execv(self.script,[self.script]+self.run_options) + # we shouldn't come to this point, but if we do, undo our + # inhibit sleep + allow_sleep() + + def showReleaseNotes(self): + # first try showing the webkit version, this may fail (return None + # because e.g. there is no webkit installed) + res = self._try_show_release_notes_webkit() + if res is not None: + return res + else: + # fallback to text + return self._try_show_release_notes_textview() + + def _try_show_release_notes_webkit(self): + if self.new_dist.releaseNotesHtmlUri is not None: + try: + from ReleaseNotesViewerWebkit import ReleaseNotesViewerWebkit + webkit_release_notes = ReleaseNotesViewerWebkit(self.new_dist.releaseNotesHtmlUri) + webkit_release_notes.show() + self.parent.scrolled_notes.add(webkit_release_notes) + res = self.parent.dialog_release_notes.run() + self.parent.dialog_release_notes.hide() + if res == Gtk.ResponseType.OK: + return True + return False + except ImportError: + pass + return None + + def _try_show_release_notes_textview(self): + # FIXME: care about i18n! (append -$lang or something) + if self.new_dist.releaseNotesURI != None: + uri = self._expandUri(self.new_dist.releaseNotesURI) + self.window_main.set_sensitive(False) + self.window_main.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.WATCH)) + while Gtk.events_pending(): + Gtk.main_iteration() + + # download/display the release notes + # FIXME: add some progress reporting here + res = Gtk.ResponseType.CANCEL + timeout = socket.getdefaulttimeout() + try: + socket.setdefaulttimeout(5) + release_notes = urllib2.urlopen(uri) + notes = release_notes.read() + textview_release_notes = ReleaseNotesViewer(notes) + textview_release_notes.show() + self.parent.scrolled_notes.add(textview_release_notes) + self.parent.dialog_release_notes.set_transient_for(self.window_main) + res = self.parent.dialog_release_notes.run() + self.parent.dialog_release_notes.hide() + except urllib2.HTTPError: + primary = "%s" % \ + _("Could not find the release notes") + secondary = _("The server may be overloaded. ") + dialog = Gtk.MessageDialog(self.window_main,Gtk.DialogFlags.MODAL, + Gtk.MessageType.ERROR,Gtk.ButtonsType.CLOSE,"") + dialog.set_title("") + dialog.set_markup(primary); + dialog.format_secondary_text(secondary); + dialog.run() + dialog.destroy() + except IOError: + primary = "%s" % \ + _("Could not download the release notes") + secondary = _("Please check your internet connection.") + dialog = Gtk.MessageDialog(self.window_main,Gtk.DialogFlags.MODAL, + Gtk.MessageType.ERROR,Gtk.ButtonsType.CLOSE,"") + dialog.set_title("") + dialog.set_markup(primary); + dialog.format_secondary_text(secondary); + dialog.run() + dialog.destroy() + socket.setdefaulttimeout(timeout) + self.window_main.set_sensitive(True) + self.window_main.get_window().set_cursor(None) + # user clicked cancel + if res == Gtk.ResponseType.OK: + return True + return False + +if __name__ == "__main__": + error(None, "summary","message") + d = DistUpgradeFetcherGtk(None,None) + print d.authenticate('/tmp/Release','/tmp/Release.gpg') + diff -Nru update-manager-17.10.11/UpdateManager/fdsend/ChangeLog update-manager-0.156.14.15/UpdateManager/fdsend/ChangeLog --- update-manager-17.10.11/UpdateManager/fdsend/ChangeLog 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/fdsend/ChangeLog 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,5 @@ +# fdsend ChangeLog +# $Id: ChangeLog,v 1.1.1.1 2004/11/04 06:15:03 mjp Exp $ + +03 Nov 2004 + - 0.1 first release diff -Nru update-manager-17.10.11/UpdateManager/fdsend/COPYING update-manager-0.156.14.15/UpdateManager/fdsend/COPYING --- update-manager-17.10.11/UpdateManager/fdsend/COPYING 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/fdsend/COPYING 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff -Nru update-manager-17.10.11/UpdateManager/fdsend/fdsend.c update-manager-0.156.14.15/UpdateManager/fdsend/fdsend.c --- update-manager-17.10.11/UpdateManager/fdsend/fdsend.c 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/fdsend/fdsend.c 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,363 @@ +/* fdsend - SCM_RIGHTS file descriptor passing for Python. + * + * $Id: fdsend.c,v 1.1.1.1 2004/11/04 06:15:03 mjp Exp $ + * + * Copyright (C) 2004 Michael J. Pomraning + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Portions of this file -- preliminary defines and socketpair() routine -- + * are derived from scgi version 1.2, which is is Copyright (c) 2004 + * Corporation for National Research Initiatives; All Rights Reserved. + */ + +#include "Python.h" + +#ifndef __OpenBSD__ +#ifndef _XOPEN_SOURCE +#define _XOPEN_SOURCE 500 +#endif +#ifndef _XOPEN_SOURCE_EXTENDED +#define _XOPEN_SOURCE_EXTENDED 1 /* Solaris <= 2.7 needs this too */ +#endif +#endif /* __OpenBSD__ */ + +#include +#include +#include +#include + +static PyObject *socketmodule_error = NULL; + +/* obj2fd + * + * A PyArg_Parse... format converter. + */ +static int +obj2fd(PyObject *o, void *p) { + int fd = -1; + + if (o == Py_None) + goto okay; + + if ((fd = PyObject_AsFileDescriptor(o)) == -1) + return 0; +okay: + *(int *)p = fd; + + return 1; +} + +/* pack_control + * + * Cram a sequence of open files (or file descriptors) into the ancillary + * data of a msghdr. Note that the msg_control member is dynamically + * allocated by this function, and may be freed by a call to + * free_packed_control(). + */ +static int +pack_control(PyObject *seq, struct msghdr *msg) { + PyObject *fast_seq = NULL; + int i, sz; + int *fd_ptr = NULL; + struct cmsghdr *cmsg; + int ok = 0; + + fast_seq = PySequence_Fast(seq, "files argument must be a sequence"); + if (NULL == fast_seq) return 0; + + sz = PySequence_Fast_GET_SIZE(fast_seq); + if (0 == sz) { + msg->msg_controllen = 0; + msg->msg_control = NULL; + return 1; + } + msg->msg_controllen = CMSG_SPACE(sizeof(int) * sz); + msg->msg_control = PyMem_Malloc(msg->msg_controllen); + if (NULL == msg->msg_control) return 0; + + cmsg = CMSG_FIRSTHDR(msg); + cmsg->cmsg_len = CMSG_LEN(sizeof(int) * sz); + cmsg->cmsg_level = SOL_SOCKET; + cmsg->cmsg_type = SCM_RIGHTS; + fd_ptr = (int *)CMSG_DATA(cmsg); + for (i = 0; i < sz; i++) { + PyObject *f; + int fd; + + f = PySequence_Fast_GET_ITEM(fast_seq, i); + if (f == NULL) goto error; + if ((fd = PyObject_AsFileDescriptor(f)) == -1) goto error; + *fd_ptr = fd; + fd_ptr++; + } + ok = 1; + +out: + Py_DECREF(fast_seq); + return ok; + +error: + ok = 0; + if (msg->msg_control) PyMem_Free(msg->msg_control); + goto out; +} + +static void +free_packed_control(struct msghdr *msg) +{ + if (NULL == msg) return; + if (msg->msg_control) PyMem_Free(msg->msg_control); + return; +} + +/* unpack_control + * + * Unpack the ancillary data, assuming SCM_RIGHTS (file descriptor passing). + * + * Be prepared for: + * - more than one cmsghdr + * - more than one fd per cmsghdr + */ +static PyObject * +unpack_control(struct msghdr *msg) { + struct cmsghdr *cmsg; + int i = 0; + PyObject *tup = NULL; + + for (cmsg = CMSG_FIRSTHDR(msg); + cmsg != NULL; + cmsg = CMSG_NXTHDR(msg,cmsg)) { + if (cmsg->cmsg_level != SOL_SOCKET + || cmsg->cmsg_type != SCM_RIGHTS) { + PyErr_SetString(PyExc_RuntimeError, + "Unexpected cmsg level or type found"); + goto error; + } + i += (cmsg->cmsg_len - sizeof(struct cmsghdr))/sizeof(int); + } + + tup = PyTuple_New(i); + if (NULL == tup) goto error; + + i = 0; + for (cmsg = CMSG_FIRSTHDR(msg); + cmsg != NULL; + cmsg = CMSG_NXTHDR(msg,cmsg)) { + int j; + int *pfd = (int *)CMSG_DATA(cmsg); + int upper_bound; + upper_bound = cmsg->cmsg_len + - sizeof(struct cmsghdr) + - sizeof(int); + for (j = 0; j <= upper_bound; j += sizeof(int)) { + PyTuple_SET_ITEM(tup, i, PyLong_FromLong((long)pfd[i])); + i++; + } + } + return tup; +error: + if (tup) { Py_DECREF(tup); } + + return NULL; +} + +static PyObject * +fdsend_sendfds(PyObject *dummy, PyObject *args, PyObject *kw) +{ + struct msghdr mh; + struct iovec iov; + int fd, r, flags = 0; + PyObject *fds = Py_None; + + static char *keywords[] = {"fd", "msg", "flags", "fds", 0}; + if (!PyArg_ParseTupleAndKeywords(args, kw, "O&s#|iO:sendfds", + keywords, + obj2fd, &fd, + &iov.iov_base, &iov.iov_len, + &flags, &fds)) + return NULL; + + memset(&mh, '\0', sizeof(mh)); + mh.msg_iov = &iov; + mh.msg_iovlen = 1; + + if (fds != Py_None) { + if (! pack_control(fds, &mh)) return NULL; + } + Py_BEGIN_ALLOW_THREADS + r = sendmsg(fd, &mh, flags); + Py_END_ALLOW_THREADS + free_packed_control(&mh); + + if (r < 0) + return PyErr_SetFromErrno(socketmodule_error); + + return PyInt_FromLong((long) r); +} + +static PyObject * +fdsend_recvfds(PyObject *dummy, PyObject *args, PyObject *kw) +{ + struct msghdr mh; + struct iovec iov; + struct cmsghdr *cmsg; + PyObject *buf; + int numfds = 32; + int fd, r, flags = 0; + PyObject *ret = NULL; + + static char *keywords[] = {"fd", "len", "flags", "numfds", 0}; + if (!PyArg_ParseTupleAndKeywords(args, kw, "O&i|ii:recvfds", keywords, + obj2fd, &fd, &iov.iov_len, &flags, + &numfds)) + return NULL; + + memset(&mh, '\0', sizeof(mh)); + + if (numfds > 0) { + mh.msg_controllen = CMSG_SPACE(sizeof(int) * numfds); + mh.msg_control = PyMem_Malloc(mh.msg_controllen); + if (NULL == mh.msg_control) return NULL; + } + + buf = PyString_FromStringAndSize((char *) 0, iov.iov_len); + if (NULL == buf) goto error; + iov.iov_base = (void *)PyString_AS_STRING(buf); + /* uncomment the following for clearer strace(1)ing */ + /* memset(iov.iov_base, '\0', iov.iov_len); */ + + mh.msg_iov = &iov; + mh.msg_iovlen = 1; + + Py_BEGIN_ALLOW_THREADS + r = recvmsg(fd, &mh, flags); + Py_END_ALLOW_THREADS + + if (r < 0) { + PyErr_SetFromErrno(socketmodule_error); + goto error; + } + + if (r != iov.iov_len) + _PyString_Resize(&buf, r); + cmsg = CMSG_FIRSTHDR(&mh); + if (NULL == cmsg + || cmsg->cmsg_level != SOL_SOCKET + || cmsg->cmsg_type != SCM_RIGHTS) + return Py_BuildValue("(N())", buf); + + ret = Py_BuildValue("(OO)", buf, unpack_control(&mh)); + +out: + if (mh.msg_control) PyMem_Free(mh.msg_control); + return ret; + +error: + if (buf) { Py_DECREF(buf); } + goto out; +} + +static char fdsend_sendfds__doc__[] = +"sendfds(fd, msg, flags=0, fds=None) -> bytes_sent\n" +"\n" +"Send msg across the socket represented by fd, optionally accompanied by a\n" +"sequence (tuple or list) of open file handles. For example:\n" +"\n" +" >>> devnull = file(\"/dev/null\")\n" +" >>> sendfds(the_socket, \"null device\", (devnull,))\n" +"\n" +"The socket fd and members of the fds sequence may be any representation\n" +"described in the module docstring.\n" +"\n" +"Note that most underlying implementations require at least a one byte msg\n" +"to transmit open files."; + +static char fdsend_recvfds__doc__[] = +"recvfds(fd, len, flags=0, numfds=64) -> (message, fd_tuple)\n" +"\n" +"Receive a message of up to length len and up to numfds new files from socket\n" +"object fd.\n" +"\n" +"Though the socket object may be given as any of the representations listed\n" +"in the module docstring, new files returned in fd_tuple are always integral\n" +"file descriptors. See os.fdopen for a means of transforming them into\n" +"Python file objects.\n" +"\n" +"There is presently no way to detect msg_flags values (e.g., MSG_CTRUNC)."; + +static char socketpair__doc__[] = +"socketpair(family, type, proto=0) -> (fd, fd)\n" +"\n" +"Provided as a convenience for Python versions lacking a socket.socketpair\n" +"implementation."; + +static PyObject * +fdsend_socketpair(PyObject *self, PyObject *args) +{ + int family, type, proto=0; + int fd[2]; + + if (!PyArg_ParseTuple(args, "ii|i:socketpair", &family, &type, &proto)) + return NULL; + + if (socketpair(family, type, proto, fd) < 0) { + PyErr_SetFromErrno(PyExc_IOError); + return NULL; + } + + return Py_BuildValue("(ii)", (long) fd[0], (long) fd[1]); +} + + +/* List of functions */ + +static PyMethodDef fdsend_methods[] = { + {"sendfds", (PyCFunction)fdsend_sendfds, + METH_VARARGS|METH_KEYWORDS, fdsend_sendfds__doc__}, + {"recvfds", (PyCFunction)fdsend_recvfds, + METH_VARARGS|METH_KEYWORDS, fdsend_recvfds__doc__}, + {"socketpair", fdsend_socketpair, METH_VARARGS, socketpair__doc__}, + {NULL, NULL} /* sentinel */ +}; + +static char module__doc__[] = +"fdsend allows the passing of open files between unrelated processes via\n" +"local sockets (using SCM_RIGHTS), a process known as file descriptor\n" +"passing. The following functions are available:\n" +"\n" +" sendfds()\n" +" recvfds()\n" +" socketpair()\n" +"\n" +"Unlike some other simplifications of the sendmsg()/recvmsg() interface,\n" +"fdsend allows multiple files to be transferred in a single operation, and\n" +"permits ordinary socket messages to accompany the files. Additionally,\n" +"fdsend understands bona fide Python sockets and files, as well as objects\n" +"implementing fileno() methods and integers representing file descriptors.\n" +"\n" +"Errors are raised via the socket.error exception object."; + +DL_EXPORT(void) +initfdsend(void) +{ + PyObject *m, *sm; + + /* Create the module and add the functions and documentation */ + m = Py_InitModule3("fdsend", fdsend_methods, module__doc__); + if ((sm = PyImport_ImportModule("socket")) != NULL) { + socketmodule_error = PyObject_GetAttrString(sm, "error"); + } +} diff -Nru update-manager-17.10.11/UpdateManager/fdsend/MANIFEST.in update-manager-0.156.14.15/UpdateManager/fdsend/MANIFEST.in --- update-manager-17.10.11/UpdateManager/fdsend/MANIFEST.in 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/fdsend/MANIFEST.in 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,3 @@ +# $Id: MANIFEST.in,v 1.1.1.1 2004/11/04 06:15:03 mjp Exp $ +include setup.py setup.cfg fdsend.c +include MANIFEST.in COPYING README ChangeLog diff -Nru update-manager-17.10.11/UpdateManager/fdsend/PKG-INFO update-manager-0.156.14.15/UpdateManager/fdsend/PKG-INFO --- update-manager-17.10.11/UpdateManager/fdsend/PKG-INFO 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/fdsend/PKG-INFO 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,10 @@ +Metadata-Version: 1.0 +Name: fdsend +Version: 0.1 +Summary: File descriptor passing (via SCM_RIGHTS) +Home-page: http://pilcrow.madison.wi.us/fdsend +Author: Michael J. Pomraning +Author-email: mjp-py@pilcrow.madison.wi.us +License: GPL +Description: UNKNOWN +Platform: UNKNOWN diff -Nru update-manager-17.10.11/UpdateManager/fdsend/README update-manager-0.156.14.15/UpdateManager/fdsend/README --- update-manager-17.10.11/UpdateManager/fdsend/README 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/fdsend/README 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,51 @@ +fdsend README + +$Id: README,v 1.1.1.1 2004/11/04 06:15:03 mjp Exp $ + +License and Copyright +--------------------- +fdsend is free software, licensed under the GPL. fdsend is Copyright (C) 2004 +Michael J. Pomraning. Small portions of fdsend are adapted from other sources, see the main source file for details. + +docstring +--------- +fdsend allows the passing of open files between unrelated processes via +local sockets (using SCM_RIGHTS), a process known as file descriptor +passing. The following functions are available: + + sendfds() + recvfds() + socketpair() + +Unlike some other simplifications of the sendmsg()/recvmsg() interface, +fdsend allows multiple files to be transferred in a single operation, and +permits ordinary socket messages to accompany the files. Additionally, +fdsend understands bona fide Python sockets and files, as well as objects +implementing fileno() methods and integers representing file descriptors. + +Errors are raised via the socket.error exception object. + +Installation +------------ + $ tar zxf fdsend-$VERSION.tar.gz + $ cd fdsend-$VERSION + $ python setup.py build + $ python setup.py install + +Bugs +---- +No provision is made to support msg_accrights systems (nor I_SENDFD fd +passing). + +Misc +---- +- Please send bug reports to mjp-py{AT}pilcrow.madison.wi.us. +- The usual limitation in "rights" send/recv fd implementations, wherein + msg_iov conveys a single, often hardcoded, byte, is a venerable approach + dating back at least as far as Stevens' APUE examples (1992). For many + applications, it's no limitation at all. +- socketpair() is only for Python versions lacking this under the 'socket' + module. + +Michael J. Pomraning +03 Nov 2004 diff -Nru update-manager-17.10.11/UpdateManager/fdsend/setup.cfg update-manager-0.156.14.15/UpdateManager/fdsend/setup.cfg --- update-manager-17.10.11/UpdateManager/fdsend/setup.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/fdsend/setup.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,11 @@ +# fdsend setup.cfg +# $Id: setup.cfg,v 1.1.1.1 2004/11/04 06:15:03 mjp Exp $ + +[sdist] +force_manifest=1 + +[bdist_rpm] +release = 1 +build-requires = python-devel +group = Development/Libraries +doc-files = README COPYING ChangeLog diff -Nru update-manager-17.10.11/UpdateManager/fdsend/setup.py update-manager-0.156.14.15/UpdateManager/fdsend/setup.py --- update-manager-17.10.11/UpdateManager/fdsend/setup.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/fdsend/setup.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,17 @@ +#!/usr/bin/env python + +# fdsend setup.py +# $Id: setup.py,v 1.1.1.1 2004/11/04 06:15:03 mjp Exp $ + +from distutils.core import setup +from distutils.extension import Extension + +setup(name = "fdsend", + version = "0.1", + description = "File descriptor passing (via SCM_RIGHTS)", + author = "Michael J. Pomraning", + author_email = "mjp-py@pilcrow.madison.wi.us", + url = "http://pilcrow.madison.wi.us/fdsend", + license = "GPL", + ext_modules = [Extension(name="fdsend", sources=['fdsend.c'])], + ) diff -Nru update-manager-17.10.11/UpdateManager/fetch-progress.ui update-manager-0.156.14.15/UpdateManager/fetch-progress.ui --- update-manager-17.10.11/UpdateManager/fetch-progress.ui 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/fetch-progress.ui 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,106 @@ + + Dialog + + + + 0 + 0 + 408 + 129 + + + + Dialog + + + + + + + 0 + + + + + 24 + + + + + + + + + + Qt::Vertical + + + + 397 + 5 + + + + + + + + + + + + + + + + + + + + + + + + + QDialogButtonBox::Close + + + + + + + + + buttonBox + accepted() + Dialog + accept() + + + 271 + 169 + + + 271 + 94 + + + + + buttonBox + rejected() + Dialog + reject() + + + 271 + 169 + + + 271 + 94 + + + + + diff -Nru update-manager-17.10.11/UpdateManager/GtkProgress.py update-manager-0.156.14.15/UpdateManager/GtkProgress.py --- update-manager-17.10.11/UpdateManager/GtkProgress.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/GtkProgress.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,202 @@ +# GtkProgress.py +# +# Copyright (c) 2004,2005 Canonical +# +# Author: Michael Vogt +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +from gi.repository import Gtk, Gdk +import apt +import apt_pkg +from gettext import gettext as _ +from Core.utils import humanize_size + +# intervals of the start up progress +# 3x caching and menu creation +STEPS_UPDATE_CACHE = [33, 66, 100] +#STEPS_UPDATE_CACHE = [25, 50, 75, 100] + +class GtkOpProgressInline(apt.progress.base.OpProgress): + def __init__(self, progressbar, parent, + steps=STEPS_UPDATE_CACHE): + # steps + self.all_steps = steps + self._init_steps() + # the progressbar to use + self._progressbar = progressbar + self._parent = parent + self._window = None + def _init_steps(self): + self.steps = self.all_steps[:] + self.base = 0 + self.old = 0 + self.next = int(self.steps.pop(0)) + def update(self, percent): + # ui + self._progressbar.show() + self._parent.set_sensitive(False) + # if the old percent was higher, a new progress was started + if self.old > percent: + # set the borders to the next interval + self.base = self.next + try: + self.next = int(self.steps.pop(0)) + except: + pass + progress = self.base + percent/100 * (self.next - self.base) + self.old = percent + if abs(percent-self._progressbar.get_fraction()*100.0) > 0.5: + self._progressbar.set_text("%s" % self.op) + self._progressbar.set_fraction(progress/100.0) + while Gtk.events_pending(): + Gtk.main_iteration() + def done(self): + """ one sub-step is done """ + pass + def all_done(self): + """ all steps are completed (called by the parent) """ + self._parent.set_sensitive(True) + self._progressbar.hide() + self._init_steps() + +class GtkOpProgressWindow(apt.progress.base.OpProgress): + def __init__(self, host_window, progressbar, status, parent, + steps=STEPS_UPDATE_CACHE): + # used for the "one run progressbar" + self.steps = steps[:] + self.base = 0 + self.old = 0 + self.next = int(self.steps.pop(0)) + + self._parent = parent + self._window = host_window + self._status = status + self._progressbar = progressbar + # Do not show the close button + self._window.realize() + self._window.set_title("") + host_window.get_window().set_functions(Gdk.WMFunction.MOVE) + self._window.set_transient_for(parent) + + def update(self, percent): + #print percent + #print self.Op + #print self.SubOp + # only show progress bar if the parent is not iconified (#353195) + state = self._parent.window.get_state() + if not (state & Gdk.WINDOW_STATE_ICONIFIED): + self._window.show() + self._parent.set_sensitive(False) + # if the old percent was higher, a new progress was started + if self.old > percent: + # set the borders to the next interval + self.base = self.next + try: + self.next = int(self.steps.pop(0)) + except: + pass + progress = self.base + percent/100 * (self.next - self.base) + self.old = percent + if abs(percent-self._progressbar.get_fraction()*100.0) > 0.1: + self._status.set_markup("%s" % self.op) + self._progressbar.set_fraction(progress/100.0) + while Gtk.events_pending(): + Gtk.main_iteration() + + def done(self): + self._parent.set_sensitive(True) + def hide(self): + self._window.hide() + +class GtkFetchProgress(apt.progress.base.AcquireProgress): + def __init__(self, parent, summary="", descr=""): + # if this is set to false the download will cancel + self._continue = True + # init vars here + # FIXME: find a more elegant way, this sucks + self.summary = parent.label_fetch_summary + self.status = parent.label_fetch_status + # we need to connect the signal manual here, it won't work + # from the main window auto-connect + parent.button_fetch_cancel.connect( + "clicked", self.on_button_fetch_cancel_clicked) + self.progress = parent.progressbar_fetch + self.window_fetch = parent.window_fetch + self.window_fetch.set_transient_for(parent.window_main) + self.window_fetch.realize() + self.window_fetch.get_window().set_functions(Gdk.WMFunction.MOVE) + # set summary + if summary != "": + self.summary.set_markup("%s \n\n%s" % + (summary, descr)) + def start(self): + self.progress.set_fraction(0) + self.window_fetch.show() + def stop(self): + self.window_fetch.hide() + def on_button_fetch_cancel_clicked(self, widget): + self._continue = False + def pulse(self): + apt.progress.FetchProgress.pulse(self) + currentItem = self.currentItems + 1 + if currentItem > self.totalItems: + currentItem = self.totalItems + if self.currentCPS > 0: + statusText = (_("Downloading file %(current)li of %(total)li with " + "%(speed)s/s") % {"current" : currentItem, + "total" : self.totalItems, + "speed" : humanize_size(self.currentCPS)}) + else: + statusText = (_("Downloading file %(current)li of %(total)li") % \ + {"current" : currentItem, + "total" : self.totalItems }) + self.progress.set_fraction(self.percent/100.0) + self.status.set_markup("%s" % statusText) + # TRANSLATORS: show the remaining time in a progress bar: + #self.progress.set_text(_("About %s left" % (apt_pkg.TimeToStr(self.eta)))) + # FIXME: show remaining time + self.progress.set_text("") + + while Gtk.events_pending(): + Gtk.main_iteration() + return self._continue + +if __name__ == "__main__": + import apt + from SimpleGtkbuilderApp import SimpleGtkbuilderApp + + class MockParent(SimpleGtkbuilderApp): + """Mock parent for the fetcher that just loads the UI file""" + def __init__(self): + SimpleGtkbuilderApp.__init__(self, "../data/gtkbuilder/UpdateManager.ui", "update-manager") + + # create mock parent and fetcher + parent = MockParent() + fetch_progress = GtkFetchProgress(parent, "summary", "long detailed description") + #fetch_progress = GtkFetchProgress(parent) + + # download lists + cache = apt.Cache() + res = cache.update(fetch_progress) + # generate a dist-upgrade (to feed data to the fetcher) and get it + cache.upgrade() + pm = apt_pkg.GetPackageManager(cache._depcache) + fetcher = apt_pkg.GetAcquire(fetch_progress) + res = cache._fetchArchives(fetcher, pm) + print res + + diff -Nru update-manager-17.10.11/UpdateManager/HelpViewer.py update-manager-0.156.14.15/UpdateManager/HelpViewer.py --- update-manager-17.10.11/UpdateManager/HelpViewer.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/HelpViewer.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,5 +1,4 @@ # helpviewer.py -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- import os import subprocess @@ -9,16 +8,15 @@ #KNOWN_VIEWERS = ["/usr/bin/yelp", "/usr/bin/khelpcenter"] KNOWN_VIEWERS = ["/usr/bin/yelp"] - class HelpViewer: def __init__(self, docu): self.command = [] self.docu = docu for viewer in KNOWN_VIEWERS: if os.path.exists(viewer): - self.command = [viewer, "help:%s" % docu] + self.command = [viewer, "ghelp:%s" % docu] break - + def check(self): """check if a viewer is available""" if self.command == []: @@ -29,7 +27,7 @@ def run(self): """open the documentation in the viewer""" # avoid running the help viewer as root - if os.getuid() == 0 and 'SUDO_USER' in os.environ: + if os.getuid() == 0 and os.environ.has_key('SUDO_USER'): self.command = ['sudo', '-u', os.environ['SUDO_USER']] +\ - self.command + self.command subprocess.Popen(self.command) diff -Nru update-manager-17.10.11/UpdateManager/__init__.py update-manager-0.156.14.15/UpdateManager/__init__.py --- update-manager-17.10.11/UpdateManager/__init__.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/__init__.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1 @@ + diff -Nru update-manager-17.10.11/UpdateManager/MetaReleaseGObject.py update-manager-0.156.14.15/UpdateManager/MetaReleaseGObject.py --- update-manager-17.10.11/UpdateManager/MetaReleaseGObject.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/MetaReleaseGObject.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,59 +1,53 @@ # Copyright (c) 2004-2007 Canonical -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# +# # Author: Michael Vogt -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA -from __future__ import absolute_import - -from gi.repository import GLib from gi.repository import GObject -from .Core.MetaRelease import MetaReleaseCore +from Core.MetaRelease import MetaReleaseCore +class MetaRelease(MetaReleaseCore,GObject.GObject): -class MetaRelease(MetaReleaseCore, GObject.GObject): + __gsignals__ = { + 'new_dist_available' : (GObject.SignalFlags.RUN_LAST, + None, + (GObject.TYPE_PYOBJECT,)), + 'dist_no_longer_supported' : (GObject.SignalFlags.RUN_LAST, + None, + ()) - __gsignals__ = { - 'new_dist_available': (GObject.SignalFlags.RUN_LAST, - None, - (GObject.TYPE_PYOBJECT,)), - 'dist_no_longer_supported': (GObject.SignalFlags.RUN_LAST, - None, - ()), - 'done_downloading': (GObject.SignalFlags.RUN_LAST, - None, - ()) - } + } def __init__(self, useDevelopmentRelease=False, useProposed=False): GObject.GObject.__init__(self) MetaReleaseCore.__init__(self, useDevelopmentRelease, useProposed) # in the gtk space to test if the download already finished # this is needed because gtk is not thread-safe - GLib.timeout_add_seconds(1, self.check) + GObject.timeout_add(1000, self.check) def check(self): # check if we have a metarelease_information file + keepRuning = True if self.no_longer_supported is not None: + keepRuning = False self.emit("dist_no_longer_supported") if self.new_dist is not None: - self.emit("new_dist_available", self.new_dist) - if self.downloading: - return True - else: - self.emit("done_downloading") - return False + keepRuning = False + self.emit("new_dist_available", self.new_dist) + return keepRuning + + diff -Nru update-manager-17.10.11/UpdateManager/ReleaseNotesViewer.py update-manager-0.156.14.15/UpdateManager/ReleaseNotesViewer.py --- update-manager-17.10.11/UpdateManager/ReleaseNotesViewer.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/ReleaseNotesViewer.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,186 @@ +# ReleaseNotesViewer.py +# +# Copyright (c) 2006 Sebastian Heinlein +# +# Author: Sebastian Heinlein +# +# This modul provides an inheritance of the Gtk.TextView that is +# aware of http URLs and allows to open them in a browser. +# It is based on the pygtk-demo "hypertext". +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +from gi.repository import Pango +from gi.repository import Gtk, GObject, Gdk +import os +import subprocess + +def open_url(url): + """Open the specified URL in a browser""" + # Find an appropiate browser + if os.path.exists("/usr/bin/xdg-open"): + command = ["xdg-open", url] + elif os.path.exists("/usr/bin/exo-open"): + command = ["exo-open", url] + elif os.path.exists('/usr/bin/gnome-open'): + command = ['gnome-open', url] + else: + command = ['x-www-browser', url] + # Avoid to run the browser as user root + if os.getuid() == 0 and os.environ.has_key('SUDO_USER'): + command = ['sudo', '-u', os.environ['SUDO_USER']] + command + subprocess.Popen(command) + + +class ReleaseNotesViewer(Gtk.TextView): + def __init__(self, notes): + """Init the ReleaseNotesViewer as an Inheritance of the Gtk.TextView. + Load the notes into the buffer and make links clickable""" + # init the parent + GObject.GObject.__init__(self) + # global hovering over link state + self.hovering = False + self.first = True + # setup the buffer and signals + self.set_property("editable", False) + self.set_cursor_visible(False) + self.modify_font(Pango.FontDescription("monospace")) + self.buffer = Gtk.TextBuffer() + self.set_buffer(self.buffer) + self.buffer.set_text(notes) + self.connect("button-press-event", self.button_press_event) + self.connect("motion-notify-event", self.motion_notify_event) + self.connect("visibility-notify-event", self.visibility_notify_event) + # search for links in the notes and make them clickable + self.search_links() + + def tag_link(self, start, end, url): + """Apply the tag that marks links to the specified buffer selection""" + tag = self.buffer.create_tag(None, foreground="blue", + underline=Pango.Underline.SINGLE) + tag.set_data("url", url) + self.buffer.apply_tag(tag , start, end) + + def search_links(self): + """Search for http URLs in the buffer and call the tag_link method + for each one to tag them as links""" + # start at the beginning of the buffer + iter = self.buffer.get_iter_at_offset(0) + while 1: + # search for the next URL in the buffer + ret = iter.forward_search("http://", Gtk.TextSearchFlags.VISIBLE_ONLY, + None) + # if we reach the end break the loop + if not ret: + break + # get the position of the protocol prefix + (match_start, match_end) = ret + match_tmp = match_end.copy() + while 1: + # extend the selection to the complete URL + if match_tmp.forward_char(): + text = match_end.get_text(match_tmp) + if text in (" ", ")", "]", "\n", "\t"): + break + else: + break + match_end = match_tmp.copy() + # call the tagging method for the complete URL + url = match_start.get_text(match_end) + self.tag_link(match_start, match_end, url) + # set the starting point for the next search + iter = match_end + + def button_press_event(self, text_view, event): + """callback for mouse click events""" + if event.button != 1: + return False + + # try to get a selection + try: + (start, end) = self.buffer.get_selection_bounds() + except ValueError: + pass + else: + if start.get_offset() != end.get_offset(): + return False + + # get the iter at the mouse position + (x, y) = self.window_to_buffer_coords(Gtk.TextWindowType.WIDGET, + int(event.x), int(event.y)) + iter = self.get_iter_at_location(x, y) + + # call open_url if an URL is assigned to the iter + tags = iter.get_tags() + for tag in tags: + url = tag.get_data("url") + if url != "": + open_url(url) + break + + def motion_notify_event(self, text_view, event): + """callback for the mouse movement event, that calls the + check_hovering method with the mouse postition coordiantes""" + x, y = text_view.window_to_buffer_coords(Gtk.TextWindowType.WIDGET, + int(event.x), int(event.y)) + self.check_hovering(x, y) + self.get_window(Gtk.TextWindowType.TEXT).get_pointer() + return False + + def visibility_notify_event(self, text_view, event): + """callback if the widgets gets visible (e.g. moves to the foreground) + that calls the check_hovering method with the mouse position + coordinates""" + (screen, wx, wy, mod) = text_view.get_window(Gtk.TextWindowType.TEXT).get_pointer() + (bx, by) = text_view.window_to_buffer_coords( + Gtk.TextWindowType.WIDGET, wx, wy) + self.check_hovering(bx, by) + return False + + def check_hovering(self, x, y): + """Check if the mouse is above a tagged link and if yes show + a hand cursor""" + _hovering = False + # get the iter at the mouse position + iter = self.get_iter_at_location(x, y) + + # set _hovering if the iter has the tag "url" + tags = iter.get_tags() + for tag in tags: + url = tag.get_data("url") + if url != "": + _hovering = True + break + + # change the global hovering state + if _hovering != self.hovering or self.first == True: + self.first = False + self.hovering = _hovering + # Set the appropriate cursur icon + if self.hovering: + self.get_window(Gtk.TextWindowType.TEXT).\ + set_cursor(Gdk.Cursor.new(Gdk.CursorType.HAND2)) + else: + self.get_window(Gtk.TextWindowType.TEXT).\ + set_cursor(Gdk.Cursor.new(Gdk.CursorType.LEFT_PTR)) + +if __name__ == "__main__": + # some simple test code + win = Gtk.Window() + rv = ReleaseNotesViewer(open("../DistUpgrade/ReleaseAnnouncement").read()) + win.add(rv) + win.show_all() + Gtk.main() diff -Nru update-manager-17.10.11/UpdateManager/ReleaseNotesViewerWebkit.py update-manager-0.156.14.15/UpdateManager/ReleaseNotesViewerWebkit.py --- update-manager-17.10.11/UpdateManager/ReleaseNotesViewerWebkit.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/ReleaseNotesViewerWebkit.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,52 @@ +# ReleaseNotesViewer.py +# +# Copyright (c) 2011 Canonical +# +# Author: Michael Vogt +# +# This modul provides an inheritance of the Gtk.TextView that is +# aware of http URLs and allows to open them in a browser. +# It is based on the pygtk-demo "hypertext". +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +from gi.repository import Gtk +from gi.repository import WebKit + +from ReleaseNotesViewer import open_url + +class ReleaseNotesViewerWebkit(WebKit.WebView): + def __init__(self, notes_url): + super(ReleaseNotesViewerWebkit, self).__init__() + self.load_uri(notes_url) + self.connect("navigation-policy-decision-requested", self._on_navigation_policy_decision_requested) + def _on_navigation_policy_decision_requested(self, view, frame, request, action, policy): + open_url(request.get_uri()) + policy.ignore() + return True + + +if __name__ == "__main__": + win = Gtk.Window() + win.set_size_request(600, 400) + scroll = Gtk.ScrolledWindow() + rv = ReleaseNotesViewerWebkit("http://archive.ubuntu.com/ubuntu/dists/natty/main/dist-upgrader-all/0.150/ReleaseAnnouncement.html") + scroll.add(rv) + win.add(scroll) + win.show_all() + Gtk.main() + + diff -Nru update-manager-17.10.11/UpdateManager/SimpleGtk3builderApp.py update-manager-0.156.14.15/UpdateManager/SimpleGtk3builderApp.py --- update-manager-17.10.11/UpdateManager/SimpleGtk3builderApp.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/SimpleGtk3builderApp.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,61 @@ +""" + SimpleGladeApp.py + Module that provides an object oriented abstraction to pygtk and libglade. + Copyright (C) 2004 Sandino Flores Moreno +""" + +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import logging + +from gi.repository import Gtk + +# based on SimpleGladeApp +class SimpleGtkbuilderApp: + + def __init__(self, path, domain): + self.builder = Gtk.Builder() + self.builder.set_translation_domain(domain) + self.builder.add_from_file(path) + self.builder.connect_signals(self) + for o in self.builder.get_objects(): + if issubclass(type(o), Gtk.Buildable): + name = Gtk.Buildable.get_name(o) + setattr(self, name, o) + else: + logging.debug("WARNING: can not get name for '%s'" % o) + + def run(self): + """ + Starts the main loop of processing events checking for Control-C. + + The default implementation checks wheter a Control-C is pressed, + then calls on_keyboard_interrupt(). + + Use this method for starting programs. + """ + try: + Gtk.main() + except KeyboardInterrupt: + self.on_keyboard_interrupt() + + def on_keyboard_interrupt(self): + """ + This method is called by the default implementation of run() + after a program is finished by pressing Control-C. + """ + pass + diff -Nru update-manager-17.10.11/UpdateManager/SimpleGtkbuilderApp.py update-manager-0.156.14.15/UpdateManager/SimpleGtkbuilderApp.py --- update-manager-17.10.11/UpdateManager/SimpleGtkbuilderApp.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/SimpleGtkbuilderApp.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,61 @@ +""" + SimpleGladeApp.py + Module that provides an object oriented abstraction to pygtk and libglade. + Copyright (C) 2004 Sandino Flores Moreno +""" + +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import logging + +import gtk + +# based on SimpleGladeApp +class SimpleGtkbuilderApp: + + def __init__(self, path, domain): + self.builder = gtk.Builder() + self.builder.set_translation_domain(domain) + self.builder.add_from_file(path) + self.builder.connect_signals(self) + for o in self.builder.get_objects(): + if issubclass(type(o), gtk.Buildable): + name = gtk.Buildable.get_name(o) + setattr(self, name, o) + else: + logging.debug("WARNING: can not get name for '%s'" % o) + + def run(self): + """ + Starts the main loop of processing events checking for Control-C. + + The default implementation checks wheter a Control-C is pressed, + then calls on_keyboard_interrupt(). + + Use this method for starting programs. + """ + try: + gtk.main() + except KeyboardInterrupt: + self.on_keyboard_interrupt() + + def on_keyboard_interrupt(self): + """ + This method is called by the default implementation of run() + after a program is finished by pressing Control-C. + """ + pass + diff -Nru update-manager-17.10.11/UpdateManager/UnitySupport.py update-manager-0.156.14.15/UpdateManager/UnitySupport.py --- update-manager-17.10.11/UpdateManager/UnitySupport.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/UnitySupport.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,21 +1,20 @@ -# UnitySupport.py -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# +# UnitySupport.py +# # Copyright (c) 2011 Canonical -# +# # Author: Michael Vogt # Bilal Akhtar -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 @@ -24,31 +23,20 @@ import logging from gettext import gettext as _ -HAVE_UNITY_SUPPORT = False +HAVE_UNITY_SUPPORT=False try: - import gi - gi.require_version('Dbusmenu', '0.4') - gi.require_version('Unity', '7.0') from gi.repository import Dbusmenu, Unity - HAVE_UNITY_SUPPORT = True -except (ValueError, ImportError) as e: - logging.warning("can not import unity GI %s" % e) - + HAVE_UNITY_SUPPORT=True +except ImportError as e: + logging.warn("can not import unity GI %s" % e) class IUnitySupport(object): """ interface for unity support """ - def __init__(self, parent=None): - pass - - def set_urgency(self, urgent): - pass - - def set_install_menuitem_visible(self, visible): - pass - - def set_progress(self, progress): - pass - + def __init__(self, parent=None): pass + def set_updates_count(self, num_updates): pass + def set_urgency(self, urgent): pass + def set_install_menuitem_visible(self, visible): pass + def set_progress(self, progress): pass class UnitySupportImpl(IUnitySupport): """ implementation of unity support (if unity is available) """ @@ -63,39 +51,53 @@ def _add_quicklist(self, parent): quicklist = Dbusmenu.Menuitem.new() - # install - self.install_dbusmenuitem = Dbusmenu.Menuitem.new() - self.install_dbusmenuitem.property_set( - Dbusmenu.MENUITEM_PROP_LABEL, - _("Install All Available Updates")) - self.install_dbusmenuitem.property_set_bool( + # update + update_dbusmenuitem = Dbusmenu.Menuitem.new() + update_dbusmenuitem.property_set( + Dbusmenu.MENUITEM_PROP_LABEL, _("Check for Updates")) + update_dbusmenuitem.property_set_bool( Dbusmenu.MENUITEM_PROP_VISIBLE, True) - self.install_dbusmenuitem.connect( + update_dbusmenuitem.connect ( + "item-activated", parent.on_button_reload_clicked, None) + quicklist.child_append(update_dbusmenuitem) + # install + self.install_dbusmenuitem = Dbusmenu.Menuitem.new() + self.install_dbusmenuitem.property_set (Dbusmenu.MENUITEM_PROP_LABEL, + _("Install All Available Updates")) + self.install_dbusmenuitem.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, True) + self.install_dbusmenuitem.connect ( "item-activated", parent.install_all_updates, None) - quicklist.child_append(self.install_dbusmenuitem) + quicklist.child_append (self.install_dbusmenuitem) # add it - self._unity.set_property("quicklist", quicklist) - + self._unity.set_property ("quicklist", quicklist) + def set_progress(self, progress): """ set the progress [0,100] """ - self._unity.set_property("progress", progress / 100.0) + self._unity.set_property("progress", progress/100.0) # hide progress when out of bounds if progress < 0 or progress > 100: self._unity.set_property("progress_visible", False) else: self._unity.set_property("progress_visible", True) + def set_updates_count(self, num_updates): + self._unity.set_property("count", num_updates) + # FIXME: setup emblem as well(?) + if num_updates > 0: + self._unity.set_property("count-visible", True) + else: + self._unity.set_property("count-visible", False) + def set_urgency(self, urgent): self._unity.set_property("urgent", urgent) def set_install_menuitem_visible(self, visible): - self.install_dbusmenuitem.property_set_bool( - Dbusmenu.MENUITEM_PROP_VISIBLE, visible) + self.install_dbusmenuitem.property_set_bool(Dbusmenu.MENUITEM_PROP_VISIBLE, visible) # check what to export to the clients if HAVE_UNITY_SUPPORT: UnitySupport = UnitySupportImpl else: - # we just provide the empty interface + # we just provide the empty interface UnitySupport = IUnitySupport diff -Nru update-manager-17.10.11/UpdateManager/UpdateManager.py update-manager-0.156.14.15/UpdateManager/UpdateManager.py --- update-manager-17.10.11/UpdateManager/UpdateManager.py 2017-08-23 17:15:07.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/UpdateManager.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,433 +1,126 @@ # UpdateManager.py -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# Copyright (c) 2012 Canonical -# -# Author: Michael Terry -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as +# +# Copyright (c) 2004-2010 Canonical +# 2004 Michiel Sikkes +# 2005 Martin Willemoes Hansen +# 2010 Mohamed Amine IL Idrissi +# +# Author: Michiel Sikkes +# Michael Vogt +# Martin Willemoes Hansen +# Mohamed Amine IL Idrissi +# Alex Launi +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the # License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA -from __future__ import absolute_import, print_function - from gi.repository import Gtk -from gi.repository import Gdk, GdkX11 +from gi.repository import Gdk +from gi.repository import GObject from gi.repository import Gio -from gi.repository import GLib - -GdkX11 # pyflakes +GObject.threads_init() +from gi.repository import Pango import warnings -warnings.filterwarnings("ignore", "Accessed deprecated property", - DeprecationWarning) +warnings.filterwarnings("ignore", "Accessed deprecated property", DeprecationWarning) import apt_pkg -import distro_info + +import gettext +import sys import os +import os.path +import stat +import re +import locale +import logging import subprocess -import sys import time -from gettext import gettext as _ +import thread +import xml.sax.saxutils import dbus import dbus.service from dbus.mainloop.glib import DBusGMainLoop DBusGMainLoop(set_as_default=True) -from .UnitySupport import UnitySupport -from .Dialogs import (DistUpgradeDialog, - ErrorDialog, - HWEUpgradeDialog, - NeedRestartDialog, - NoUpdatesDialog, - PartialUpgradeDialog, - StoppedUpdatesDialog, - UnsupportedDialog, - UpdateErrorDialog) -from .MetaReleaseGObject import MetaRelease -from .UpdatesAvailable import UpdatesAvailable -from .Core.AlertWatcher import AlertWatcher -from .Core.MyCache import MyCache -from .Core.roam import NetworkManagerHelper -from .Core.UpdateList import UpdateList -from .Core.utils import get_dist -from .backend import (InstallBackend, - get_backend) - -# file that signals if we need to reboot -REBOOT_REQUIRED_FILE = "/var/run/reboot-required" - - -class UpdateManager(Gtk.Window): - """ This class is the main window and work flow controller. The main - window will show panes, and it will morph between them. """ - - def __init__(self, datadir, options): - Gtk.Window.__init__(self) - - # Public members - self.datadir = datadir - self.options = options - self.unity = UnitySupport() - self.controller = None - self.cache = None - self.update_list = None - self.meta_release = None - self.hwe_replacement_packages = None - - # Basic GTK+ parameters - self.set_title(_("Software Updater")) - self.set_icon_name("system-software-update") - self.set_position(Gtk.WindowPosition.CENTER) - - # Keep window at a constant size - ctx = self.get_style_context() - ctx.connect("changed", lambda ctx: self.resize_to_standard_width()) - - # Signals - self.connect("delete-event", self._on_close) - - self._setup_dbus() - - # deal with no-focus-on-map - if self.options and self.options.no_focus_on_map: - self.set_focus_on_map(False) - self.iconify() - self.stick() - self.set_urgency_hint(True) - self.unity.set_urgency(True) - self.initial_focus_id = self.connect( - "focus-in-event", self.on_initial_focus_in) - - # Look for a new release in a thread - self.meta_release = MetaRelease( - self.options and self.options.devel_release, - self.options and self.options.use_proposed) - - def begin_user_resizable(self, stored_width=0, stored_height=0): - self.set_resizable(True) - if stored_width > 0 and stored_height > 0: - # There is a race here. If we immediately resize, it often doesn't - # take. Using idle_add helps, but we *still* occasionally don't - # restore the size correctly. Help needed to track this down! - GLib.idle_add(lambda: self.resize(stored_width, stored_height)) - - def end_user_resizable(self): - self.set_resizable(False) - - def resize_to_standard_width(self): - if self.get_resizable(): - return # only size to a specific em if we are a static size - num_em = 33 # per SoftwareUpdates spec - dpi = self.get_screen().get_resolution() - if dpi <= 0: - dpi = 96 - ctx = self.get_style_context() - size = ctx.get_property("font-size", Gtk.StateFlags.NORMAL) - width = dpi / 72 * size * num_em - self.set_size_request(width, -1) - - def on_initial_focus_in(self, widget, event): - """callback run on initial focus-in (if started unmapped)""" - self.unstick() - self.set_urgency_hint(False) - self.unity.set_urgency(False) - self.disconnect(self.initial_focus_id) - return False +import GtkProgress +import backend - def _start_pane(self, pane): - if self.controller is not None: - self.controller.stop() - if isinstance(self.controller, Gtk.Widget): - self.controller.destroy() - - self.controller = pane - self._look_ready() - self.end_user_resizable() - - if pane is None: - return - - if isinstance(pane, Gtk.Widget): - self.add(pane) - pane.start() - self.show_all() - else: - pane.start() - self.hide() +from gettext import gettext as _ +from gettext import ngettext - def _on_close(self, widget, data=None): - return self.close() - def close(self): - if not self.get_sensitive(): - return True +from Core.utils import (humanize_size, + init_proxy, + on_battery, + inhibit_sleep, + allow_sleep) +from Core.UpdateList import UpdateList +from Core.MyCache import MyCache +from Core.AlertWatcher import AlertWatcher - if self.controller: - controller_close = self.controller.close() - if controller_close: - return controller_close - self.exit() +from DistUpgrade.DistUpgradeCache import NotEnoughFreeSpaceError +from DistUpgradeFetcher import DistUpgradeFetcherGtk - def exit(self): - """ exit the application, save the state """ - self._start_pane(None) - sys.exit(0) +from ChangelogViewer import ChangelogViewer +from SimpleGtk3builderApp import SimpleGtkbuilderApp +from MetaReleaseGObject import MetaRelease +from UnitySupport import UnitySupport - def show_settings(self): - try: - apt_pkg.pkgsystem_unlock() - except SystemError: - pass - cmd = ["/usr/bin/software-properties-gtk", - "--open-tab", "2"] +import HweSupportStatus.consts - if "WAYLAND_DISPLAY" not in os.environ: - cmd += ["--toplevel", "%s" % self.get_window().get_xid()] +#import pdb - self._look_busy() - try: - p = subprocess.Popen(cmd) - except OSError: - pass - else: - while p.poll() is None: - while Gtk.events_pending(): - Gtk.main_iteration() - time.sleep(0.05) - finally: - self.start_available() - - def start_update(self): - if self.options.no_update: - self.start_available() - return - - update_backend = get_backend(self, InstallBackend.ACTION_UPDATE) - self._start_pane(update_backend) - - def start_install(self, hwe_upgrade=False): - install_backend = get_backend(self, InstallBackend.ACTION_INSTALL) - if hwe_upgrade: - for pkgname in self.hwe_replacement_packages: - try: - self.cache[pkgname].mark_install() - except SystemError: - pass - self._start_pane(install_backend) - - def start_available(self, cancelled_update=False, error_occurred=False): - self._look_busy() - self.refresh_cache() - - pane = self._make_available_pane(self.cache.install_count, - os.path.exists(REBOOT_REQUIRED_FILE), - cancelled_update, error_occurred) - self._start_pane(pane) - - def _make_available_pane(self, install_count, need_reboot=False, - cancelled_update=False, error_occurred=False): - self._check_hwe_support_status() - if install_count == 0: - # Need Restart > New Release > No Updates - if need_reboot: - return NeedRestartDialog(self) - dist_upgrade = self._check_meta_release() - if dist_upgrade: - return dist_upgrade - elif cancelled_update: - return StoppedUpdatesDialog(self) - elif self.hwe_replacement_packages: - return HWEUpgradeDialog(self) - else: - return NoUpdatesDialog(self, error_occurred=error_occurred) - else: - header = None - desc = None - if error_occurred: - desc = _("Some software couldn’t be checked for updates.") - elif cancelled_update: - header = _("You stopped the check for updates.") - desc = _("Updated software is available from " - "a previous check.") - # Display HWE updates first as an old HWE stack is vulnerable - elif self.hwe_replacement_packages: - return HWEUpgradeDialog(self) - return UpdatesAvailable(self, header, desc, need_reboot) - - def start_error(self, is_update_error, header, desc): - if is_update_error: - self._start_pane(UpdateErrorDialog(self, header, desc)) - else: - self._start_pane(ErrorDialog(self, header, desc)) +# FIXME: +# - kill "all_changes" and move the changes into the "Update" class - def _look_busy(self): - self.set_sensitive(False) - if self.get_window() is not None: - self.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.WATCH)) - - def _look_ready(self): - self.set_sensitive(True) - if self.get_window() is not None: - self.get_window().set_cursor(None) - self.get_window().set_functions(Gdk.WMFunction.ALL) - - def _check_meta_release(self): - if self.meta_release is None: - return None - - if self.meta_release.downloading: - # Block until we get an answer - GLib.idle_add(self._meta_release_wait_idle) - Gtk.main() - - # Check if there is anything to upgrade to or a known-broken upgrade - next = self.meta_release.upgradable_to - if not next or next.upgrade_broken: - return None - - # Check for end-of-life - if self.meta_release.no_longer_supported: - return UnsupportedDialog(self, self.meta_release) - - # Check for new fresh release - settings = Gio.Settings.new("com.ubuntu.update-manager") - if (self.meta_release.new_dist and - (self.options.check_dist_upgrades or - settings.get_boolean("check-dist-upgrades"))): - return DistUpgradeDialog(self, self.meta_release) - - return None - - def _meta_release_wait_idle(self): - # 'downloading' is changed in a thread, but the signal - # 'done_downloading' is done in our thread's event loop. So we know - # that it won't fire while we're in this function. - if not self.meta_release.downloading: - Gtk.main_quit() - else: - self.meta_release.connect("done_downloading", Gtk.main_quit) - return False +# list constants +(LIST_CONTENTS, LIST_NAME, LIST_PKG, LIST_ORIGIN, LIST_TOGGLE_CHECKED) = range(5) - def _check_hwe_support_status(self): - di = distro_info.UbuntuDistroInfo() - codename = get_dist() - lts = di.is_lts(codename) - if not lts: - return None - HWE = "/usr/bin/hwe-support-status" - if not os.path.exists(HWE): - return None - cmd = [HWE, "--show-replacements"] - self._parse_hwe_support_status(cmd) +# actions for "invoke_manager" +(INSTALL, UPDATE) = range(2) - def _parse_hwe_support_status(self, cmd): - try: - subprocess.check_output(cmd) - # for debugging - # print("nothing unsupported running") - except subprocess.CalledProcessError as e: - if e.returncode == 10: - packages = e.output.strip().split() - self.hwe_replacement_packages = [] - for pkgname in packages: - pkgname = pkgname.decode('utf-8') - if pkgname in self.cache and \ - not self.cache[pkgname].is_installed: - self.hwe_replacement_packages.append(pkgname) - # for debugging - # print(self.hwe_replacement_packages) - - # fixme: we should probably abstract away all the stuff from libapt - def refresh_cache(self): - # get the lock - try: - apt_pkg.pkgsystem_lock() - except SystemError: - pass +# file that signals if we need to reboot +REBOOT_REQUIRED_FILE = "/var/run/reboot-required" - try: - if self.cache is None: - self.cache = MyCache(None) - else: - self.cache.open(None) - self.cache._initDepCache() - except AssertionError: - # if the cache could not be opened for some reason, - # let the release upgrader handle it, it deals - # a lot better with this - self._start_pane(PartialUpgradeDialog(self)) - # we assert a clean cache - header = _("Software index is broken") - desc = _("It is impossible to install or remove any software. " - "Please use the package manager \"Synaptic\" or run " - "\"sudo apt-get install -f\" in a terminal to fix " - "this issue at first.") - self.start_error(True, header, desc) - except SystemError as e: - header = _("Could not initialize the package information") - desc = _("An unresolvable problem occurred while " - "initializing the package information.\n\n" - "Please report this bug against the 'update-manager' " - "package and include the following error " - "message:\n") + str(e) - self.start_error(True, header, desc) - - # Let the Gtk event loop breath if it hasn't had a chance. - def iterate(): - while Gtk.events_pending(): - Gtk.main_iteration() - iterate() +# NetworkManager enums +from Core.roam import NetworkManagerHelper - self.update_list = UpdateList(self) - try: - self.update_list.update(self.cache, eventloop_callback=iterate) - except SystemError as e: - header = _("Could not calculate the upgrade") - desc = _("An unresolvable problem occurred while " - "calculating the upgrade.\n\n" - "Please report this bug against the 'update-manager' " - "package and include the following error " - "message:\n") + str(e) - self.start_error(True, header, desc) - - if self.update_list.distUpgradeWouldDelete > 0: - self._start_pane(PartialUpgradeDialog(self)) - - def _setup_dbus(self): - """ this sets up a dbus listener if none is installed already """ - # check if there is another g-a-i already and if not setup one - # listening on dbus - try: - bus = dbus.SessionBus() - except Exception as e: - print("warning: could not initiate dbus") - return - try: - proxy_obj = bus.get_object('org.freedesktop.UpdateManager', - '/org/freedesktop/UpdateManagerObject') - iface = dbus.Interface(proxy_obj, - 'org.freedesktop.UpdateManagerIFace') - iface.bringToFront() - #print("send bringToFront") - sys.exit(0) - except dbus.DBusException: - #print("no listening object (%s) " % e) - bus_name = dbus.service.BusName('org.freedesktop.UpdateManager', - bus) - self.dbusController = UpdateManagerDbusController(self, bus_name) +def show_dist_no_longer_supported_dialog(parent=None): + """ show a no-longer-supported dialog """ + msg = "%s\n\n%s" % ( + _("Your Ubuntu release is not supported anymore."), + _("You will not get any further security fixes or critical " + "updates. " + "Please upgrade to a later version of Ubuntu.")) + dialog = Gtk.MessageDialog(parent, 0, Gtk.MessageType.WARNING, + Gtk.ButtonsType.CLOSE,"") + dialog.set_title("") + dialog.set_markup(msg) + button = Gtk.LinkButton(uri="http://www.ubuntu.com/releaseendoflife", + label=_("Upgrade information")) + button.show() + dialog.get_content_area().pack_end(button, True, True, 0) + # this data used in the test to get the dialog + if parent: + parent.set_data("no-longer-supported-nag", dialog) + dialog.run() + dialog.destroy() + if parent: + parent.set_data("no-longer-supported-nag", None) class UpdateManagerDbusController(dbus.service.Object): @@ -436,25 +129,1176 @@ object_path='/org/freedesktop/UpdateManagerObject'): dbus.service.Object.__init__(self, bus_name, object_path) self.parent = parent - self.alert_watcher = AlertWatcher() + self.alert_watcher = AlertWatcher () self.alert_watcher.connect("network-alert", self._on_network_alert) self.connected = False @dbus.service.method('org.freedesktop.UpdateManagerIFace') def bringToFront(self): - self.parent.present() + self.parent.window_main.present() return True @dbus.service.method('org.freedesktop.UpdateManagerIFace') + def update(self): + try: + self.alert_watcher.check_alert_state () + self.parent.invoke_manager(UPDATE) + return self.connected + except: + return False + + @dbus.service.method('org.freedesktop.UpdateManagerIFace') def upgrade(self): try: - self.parent.start_install() + self.parent.cache.checkFreeSpace() + self.parent.invoke_manager(INSTALL) return True - except Exception as e: + except: return False + @dbus.service.signal('org.freedesktop.UpdateManagerIFace', 'b') + def updated(self, success): + pass + def _on_network_alert(self, watcher, state): if state in NetworkManagerHelper.NM_STATE_CONNECTED_LIST: self.connected = True else: self.connected = False + +class UpdateManager(SimpleGtkbuilderApp): + + # how many days until u-m warns about manual pressing "check" + NO_UPDATE_WARNING_DAYS = 7 + + def __init__(self, datadir, options): + self.setupDbus() + Gtk.Window.set_default_icon_name("system-software-update") + self.datadir = datadir + SimpleGtkbuilderApp.__init__(self, datadir+"gtkbuilder/UpdateManager.ui", + "update-manager") + gettext.bindtextdomain("update-manager", "/usr/share/locale") + gettext.textdomain("update-manager") + try: + locale.setlocale(locale.LC_ALL, "") + except: + logging.exception("setlocale failed") + + # Used for inhibiting power management + self.sleep_cookie = None + self.sleep_dev = None + + # workaround for LP: #945536 + self.clearing_store = False + + self.image_logo.set_from_icon_name("system-software-update", Gtk.IconSize.DIALOG) + self.window_main.set_sensitive(False) + self.window_main.grab_focus() + self.button_close.grab_focus() + self.dl_size = 0 + self.connected = True + self.hwe_replacement_packages = [] + + # create text view + self.textview_changes = ChangelogViewer() + self.textview_changes.show() + self.scrolledwindow_changes.add(self.textview_changes) + changes_buffer = self.textview_changes.get_buffer() + changes_buffer.create_tag("versiontag", weight=Pango.Weight.BOLD) + + # expander + self.expander_details.connect("notify::expanded", self.activate_details) + + # useful exit stuff + self.window_main.connect("delete_event", self.close) + self.button_close.connect("clicked", lambda w: self.exit()) + + # the treeview (move into it's own code!) + self.store = Gtk.ListStore(str, str, GObject.TYPE_PYOBJECT, + GObject.TYPE_PYOBJECT, bool) + self.treeview_update.set_model(self.store) + self.treeview_update.set_headers_clickable(True); + self.treeview_update.set_direction(Gtk.TextDirection.LTR) + + tr = Gtk.CellRendererText() + tr.set_property("xpad", 6) + tr.set_property("ypad", 6) + cr = Gtk.CellRendererToggle() + cr.set_property("activatable", True) + cr.set_property("xpad", 6) + cr.connect("toggled", self.toggled) + + column_install = Gtk.TreeViewColumn(_("Install"), cr, active=LIST_TOGGLE_CHECKED) + column_install.set_cell_data_func (cr, self.install_column_view_func) + column = Gtk.TreeViewColumn(_("Name"), tr, markup=LIST_CONTENTS) + column.set_resizable(True) + + column_install.set_sizing(Gtk.TreeViewColumnSizing.FIXED) + column_install.set_fixed_width(30) + column.set_sizing(Gtk.TreeViewColumnSizing.FIXED) + column.set_fixed_width(100) + self.treeview_update.set_fixed_height_mode(False) + + self.treeview_update.append_column(column_install) + column_install.set_visible(True) + self.treeview_update.append_column(column) + self.treeview_update.set_search_column(LIST_NAME) + self.treeview_update.connect("button-press-event", self.show_context_menu) + + # setup the help viewer and disable the help button if there + # is no viewer available + #self.help_viewer = HelpViewer("update-manager") + #if self.help_viewer.check() == False: + # self.button_help.set_sensitive(False) + + if not os.path.exists("/usr/bin/software-properties-gtk"): + self.button_settings.set_sensitive(False) + + self.settings = Gio.Settings("com.ubuntu.update-manager") + init_proxy(self.settings) + # init show version + self.show_versions = self.settings.get_boolean("show-versions") + # init summary_before_name + self.summary_before_name = self.settings.get_boolean("summary-before-name") + # keep track when we run (for update-notifier) + self.settings.set_int("launch-time", int(time.time())) + + # get progress object + self.progress = GtkProgress.GtkOpProgressInline( + self.progressbar_cache_inline, self.window_main) + + #set minimum size to prevent the headline label blocking the resize process + self.window_main.set_size_request(500,-1) + # restore state + self.restore_state() + # deal with no-focus-on-map + if options.no_focus_on_map: + self.window_main.set_focus_on_map(False) + if self.progress._window: + self.progress._window.set_focus_on_map(False) + # show the main window + self.window_main.show() + # get the install backend + self.install_backend = backend.get_backend(self.window_main) + self.install_backend.connect("action-done", self._on_backend_done) + + # Create Unity launcher quicklist + # FIXME: instead of passing parent we really should just send signals + self.unity = UnitySupport(parent=self) + + # it can only the iconified *after* it is shown (even if the docs + # claim otherwise) + if options.no_focus_on_map: + self.window_main.iconify() + self.window_main.stick() + self.window_main.set_urgency_hint(True) + self.unity.set_urgency(True) + self.initial_focus_id = self.window_main.connect( + "focus-in-event", self.on_initial_focus_in) + + # Alert watcher + self.alert_watcher = AlertWatcher() + self.alert_watcher.connect("network-alert", self._on_network_alert) + self.alert_watcher.connect("battery-alert", self._on_battery_alert) + self.alert_watcher.connect("network-3g-alert", self._on_network_3g_alert) + + + def install_all_updates (self, menu, menuitem, data): + self.select_all_updgrades (None) + self.on_button_install_clicked (None) + + def on_initial_focus_in(self, widget, event): + """callback run on initial focus-in (if started unmapped)""" + widget.unstick() + widget.set_urgency_hint(False) + self.unity.set_urgency(False) + self.window_main.disconnect(self.initial_focus_id) + return False + + def warn_on_battery(self): + """check and warn if on battery""" + if on_battery(): + self.dialog_on_battery.set_transient_for(self.window_main) + self.dialog_on_battery.set_title("") + res = self.dialog_on_battery.run() + self.dialog_on_battery.hide() + if res != Gtk.ResponseType.YES: + sys.exit() + + def install_column_view_func(self, cell_layout, renderer, model, iter, data): + pkg = model.get_value(iter, LIST_PKG) + if pkg is None: + renderer.set_property("activatable", True) + return + current_state = renderer.get_property("active") + to_install = pkg.marked_install or pkg.marked_upgrade + renderer.set_property("active", to_install) + # we need to update the store as well to ensure orca knowns + # about state changes (it will not read view_func changes) + if to_install != current_state: + self.store[iter][LIST_TOGGLE_CHECKED] = to_install + if pkg.name in self.list.held_back: + renderer.set_property("activatable", False) + else: + renderer.set_property("activatable", True) + + def setupDbus(self): + """ this sets up a dbus listener if none is installed alread """ + # check if there is another g-a-i already and if not setup one + # listening on dbus + try: + bus = dbus.SessionBus() + except: + print "warning: could not initiate dbus" + return + try: + proxy_obj = bus.get_object('org.freedesktop.UpdateManager', + '/org/freedesktop/UpdateManagerObject') + iface = dbus.Interface(proxy_obj, 'org.freedesktop.UpdateManagerIFace') + iface.bringToFront() + #print "send bringToFront" + sys.exit(0) + except dbus.DBusException: + #print "no listening object (%s) "% e + bus_name = dbus.service.BusName('org.freedesktop.UpdateManager',bus) + self.dbusController = UpdateManagerDbusController(self, bus_name) + + + def on_checkbutton_reminder_toggled(self, checkbutton): + self.settings.set_boolean("remind-reload", + not checkbutton.get_active()) + + def close(self, widget, data=None): + if self.window_main.get_property("sensitive") is False: + return True + else: + self.exit() + + + def set_changes_buffer(self, changes_buffer, text, name, srcpkg): + changes_buffer.set_text("") + lines = text.split("\n") + if len(lines) == 1: + changes_buffer.set_text(text) + return + + for line in lines: + end_iter = changes_buffer.get_end_iter() + version_match = re.match(r'^%s \((.*)\)(.*)\;.*$' % re.escape(srcpkg), line) + #bullet_match = re.match("^.*[\*-]", line) + author_match = re.match("^.*--.*<.*@.*>.*$", line) + if version_match: + version = version_match.group(1) + #upload_archive = version_match.group(2).strip() + version_text = _("Version %s: \n") % version + changes_buffer.insert_with_tags_by_name(end_iter, version_text, "versiontag") + elif (author_match): + pass + else: + changes_buffer.insert(end_iter, line+"\n") + + + def on_treeview_update_cursor_changed(self, widget): + path = widget.get_cursor()[0] + # check if we have a path at all + if path == None: + return + model = widget.get_model() + iter = model.get_iter(path) + + # set descr + pkg = model.get_value(iter, LIST_PKG) + if pkg == None or pkg.description == None: + changes_buffer = self.textview_changes.get_buffer() + changes_buffer.set_text("") + desc_buffer = self.textview_descr.get_buffer() + desc_buffer.set_text("") + self.notebook_details.set_sensitive(False) + return + long_desc = pkg.description + self.notebook_details.set_sensitive(True) + # do some regular expression magic on the description + # Add a newline before each bullet + p = re.compile(r'^(\s|\t)*(\*|0|-)',re.MULTILINE) + long_desc = p.sub('\n*', long_desc) + # replace all newlines by spaces + p = re.compile(r'\n', re.MULTILINE) + long_desc = p.sub(" ", long_desc) + # replace all multiple spaces by newlines + p = re.compile(r'\s\s+', re.MULTILINE) + long_desc = p.sub("\n", long_desc) + + desc_buffer = self.textview_descr.get_buffer() + desc_buffer.set_text(long_desc) + + # now do the changelog + name = model.get_value(iter, LIST_NAME) + if name == None: + return + + changes_buffer = self.textview_changes.get_buffer() + + # check if we have the changes already and if so, display them + # (even if currently disconnected) + if self.cache.all_changes.has_key(name): + changes = self.cache.all_changes[name] + srcpkg = self.cache[name].sourcePackageName + self.set_changes_buffer(changes_buffer, changes, name, srcpkg) + # if not connected, do not even attempt to get the changes + elif not self.connected: + changes_buffer.set_text( + _("No network connection detected, you can not download " + "changelog information.")) + # else, get it from the entwork + else: + if self.expander_details.get_expanded(): + lock = thread.allocate_lock() + lock.acquire() + thread.start_new_thread(self.cache.get_news_and_changelog,(name,lock)) + changes_buffer.set_text("%s\n" % _("Downloading list of changes...")) + iter = changes_buffer.get_iter_at_line(1) + anchor = changes_buffer.create_child_anchor(iter) + button = Gtk.Button(stock="gtk-cancel") + self.textview_changes.add_child_at_anchor(button, anchor) + button.show() + id = button.connect("clicked", + lambda w,lock: lock.release(), lock) + # wait for the dl-thread + while lock.locked(): + time.sleep(0.01) + while Gtk.events_pending(): + Gtk.main_iteration() + # download finished (or canceld, or time-out) + button.hide() + if button.handler_is_connected(id): + button.disconnect(id) + # check if we still are in the right pkg (the download may have taken + # some time and the user may have clicked on a new pkg) + path = widget.get_cursor()[0] + if path == None: + return + now_name = widget.get_model()[path][LIST_NAME] + if name != now_name: + return + # display NEWS.Debian first, then the changelog + changes = "" + srcpkg = self.cache[name].sourcePackageName + if self.cache.all_news.has_key(name): + changes += self.cache.all_news[name] + if self.cache.all_changes.has_key(name): + changes += self.cache.all_changes[name] + if changes: + self.set_changes_buffer(changes_buffer, changes, name, srcpkg) + + def show_context_menu(self, widget, event): + """ + Show a context menu if a right click was performed on an update entry + """ + if event.type == Gdk.EventType.BUTTON_PRESS and event.button == 3: + # need to keep a reference here of menu, otherwise it gets + # deleted when it goes out of scope and no menu is visible + # (bug #806949) + self.menu = menu = Gtk.Menu() + item_select_none = Gtk.MenuItem.new_with_mnemonic(_("_Deselect All")) + item_select_none.connect("activate", self.select_none_updgrades) + menu.append(item_select_none) + num_updates = self.cache.installCount + if num_updates == 0: + item_select_none.set_property("sensitive", False) + item_select_all = Gtk.MenuItem.new_with_mnemonic(_("Select _All")) + item_select_all.connect("activate", self.select_all_updgrades) + menu.append(item_select_all) + menu.show_all() + menu.popup_for_device( + None, None, None, None, None, event.button, event.time) + menu.show() + return True + + # we need this for select all/unselect all + def _toggle_origin_headers(self, new_selection_value): + """ small helper that will set/unset the origin headers + """ + model = self.treeview_update.get_model() + for row in model: + if not model.get_value(row.iter, LIST_PKG): + model.set_value(row.iter, LIST_TOGGLE_CHECKED, new_selection_value) + + def select_all_updgrades(self, widget): + """ + Select all updates + """ + self.setBusy(True) + self.cache.saveDistUpgrade() + self._toggle_origin_headers(True) + self.treeview_update.queue_draw() + self.refresh_updates_count() + self.setBusy(False) + + def select_none_updgrades(self, widget): + """ + Select none updates + """ + self.setBusy(True) + self.cache.clear() + self._toggle_origin_headers(False) + self.treeview_update.queue_draw() + self.refresh_updates_count() + self.setBusy(False) + + def setBusy(self, flag): + """ Show a watch cursor if the app is busy for more than 0.3 sec. + Furthermore provide a loop to handle user interface events """ + if self.window_main.get_window() is None: + return + if flag == True: + self.window_main.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.WATCH)) + else: + self.window_main.get_window().set_cursor(None) + while Gtk.events_pending(): + Gtk.main_iteration() + + def refresh_updates_count(self): + self.button_install.set_sensitive(self.cache.installCount) + try: + inst_count = self.cache.installCount + self.dl_size = self.cache.requiredDownload + count_str = "" + download_str = "" + if inst_count > 0: + count_str = ngettext("%(count)s update has been selected.", + "%(count)s updates have been selected.", + inst_count) % { 'count' : inst_count } + if self.dl_size != 0: + download_str = _("%s will be downloaded.") % (humanize_size(self.dl_size)) + self.image_downsize.set_sensitive(True) + # do not set the buttons to sensitive/insensitive until NM + # can deal with dialup connections properly + #if self.alert_watcher.network_state != NM_STATE_CONNECTED: + # self.button_install.set_sensitive(False) + #else: + # self.button_install.set_sensitive(True) + self.button_install.set_sensitive(True) + self.unity.set_install_menuitem_visible(True) + else: + if inst_count > 0: + download_str = ngettext("The update has already been downloaded, but not installed.", + "The updates have already been downloaded, but not installed.", inst_count) + self.button_install.set_sensitive(True) + self.unity.set_install_menuitem_visible(True) + else: + download_str = _("There are no updates to install.") + self.button_install.set_sensitive(False) + self.unity.set_install_menuitem_visible(False) + self.image_downsize.set_sensitive(False) + # TRANSLATORS: this allows to switch the order of the count of + # updates and the download size string (if needed) + self.label_downsize.set_text(_("%(count_str)s %(download_str)s") % { + 'count_str' : count_str, + 'download_str' : download_str}) + self.hbox_downsize.show() + self.vbox_alerts.show() + except SystemError, e: + print "requiredDownload could not be calculated: %s" % e + self.label_downsize.set_markup(_("Unknown download size.")) + self.image_downsize.set_sensitive(False) + self.hbox_downsize.show() + self.vbox_alerts.show() + + def _get_last_apt_get_update_minutes(self): + """ + Return the number of minutes since the last successful apt-get update + + If the date is unknown, return "None" + """ + if not os.path.exists("/var/lib/apt/periodic/update-success-stamp"): + return None + # calculate when the last apt-get update (or similar operation) + # was performed + mtime = os.stat("/var/lib/apt/periodic/update-success-stamp")[stat.ST_MTIME] + ago_minutes = int((time.time() - mtime) / 60 ) + return ago_minutes + + def _get_last_apt_get_update_text(self): + """ + return a human readable string with the information when + the last apt-get update was run + """ + ago_minutes = self._get_last_apt_get_update_minutes() + if ago_minutes is None: + return _("It is unknown when the package information was " + "updated last. Please click the 'Check' " + "button to update the information.") + ago_hours = int( ago_minutes / 60 ) + ago_days = int( ago_hours / 24 ) + if ago_days > self.NO_UPDATE_WARNING_DAYS: + return _("The package information was last updated %(days_ago)s " + "days ago.\n" + "Press the 'Check' button below to check for new software " + "updates.") % { "days_ago" : ago_days, } + elif ago_days > 0: + return ngettext("The package information was last updated %(days_ago)s day ago.", + "The package information was last updated %(days_ago)s days ago.", + ago_days) % { "days_ago" : ago_days, } + elif ago_hours > 0: + return ngettext("The package information was last updated %(hours_ago)s hour ago.", + "The package information was last updated %(hours_ago)s hours ago.", + ago_hours) % { "hours_ago" : ago_hours, } + elif ago_minutes >= 45: + # TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago + return _("The package information was last updated about %s minutes ago.")%45 + elif ago_minutes >= 30: + return _("The package information was last updated about %s minutes ago.")%30 + elif ago_minutes >= 15: + return _("The package information was last updated about %s minutes ago.")%15 + else: + return _("The package information was just updated.") + return None + + def update_last_updated_text(self, user_data): + """timer that updates the last updated text """ + #print "update_last_updated_text" + num_updates = self.cache.installCount + if num_updates == 0: + if self._get_last_apt_get_update_text() is not None: + text_label_main = self._get_last_apt_get_update_text() + self.label_main_details.set_text(text_label_main) + return True + # stop the timer if there are upgrades now + return False + + def update_count(self): + """activate or disable widgets and show dialog texts correspoding to + the number of available updates""" + self.refresh_updates_count() + num_updates = self.cache.installCount + text_label_main = _("Software updates correct errors, eliminate security vulnerabilities and provide new features.") + + # setup unity stuff + self.unity.set_updates_count(num_updates) + + if num_updates == 0: + text_header= "%s" % _("The software on this computer is up to date.") + self.label_downsize.set_text("\n") + if self.cache.keepCount() == 0: + self.notebook_details.set_sensitive(False) + self.treeview_update.set_sensitive(False) + self.button_install.set_sensitive(False) + self.unity.set_install_menuitem_visible(False) + self.button_close.grab_default() + self.textview_changes.get_buffer().set_text("") + self.textview_descr.get_buffer().set_text("") + if self._get_last_apt_get_update_text() is not None: + text_label_main = self._get_last_apt_get_update_text() + if self._get_last_apt_get_update_minutes()> self.NO_UPDATE_WARNING_DAYS*24*60: + text_header = "%s" % _("Software updates may be available for your computer.") + # add timer to ensure we update the information when the + # last package count update was performed + GObject.timeout_add_seconds(10, self.update_last_updated_text, None) + else: + # show different text on first run (UX team suggestion) + firstrun = self.settings.get_boolean("first-run") + if firstrun: + text_header = "%s" % _("Welcome to Ubuntu") + text_label_main = _("These software updates have been issued since this version of Ubuntu was released.") + self.settings.set_boolean("first-run", False) + else: + text_header = "%s" % _("Software updates are available for this computer.") + self.notebook_details.set_sensitive(True) + self.treeview_update.set_sensitive(True) + self.button_install.grab_default() + self.treeview_update.set_cursor(Gtk.TreePath.new_from_string("1"), None, False) + self.label_header.set_markup(text_header) + self.label_main_details.set_text(text_label_main) + return True + + def activate_details(self, expander, data): + expanded = self.expander_details.get_expanded() + self.vbox_updates.set_child_packing(self.expander_details, + expanded, + True, + 0, + True) + self.settings.set_boolean("show-details",expanded) + if expanded: + self.on_treeview_update_cursor_changed(self.treeview_update) + + def on_button_reload_clicked(self, widget, menuitem = None, data = None): + #print "on_button_reload_clicked" + self.check_metarelease() + self.invoke_manager(UPDATE) + + #def on_button_help_clicked(self, widget): + # self.help_viewer.run() + + def on_button_settings_clicked(self, widget): + #print "on_button_settings_clicked" + try: + apt_pkg.pkgsystem_unlock() + except SystemError: + pass + cmd = ["/usr/bin/software-properties-gtk", + "--open-tab","2", + # FIXME: once get_xid() is available via introspections, add + # this back + #"--toplevel", "%s" % self.window_main.get_window().get_xid() + ] + self.window_main.set_sensitive(False) + p = subprocess.Popen(cmd) + while p.poll() is None: + while Gtk.events_pending(): + Gtk.main_iteration() + time.sleep(0.05) + self.fillstore() + + def on_button_install_clicked(self, widget): + #print "on_button_install_clicked" + err_sum = _("Not enough free disk space") + err_long= _("The upgrade needs a total of %s free space on disk '%s'. " + "Please free at least an additional %s of disk " + "space on '%s'. " + "Empty your trash and remove temporary " + "packages of former installations using " + "'sudo apt-get clean'.") + # check free space and error if its not enough + try: + self.cache.checkFreeSpace() + except NotEnoughFreeSpaceError, e: + for req in e.free_space_required_list: + self.error(err_sum, err_long % (req.size_total, + req.dir, + req.size_needed, + req.dir)) + return + except SystemError, e: + logging.exception("free space check failed") + self.invoke_manager(INSTALL) + + def on_button_restart_required_clicked(self, button=None): + self._request_reboot_via_session_manager() + + def show_reboot_required_info(self): + self.frame_restart_required.show() + self.label_restart_required.set_text(_("The computer needs to restart to " + "finish installing updates. Please " + "save your work before continuing.")) + + def _request_reboot_via_session_manager(self): + try: + bus = dbus.SessionBus() + proxy_obj = bus.get_object("org.gnome.SessionManager", + "/org/gnome/SessionManager") + iface = dbus.Interface(proxy_obj, "org.gnome.SessionManager") + iface.RequestReboot() + except dbus.DBusException: + self._request_reboot_via_consolekit() + except: + pass + + def _request_reboot_via_consolekit(self): + try: + bus = dbus.SystemBus() + proxy_obj = bus.get_object("org.freedesktop.ConsoleKit", + "/org/freedesktop/ConsoleKit/Manager") + iface = dbus.Interface(proxy_obj, "org.freedesktop.ConsoleKit.Manager") + iface.Restart() + except dbus.DBusException: + pass + + def invoke_manager(self, action): + # check first if no other package manager is runing + + # don't display apt-listchanges, we already showed the changelog + os.environ["APT_LISTCHANGES_FRONTEND"]="none" + + # Do not suspend during the update process + (self.sleep_dev, self.sleep_cookie) = inhibit_sleep() + + # set window to insensitive + self.window_main.set_sensitive(False) + self.window_main.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.WATCH)) +# + # do it + if action == UPDATE: + self.install_backend.update() + elif action == INSTALL: + # If the progress dialog should be closed automatically afterwards + settings = Gio.Settings("com.ubuntu.update-manager") + close_on_done = settings.get_boolean("autoclose-install-window") + # Get the packages which should be installed and update + pkgs_install = [] + pkgs_upgrade = [] + for pkg in self.cache: + if pkg.marked_install: + pkgs_install.append(pkg.name) + elif pkg.marked_upgrade: + pkgs_upgrade.append(pkg.name) + self.install_backend.commit(pkgs_install, pkgs_upgrade, close_on_done) + + def _on_backend_done(self, backend, action, authorized, success): + if (action == UPDATE): + self.dbusController.updated(success) + # check if there is a new reboot required notification + if (action == INSTALL and + os.path.exists(REBOOT_REQUIRED_FILE)): + self.show_reboot_required_info() + if authorized: + msg = _("Reading package information") + self.label_cache_progress_title.set_label("%s" % msg) + self.fillstore() + # check hwe status - if a hwe pkg is missing, show dialog + self._show_hide_hwe_frame() + else: + self.window_main.set_sensitive(True) + self.window_main.get_window().set_cursor(None) + + # Allow suspend after synaptic is finished + if self.sleep_cookie: + allow_sleep(self.sleep_dev, self.sleep_cookie) + self.sleep_cookie = self.sleep_dev = None + + def _on_network_alert(self, watcher, state): + # do not set the buttons to sensitive/insensitive until NM + # can deal with dialup connections properly + if state in NetworkManagerHelper.NM_STATE_CONNECTING_LIST: + self.label_offline.set_text(_("Connecting...")) + #self.button_reload.set_sensitive(False) + self.refresh_updates_count() + self.hbox_offline.show() + self.vbox_alerts.show() + self.connected = False + # in doubt (STATE_UNKNOWN), assume connected + elif (state in NetworkManagerHelper.NM_STATE_CONNECTED_LIST or + state == NetworkManagerHelper.NM_STATE_UNKNOWN): + #self.button_reload.set_sensitive(True) + self.refresh_updates_count() + self.hbox_offline.hide() + self.connected = True + # trigger re-showing the current app to get changelog info (if needed) + self.on_treeview_update_cursor_changed(self.treeview_update) + else: + self.connected = False + self.label_offline.set_text(_("You may not be able to check for updates or download new updates.")) + #self.button_reload.set_sensitive(False) + self.refresh_updates_count() + self.hbox_offline.show() + self.vbox_alerts.show() + + def _on_battery_alert(self, watcher, on_battery): + if on_battery: + self.hbox_battery.show() + self.vbox_alerts.show() + else: + self.hbox_battery.hide() + + def _on_network_3g_alert(self, watcher, on_3g, is_roaming): + #print "on 3g: %s; roaming: %s" % (on_3g, is_roaming) + if is_roaming: + self.hbox_roaming.show() + self.hbox_on_3g.hide() + elif on_3g: + self.hbox_on_3g.show() + self.hbox_roaming.hide() + else: + self.hbox_on_3g.hide() + self.hbox_roaming.hide() + def row_activated(self, treeview, path, column): + iter = self.store.get_iter(path) + + pkg = self.store.get_value(iter, LIST_PKG) + origin = self.store.get_value(iter, LIST_ORIGIN) + if pkg is not None: + return + self.toggle_from_origin(pkg, origin, True) + def toggle_from_origin(self, pkg, origin, select_all = True ): + self.setBusy(True) + actiongroup = apt_pkg.ActionGroup(self.cache._depcache) + for pkg in self.list.pkgs[origin]: + if pkg.marked_install or pkg.marked_upgrade: + #print "marking keep: ", pkg.name + pkg.mark_keep() + elif not (pkg.name in self.list.held_back): + #print "marking install: ", pkg.name + pkg.mark_install(auto_fix=False,auto_inst=False) + # check if we left breakage + if self.cache._depcache.broken_count: + Fix = apt_pkg.ProblemResolver(self.cache._depcache) + Fix.resolve_by_keep() + self.refresh_updates_count() + self.treeview_update.queue_draw() + del actiongroup + self.setBusy(False) + + def toggled(self, renderer, path): + """ a toggle button in the listview was toggled """ + iter = self.store.get_iter(path) + pkg = self.store.get_value(iter, LIST_PKG) + origin = self.store.get_value(iter, LIST_ORIGIN) + # make sure that we don't allow to toggle deactivated updates + # this is needed for the call by the row activation callback + if pkg is None: + toggled_value = not self.store.get_value(iter, LIST_TOGGLE_CHECKED) + self.toggle_from_origin(pkg, origin, toggled_value) + self.store.set_value(iter, LIST_TOGGLE_CHECKED, toggled_value ) + self.treeview_update.queue_draw() + return + if pkg is None or pkg.name in self.list.held_back: + return False + self.setBusy(True) + # update the cache + if pkg.marked_install or pkg.marked_upgrade: + pkg.mark_keep() + if self.cache._depcache.broken_count: + Fix = apt_pkg.ProblemResolver(self.cache._depcache) + Fix.resolve_by_keep() + else: + try: + pkg.mark_install() + except SystemError: + pass + self.treeview_update.queue_draw() + self.refresh_updates_count() + self.setBusy(False) + + def on_treeview_update_row_activated(self, treeview, path, column, *args): + """ + If an update row was activated (by pressing space), toggle the + install check box + """ + self.toggled(None, path) + + def exit(self): + """ exit the application, save the state """ + self.save_state() + #Gtk.main_quit() + sys.exit(0) + + def save_state(self): + """ save the state (window-size for now) """ + (w, h) = self.window_main.get_size() + self.settings.set_int("window-width", w) + self.settings.set_int("window-height", h) + + def restore_state(self): + """ restore the state (window-size for now) """ + expanded = self.settings.get_boolean("show-details") + self.expander_details.set_expanded(expanded) + self.vbox_updates.set_child_packing(self.expander_details, + expanded, + True, + 0, + True) + w = self.settings.get_int("window-width") + h = self.settings.get_int("window-height") + if w > 0 and h > 0: + self.window_main.resize(w, h) + + def fillstore(self): + # use the watch cursor + self.setBusy(True) + # disconnect the view first + self.treeview_update.set_model(None) + self.store.clear() + + # clean most objects + self.dl_size = 0 + try: + self.initCache() + except SystemError, e: + msg = ("%s\n\n%s\n'%s'" % + (_("Could not initialize the package information"), + _("An unresolvable problem occurred while " + "initializing the package information.\n\n" + "Please report this bug against the 'update-manager' " + "package and include the following error message:\n"), + e) + ) + dialog = Gtk.MessageDialog(self.window_main, + 0, Gtk.MessageType.ERROR, + Gtk.ButtonsType.CLOSE,"") + dialog.set_markup(msg) + dialog.get_content_area().set_spacing(6) + dialog.run() + dialog.destroy() + sys.exit(1) + self.list = UpdateList(self) + + while Gtk.events_pending(): + Gtk.main_iteration() + + # fill them again + try: + # This is a quite nasty hack to stop the initial update + if not self.options.no_update: + self.list.update(self.cache) + else: + self.options.no_update = False + except SystemError, e: + msg = ("%s\n\n%s\n'%s'" % + (_("Could not calculate the upgrade"), + _("An unresolvable problem occurred while " + "calculating the upgrade.\n\n" + "Please report this bug against the 'update-manager' " + "package and include the following error message:"), + e) + ) + dialog = Gtk.MessageDialog(self.window_main, + 0, Gtk.MessageType.ERROR, + Gtk.ButtonsType.CLOSE,"") + dialog.set_markup(msg) + dialog.get_content_area().set_spacing(6) + dialog.run() + dialog.destroy() + if self.list.num_updates > 0: + #self.treeview_update.set_model(None) + self.scrolledwindow_update.show() + origin_list = self.list.pkgs.keys() + origin_list.sort(lambda x,y: cmp(x.importance,y.importance)) + origin_list.reverse() + for origin in origin_list: + self.store.append(['%s' % origin.description, + origin.description, None, origin,True]) + for pkg in self.list.pkgs[origin]: + name = xml.sax.saxutils.escape(pkg.name) + if not pkg.is_installed: + name += _(" (New install)") + summary = xml.sax.saxutils.escape(pkg.summary) + if self.summary_before_name: + contents = "%s\n%s" % (summary, name) + else: + contents = "%s\n%s" % (name, summary) + #TRANSLATORS: the b stands for Bytes + size = _("(Size: %s)") % humanize_size(pkg.packageSize) + if pkg.installedVersion != None: + version = _("From version %(old_version)s to %(new_version)s") %\ + {"old_version" : pkg.installedVersion, + "new_version" : pkg.candidateVersion} + else: + version = _("Version %s") % pkg.candidateVersion + if self.show_versions: + contents = "%s\n%s %s" % (contents, version, size) + else: + contents = "%s %s" % (contents, size) + self.store.append([contents, pkg.name, pkg, None, True]) + self.treeview_update.set_model(self.store) + self.update_count() + self.setBusy(False) + while Gtk.events_pending(): + Gtk.main_iteration() + self.check_all_updates_installable() + self.refresh_updates_count() + self.progress.all_done() + return False + + def dist_no_longer_supported(self, meta_release): + show_dist_no_longer_supported_dialog(self.window_main) + + def error(self, summary, details): + " helper function to display a error message " + msg = ("%s\n\n%s\n" % (summary, details) ) + dialog = Gtk.MessageDialog(self.window_main, + 0, Gtk.MessageType.ERROR, + Gtk.ButtonsType.CLOSE,"") + dialog.set_markup(msg) + dialog.get_content_area().set_spacing(6) + dialog.run() + dialog.destroy() + + def on_button_dist_upgrade_clicked(self, button): + #print "on_button_dist_upgrade_clicked" + if self.new_dist.upgrade_broken: + return self.error( + _("Release upgrade not possible right now"), + _("The release upgrade can not be performed currently, " + "please try again later. The server reported: '%s'") % self.new_dist.upgrade_broken) + fetcher = DistUpgradeFetcherGtk(new_dist=self.new_dist, parent=self, progress=GtkProgress.GtkFetchProgress(self, _("Downloading the release upgrade tool"))) + if self.options.sandbox: + fetcher.run_options.append("--sandbox") + fetcher.run() + + def new_dist_available(self, meta_release, upgradable_to): + self.frame_new_release.show() + self.label_new_release.set_markup(_("New Ubuntu release '%s' is available") % upgradable_to.version) + self.new_dist = upgradable_to + + + # fixme: we should probably abstract away all the stuff from libapt + def initCache(self): + # get the lock + try: + apt_pkg.pkgsystem_lock() + except SystemError: + pass + #d = Gtk.MessageDialog(parent=self.window_main, + # flags=Gtk.DialogFlags.MODAL, + # type=Gtk.MessageType.ERROR, + # buttons=Gtk.ButtonsType.CLOSE) + #d.set_markup("%s\n\n%s" % ( + # _("Only one software management tool is allowed to " + # "run at the same time"), + # _("Please close the other application e.g. 'aptitude' " + # "or 'Synaptic' first."))) + #print "error from apt: '%s'" % e + #d.set_title("") + #res = d.run() + #d.destroy() + #sys.exit() + + try: + if hasattr(self, "cache"): + self.cache.open(self.progress) + self.cache._initDepCache() + else: + self.cache = MyCache(self.progress) + except AssertionError: + # if the cache could not be opened for some reason, + # let the release upgrader handle it, it deals + # a lot better with this + self.ask_run_partial_upgrade() + # we assert a clean cache + msg=("%s\n\n%s"% \ + (_("Software index is broken"), + _("It is impossible to install or remove any software. " + "Please use the package manager \"Synaptic\" or run " + "\"sudo apt-get install -f\" in a terminal to fix " + "this issue at first."))) + dialog = Gtk.MessageDialog(self.window_main, + 0, Gtk.MessageType.ERROR, + Gtk.ButtonsType.CLOSE,"") + dialog.set_markup(msg) + dialog.get_content_area().set_spacing(6) + dialog.run() + dialog.destroy() + sys.exit(1) + + def check_auto_update(self): + # Check if automatic update is enabled. If not show a dialog to inform + # the user about the need of manual "reloads" + remind = self.settings.get_boolean("remind-reload") + if remind == False: + return + + update_days = apt_pkg.Config.find_i("APT::Periodic::Update-Package-Lists") + if update_days < 1: + self.dialog_manual_update.set_transient_for(self.window_main) + self.dialog_manual_update.set_title("") + res = self.dialog_manual_update.run() + self.dialog_manual_update.hide() + if res == Gtk.ResponseType.YES: + self.on_button_reload_clicked(None) + + def check_all_updates_installable(self): + """ Check if all available updates can be installed and suggest + to run a distribution upgrade if not """ + if self.list.distUpgradeWouldDelete > 0: + self.ask_run_partial_upgrade() + + def ask_run_partial_upgrade(self): + self.dialog_dist_upgrade.set_transient_for(self.window_main) + self.dialog_dist_upgrade.set_title("") + res = self.dialog_dist_upgrade.run() + self.dialog_dist_upgrade.hide() + if res == Gtk.ResponseType.YES: + os.execl("/usr/bin/gksu", + "/usr/bin/gksu", "--desktop", + "/usr/share/applications/update-manager.desktop", + "--", "/usr/bin/update-manager", "--dist-upgrade") + return False + + def check_hwe_support_status(self): + HWE = "/usr/bin/hwe-support-status" + if not os.path.exists(HWE): + return + cmd = [HWE, "--show-replacements"] + flags = GObject.SPAWN_DO_NOT_REAP_CHILD + (pid, stdin, stdout, stderr) = GObject.spawn_async( + cmd, standard_output=True, flags=flags) + GObject.child_watch_add( + pid, self._on_hwe_support_status_done, (stdout, stderr)) + + def _show_hide_hwe_frame(self): + for pkgname in self.hwe_replacement_packages: + if pkgname in self.cache and not self.cache[pkgname].is_installed: + self.label_new_hwe.set_markup("%s" % _( + "New hardware support is available")) + self.frame_new_hwe.show() + break + else: + self.frame_new_hwe.hide() + + def _on_hwe_support_status_done(self, pid, condition, data): + stdout_fd, stderr_fd = data + with os.fdopen(stdout_fd) as f: + output = f.read() + ret_code = os.WEXITSTATUS(condition) + if ret_code != 10: + logging.warning("nothing unsupported running %s (%s)" % ( + ret_code, condition)) + return + packages = output.strip().split() + self.hwe_replacement_packages = [] + for pkgname in packages: + if pkgname in self.cache and not self.cache[pkgname].is_installed: + self.hwe_replacement_packages.append(pkgname) + self._show_hide_hwe_frame() + + def on_button_new_hwe_clicked(self, button): + if self.hwe_replacement_packages: + # provide information about the update + from ReleaseNotesViewer import ReleaseNotesViewer + dialog = Gtk.MessageDialog( + self.window_main, + Gtk.DialogFlags.MODAL, + Gtk.MessageType.INFO, + Gtk.ButtonsType.NONE, + "") + dialog.set_markup( + "%s" % _("New hardware support is available")) + dialog.add_button(_("Cancel"), Gtk.ResponseType.CANCEL) + dialog.add_button(_("Upgrade"), Gtk.ResponseType.OK) + # setup content area + content_area = dialog.get_content_area() + rv = ReleaseNotesViewer( + _(HweSupportStatus.consts.Messages.HWE_SUPPORT_ENDS)) + rv.show() + content_area.pack_start(rv, True, True, 6) + # run it! + res = dialog.run() + dialog.destroy() + if res == Gtk.ResponseType.OK: + # lock window etc + self.window_main.set_sensitive(False) + self.window_main.get_window().set_cursor( + Gdk.Cursor.new(Gdk.CursorType.WATCH)) + self.install_backend.commit( + self.hwe_replacement_packages, [], False) + + def check_metarelease(self): + " check for new meta-release information " + settings = Gio.Settings("com.ubuntu.update-manager") + self.meta = MetaRelease(self.options.devel_release, + self.options.use_proposed) + self.meta.connect("dist_no_longer_supported",self.dist_no_longer_supported) + # check if we are interessted in dist-upgrade information + # (we are not by default on dapper) + if (self.options.check_dist_upgrades or + settings.get_boolean("check-dist-upgrades")): + self.meta.connect("new_dist_available",self.new_dist_available) + + def main(self, options): + self.options = options + + # check for new distributin information + self.check_metarelease() + + while Gtk.events_pending(): + Gtk.main_iteration() + + self.fillstore() + + # check for HardwareEnablement updates (needs to run after "fillstore") + # to ensure we have a cache + self.check_hwe_support_status() + + self.check_auto_update() + self.alert_watcher.check_alert_state() + Gtk.main() diff -Nru update-manager-17.10.11/UpdateManager/UpdateManagerVersion.py update-manager-0.156.14.15/UpdateManager/UpdateManagerVersion.py --- update-manager-17.10.11/UpdateManager/UpdateManagerVersion.py 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/UpdateManagerVersion.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# This file isn't used except in local checkouts, but one like it is written -# out in the build directory by setup.py -VERSION = 'bzr' diff -Nru update-manager-17.10.11/UpdateManager/UpdatesAvailable.py update-manager-0.156.14.15/UpdateManager/UpdatesAvailable.py --- update-manager-17.10.11/UpdateManager/UpdatesAvailable.py 2017-10-05 23:00:34.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManager/UpdatesAvailable.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,1065 +0,0 @@ -# UpdatesAvailable.py -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- -# -# Copyright (c) 2004-2013 Canonical -# 2004 Michiel Sikkes -# 2005 Martin Willemoes Hansen -# 2010 Mohamed Amine IL Idrissi -# -# Author: Michiel Sikkes -# Michael Vogt -# Martin Willemoes Hansen -# Mohamed Amine IL Idrissi -# Alex Launi -# Michael Terry -# Dylan McCall -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA - -from __future__ import absolute_import, print_function - -import gi -gi.require_version("Gtk", "3.0") -from gi.repository import GLib -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GObject -from gi.repository import Gio -from gi.repository import Pango - -import warnings -warnings.filterwarnings("ignore", "Accessed deprecated property", - DeprecationWarning) - -import apt_pkg - -import os -import re -import logging -import time -import threading - -from gettext import gettext as _ -from gettext import ngettext - -from .Core.utils import humanize_size -from .Core.AlertWatcher import AlertWatcher -from .Core.UpdateList import UpdateSystemGroup -from .Dialogs import InternalDialog - -from DistUpgrade.DistUpgradeCache import NotEnoughFreeSpaceError - -from .ChangelogViewer import ChangelogViewer -from .UnitySupport import UnitySupport - - -#import pdb - -# FIXME: -# - kill "all_changes" and move the changes into the "Update" class -# - screen reader does not read update toggle state -# - screen reader does not say "Downloaded" for downloaded updates - -# list constants -(LIST_NAME, LIST_UPDATE_DATA, LIST_SIZE, LIST_TOGGLE_ACTIVE) = range(4) - -# NetworkManager enums -from .Core.roam import NetworkManagerHelper - - -class UpdateData(): - def __init__(self, groups, group, item): - self.groups = groups if groups else [] - self.group = group - self.item = item - - -class CellAreaPackage(Gtk.CellAreaBox): - """This CellArea lays our package cells side by side, without allocating - width for a cell if it isn't present (like icons for header labels). - We assume that the last cell should be expanded to fill remaining space, - and other cells have a fixed width. - """ - - def __init__(self, indent_toplevel=False): - Gtk.CellAreaBox.__init__(self) - self.indent_toplevel = indent_toplevel - self.column = None - self.cached_cell_size = {} - - def do_foreach_alloc(self, context, widget, cell_area_in, bg_area_in, - callback): - cells = [] - - def gather(cell, data): - cells.append(cell) - - self.foreach(gather, None) - - cell_is_hidden = {} - - # Record the space required by each cell - for cell_number, cell in enumerate(cells): - # Detect if this cell should be allocated space - if isinstance(cell, Gtk.CellRendererPixbuf): - gicon = cell.get_property("gicon") - hide_cell = gicon is None - else: - hide_cell = False - cell_is_hidden[cell_number] = hide_cell - - if not hide_cell and cell_number not in self.cached_cell_size: - min_size, natural_size = cell.get_preferred_width(widget) - self.cached_cell_size[cell_number] = natural_size - - cell_area = cell_area_in.copy() - bg_area = bg_area_in.copy() - spacing = self.get_property("spacing") - cell_start = self.get_cell_start(widget) - orig_end = cell_area.width + cell_area.x - cur_path = self.get_current_path_string() - depth = Gtk.TreePath.new_from_string(cur_path).get_depth() - - # And finally, start handling each cell - extra_cell_width = 0 - cell_area.x = cell_start - cell_area.width = 0 - - last_cell_number = len(cells) - 1 - for cell_number, cell in enumerate(cells): - is_last_cell = cell_number == last_cell_number - cell_size = self.cached_cell_size.get(cell_number, 0) - - if cell_area.width > 0 and extra_cell_width == 0: - cell_area.x += cell_area.width + spacing - - if cell_number == 0: - # The first cell is affected by its depth in the tree - if not cell_is_hidden[1] and self.indent_toplevel: - # if not a header, align with header rows - depth += 1 - if depth > 1: - indent = max(0, depth - 1) - indent_size = cell_size * indent - if depth == 2: - indent_extra = spacing - elif depth == 3: - indent_extra = spacing + 1 - else: - indent_extra = spacing * indent - cell_area.x += indent_size + indent_extra - - if is_last_cell: - cell_size = max(cell_size, orig_end - cell_area.x) - if not cell_is_hidden[cell_number]: - cell_area.width = cell_size + extra_cell_width - extra_cell_width = 0 - else: - cell_area.width = 0 - extra_cell_width = cell_size + spacing - - if callback(cell, cell_area.copy(), bg_area.copy()): - return - - def do_event(self, context, widget, event, cell_area, flags): - # This override is just to trick our parent implementation into - # allowing clicks on toggle cells when they are where the expanders - # usually are. It doesn't expect that, so we expand the cell_area - # here to be equivalent to bg_area. - cell_start = self.get_cell_start(widget) - cell_area.width = cell_area.width + cell_area.x - cell_start - cell_area.x = cell_start - return Gtk.CellAreaBox.do_event(self, context, widget, event, - cell_area, flags) - - def get_cell_start(self, widget): - if not self.column: - return 0 - else: - val = GObject.Value() - val.init(int) - widget.style_get_property("horizontal-separator", val) - h_sep = val.get_int() - widget.style_get_property("grid-line-width", val) - line_width = val.get_int() - cell_start = self.column.get_x_offset() - h_sep - line_width - if not self.indent_toplevel: # i.e. if no headers - widget.style_get_property("expander-size", val) - spacing = self.get_property("spacing") - # Hardcode 4 because GTK+ hardcodes 4 internally - cell_start = cell_start + val.get_int() + 4 + spacing - return cell_start - - -class UpdatesAvailable(InternalDialog): - APP_INSTALL_ICONS_PATH = "/usr/share/app-install/icons" - - def __init__(self, window_main, header=None, desc=None, - need_reboot=False): - InternalDialog.__init__(self, window_main) - - self.window_main = window_main - self.datadir = window_main.datadir - self.cache = window_main.cache - - self.custom_header = header - self.custom_desc = desc - self.need_reboot = need_reboot - - content_ui_path = os.path.join(self.datadir, - "gtkbuilder/UpdateManager.ui") - self._load_ui(content_ui_path, "pane_updates_available") - self.set_content_widget(self.pane_updates_available) - - self.dl_size = 0 - self.connected = True - - # Used for inhibiting power management - self.sleep_cookie = None - - self.settings = Gio.Settings.new("com.ubuntu.update-manager") - - # Special icon theme for looking up app-install-data icons - self.app_icons = Gtk.IconTheme.get_default() - self.app_icons.append_search_path(self.APP_INSTALL_ICONS_PATH) - - # Create Unity launcher quicklist - # FIXME: instead of passing parent we really should just send signals - self.unity = UnitySupport(parent=self) - - # setup the help viewer and disable the help button if there - # is no viewer available - #self.help_viewer = HelpViewer("update-manager") - #if self.help_viewer.check() == False: - # self.button_help.set_sensitive(False) - - self.add_settings_button() - self.button_close = self.add_button(Gtk.STOCK_CANCEL, - self.window_main.close) - self.button_install = self.add_button(_("Install Now"), - self.on_button_install_clicked) - self.focus_button = self.button_install - - # create text view - self.textview_changes = ChangelogViewer() - self.textview_changes.show() - self.scrolledwindow_changes.add(self.textview_changes) - changes_buffer = self.textview_changes.get_buffer() - changes_buffer.create_tag("versiontag", weight=Pango.Weight.BOLD) - - # the treeview (move into it's own code!) - self.store = Gtk.TreeStore(str, GObject.TYPE_PYOBJECT, str, bool) - self.treeview_update.set_model(None) - - self.image_restart.set_from_gicon(self.get_restart_icon(), - Gtk.IconSize.BUTTON) - - restart_icon_renderer = Gtk.CellRendererPixbuf() - restart_icon_renderer.set_property("xpad", 4) - restart_icon_renderer.set_property("ypad", 2) - restart_icon_renderer.set_property("stock-size", Gtk.IconSize.MENU) - restart_icon_renderer.set_property("follow-state", True) - restart_column = Gtk.TreeViewColumn(None, restart_icon_renderer) - restart_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED) - restart_column.set_fixed_width(20) - self.treeview_update.append_column(restart_column) - restart_column.set_cell_data_func(restart_icon_renderer, - self.restart_icon_renderer_data_func) - - self.pkg_cell_area = CellAreaPackage(False) - pkg_column = Gtk.TreeViewColumn.new_with_area(self.pkg_cell_area) - self.pkg_cell_area.column = pkg_column - pkg_column.set_title(_("Install")) - pkg_column.set_property("spacing", 4) - pkg_column.set_expand(True) - self.treeview_update.append_column(pkg_column) - - pkg_toggle_renderer = Gtk.CellRendererToggle() - pkg_toggle_renderer.set_property("ypad", 2) - pkg_toggle_renderer.connect("toggled", self.on_update_toggled) - pkg_column.pack_start(pkg_toggle_renderer, False) - pkg_column.add_attribute(pkg_toggle_renderer, - 'active', LIST_TOGGLE_ACTIVE) - pkg_column.set_cell_data_func(pkg_toggle_renderer, - self.pkg_toggle_renderer_data_func) - - pkg_icon_renderer = Gtk.CellRendererPixbuf() - pkg_icon_renderer.set_property("ypad", 2) - pkg_icon_renderer.set_property("stock-size", Gtk.IconSize.MENU) - pkg_column.pack_start(pkg_icon_renderer, False) - pkg_column.set_cell_data_func(pkg_icon_renderer, - self.pkg_icon_renderer_data_func) - - pkg_label_renderer = Gtk.CellRendererText() - pkg_label_renderer.set_property("ypad", 2) - pkg_label_renderer.set_property("ellipsize", Pango.EllipsizeMode.END) - pkg_column.pack_start(pkg_label_renderer, True) - pkg_column.set_cell_data_func(pkg_label_renderer, - self.pkg_label_renderer_data_func) - - size_renderer = Gtk.CellRendererText() - size_renderer.set_property("xpad", 6) - size_renderer.set_property("ypad", 0) - size_renderer.set_property("xalign", 1) - # 1.0/1.2 == PANGO.Scale.SMALL. Constant is not (yet) introspected. - size_renderer.set_property("scale", 1.0 / 1.2) - size_column = Gtk.TreeViewColumn(_("Download"), size_renderer, - text=LIST_SIZE) - size_column.set_sizing(Gtk.TreeViewColumnSizing.AUTOSIZE) - self.treeview_update.append_column(size_column) - - self.treeview_update.set_headers_visible(True) - self.treeview_update.set_headers_clickable(False) - self.treeview_update.set_direction(Gtk.TextDirection.LTR) - self.treeview_update.set_fixed_height_mode(False) - self.treeview_update.set_expander_column(pkg_column) - self.treeview_update.set_search_column(LIST_NAME) - self.treeview_update.connect("button-press-event", - self.on_treeview_button_press) - - # init show version - self.show_versions = self.settings.get_boolean("show-versions") - # init summary_before_name - self.summary_before_name = self.settings.get_boolean( - "summary-before-name") - - # expander - self.expander_details.set_expanded( - self.settings.get_boolean("show-details")) - self.expander_details.connect("activate", self.pre_activate_details) - self.expander_details.connect("notify::expanded", - self.activate_details) - self.expander_desc.connect("notify::expanded", self.activate_desc) - - # If auto-updates are on, change cancel label - self.notifier_settings = Gio.Settings.new("com.ubuntu.update-notifier") - self.notifier_settings.connect( - "changed::auto-launch", - lambda s, p: self.update_close_button()) - self.update_close_button() - - # Alert watcher - self.alert_watcher = AlertWatcher() - self.alert_watcher.connect("network-alert", self._on_network_alert) - self.alert_watcher.connect("battery-alert", self._on_battery_alert) - self.alert_watcher.connect("network-3g-alert", - self._on_network_3g_alert) - - def stop(self): - InternalDialog.stop(self) - self._save_state() - - def start(self): - InternalDialog.start(self) - self.set_update_list(self.window_main.update_list) - self.alert_watcher.check_alert_state() - self._restore_state() - - def is_auto_update(self): - update_days = apt_pkg.config.find_i( - "APT::Periodic::Update-Package-Lists") - return update_days >= 1 - - def update_close_button(self): - if self.is_auto_update(): - self.button_close.set_label(_("_Remind Me Later")) - self.button_close.set_use_stock(False) - self.button_close.set_use_underline(True) - else: - self.button_close.set_label(Gtk.STOCK_CANCEL) - self.button_close.set_use_stock(True) - self.button_close.set_use_underline(False) - - def install_all_updates(self, menu, menuitem, data): - self.select_all_upgrades(None) - self.on_button_install_clicked() - - def pkg_requires_restart(self, pkg): - if pkg is None or pkg.candidate is None: - return False - restart_condition = pkg.candidate.record.get('Restart-Required') - return restart_condition == 'system' - - def get_restart_icon(self): - # FIXME: Non-standard, incorrect icon name (from app category). - # Theme support for what we want seems to be lacking. - restart_icon_names = ['view-refresh-symbolic', - 'system-restart', - 'system-reboot'] - return Gio.ThemedIcon.new_from_names(restart_icon_names) - - def restart_icon_renderer_data_func(self, cell_layout, renderer, model, - iter, user_data): - data = model.get_value(iter, LIST_UPDATE_DATA) - path = model.get_path(iter) - - requires_restart = False - if data.item and data.item.pkg: - requires_restart = self.pkg_requires_restart(data.item.pkg) - elif data.group: - if not self.treeview_update.row_expanded(path): - # A package in the group requires restart - for group_item in data.group.items: - if group_item.pkg and self.pkg_requires_restart( - group_item.pkg): - requires_restart = True - break - - if requires_restart: - gicon = self.get_restart_icon() - else: - gicon = None - renderer.set_property("gicon", gicon) - - def pkg_toggle_renderer_data_func(self, cell_layout, renderer, model, - iter, user_data): - data = model.get_value(iter, LIST_UPDATE_DATA) - - activatable = False - inconsistent = False - if data.item: - activatable = data.item.pkg.name not in self.list.held_back - inconsistent = False - elif data.group: - activatable = True - inconsistent = data.group.selection_is_inconsistent() - elif data.groups: - activatable = True - inconsistent = False - saw_install = None - for group in data.groups: - for item in group.items: - this_install = item.is_selected() - if saw_install is not None and saw_install != this_install: - inconsistent = True - break - saw_install = this_install - if inconsistent: - break - - # The "active" attribute is already set via LIST_TOGGLE_ACTIVE in the - # tree model, so we don't set it here. - renderer.set_property("activatable", activatable) - renderer.set_property("inconsistent", inconsistent) - - def pkg_icon_renderer_data_func(self, cell_layout, renderer, model, - iter, user_data): - data = model.get_value(iter, LIST_UPDATE_DATA) - - gicon = None - if data.group: - gicon = self.get_app_install_icon(data.group.icon) - elif data.item: - gicon = self.get_app_install_icon(data.item.icon) - - renderer.set_property("gicon", gicon) - - def get_app_install_icon(self, icon): - """Any application icon is coming from app-install-data's desktop - files, which refer to icons from app-install-data's icon directory. - So we look them up here.""" - - if not isinstance(icon, Gio.ThemedIcon): - return icon # shouldn't happen - - info = self.app_icons.choose_icon(icon.get_names(), 16, - Gtk.IconLookupFlags.FORCE_SIZE) - if info is not None: - return Gio.FileIcon.new(Gio.File.new_for_path(info.get_filename())) - else: - return icon # Assume it's in one of the user's themes - - def pkg_label_renderer_data_func(self, cell_layout, renderer, model, - iter, user_data): - data = model.get_value(iter, LIST_UPDATE_DATA) - name = GLib.markup_escape_text(model.get_value(iter, LIST_NAME)) - - if data.group: - markup = name - elif data.item: - markup = name - else: # header - markup = "%s" % name - - renderer.set_property("markup", markup) - - def set_changes_buffer(self, changes_buffer, text, name, srcpkg): - changes_buffer.set_text("") - lines = text.split("\n") - if len(lines) == 1: - changes_buffer.set_text(text) - return - - for line in lines: - end_iter = changes_buffer.get_end_iter() - version_match = re.match( - r'^%s \((.*)\)(.*)\;.*$' % re.escape(srcpkg), line) - #bullet_match = re.match("^.*[\*-]", line) - author_match = re.match("^.*--.*<.*@.*>.*$", line) - if version_match: - version = version_match.group(1) - #upload_archive = version_match.group(2).strip() - version_text = _("Version %s: \n") % version - changes_buffer.insert_with_tags_by_name(end_iter, version_text, - "versiontag") - elif (author_match): - pass - else: - changes_buffer.insert(end_iter, line + "\n") - - def on_treeview_update_cursor_changed(self, widget): - path = widget.get_cursor()[0] - # check if we have a path at all - if path is None: - return - model = widget.get_model() - iter = model.get_iter(path) - - # set descr - data = model.get_value(iter, LIST_UPDATE_DATA) - item = data.item - if (item is None and data.group is not None and - data.group.core_item is not None): - item = data.group.core_item - if (item is None or item.pkg is None or - item.pkg.candidate is None or - item.pkg.candidate.description is None): - changes_buffer = self.textview_changes.get_buffer() - changes_buffer.set_text("") - desc_buffer = self.textview_descr.get_buffer() - desc_buffer.set_text("") - self.notebook_details.set_sensitive(False) - return - long_desc = item.pkg.candidate.description - self.notebook_details.set_sensitive(True) - # do some regular expression magic on the description - # Add a newline before each bullet - p = re.compile(r'^(\s|\t)*(\*|0|-)', re.MULTILINE) - long_desc = p.sub('\n*', long_desc) - # replace all newlines by spaces - p = re.compile(r'\n', re.MULTILINE) - long_desc = p.sub(" ", long_desc) - # replace all multiple spaces by newlines - p = re.compile(r'\s\s+', re.MULTILINE) - long_desc = p.sub("\n", long_desc) - - desc_buffer = self.textview_descr.get_buffer() - desc_buffer.set_text(long_desc) - - # now do the changelog - name = item.pkg.name - if name is None: - return - - changes_buffer = self.textview_changes.get_buffer() - - # check if we have the changes already and if so, display them - # (even if currently disconnected) - if name in self.cache.all_changes: - changes = self.cache.all_changes[name] - srcpkg = self.cache[name].candidate.source_name - self.set_changes_buffer(changes_buffer, changes, name, srcpkg) - # if not connected, do not even attempt to get the changes - elif not self.connected: - changes_buffer.set_text( - _("No network connection detected, you can not download " - "changelog information.")) - # else, get it from the entwork - elif self.expander_details.get_expanded(): - lock = threading.Lock() - lock.acquire() - changelog_thread = threading.Thread( - target=self.cache.get_news_and_changelog, args=(name, lock)) - changelog_thread.start() - changes_buffer.set_text("%s\n" % - _("Downloading list of changes...")) - iter = changes_buffer.get_iter_at_line(1) - anchor = changes_buffer.create_child_anchor(iter) - button = Gtk.Button(stock="gtk-cancel") - self.textview_changes.add_child_at_anchor(button, anchor) - button.show() - id = button.connect("clicked", - lambda w, lock: lock.release(), lock) - # wait for the dl-thread - while lock.locked(): - time.sleep(0.01) - while Gtk.events_pending(): - Gtk.main_iteration() - # download finished (or canceld, or time-out) - button.hide() - if button.handler_is_connected(id): - button.disconnect(id) - # check if we still are in the right pkg (the download may have taken - # some time and the user may have clicked on a new pkg) - now_path = widget.get_cursor()[0] - if now_path is None: - return - if path != now_path: - return - # display NEWS.Debian first, then the changelog - changes = "" - srcpkg = self.cache[name].candidate.source_name - if name in self.cache.all_news: - changes += self.cache.all_news[name] - if name in self.cache.all_changes: - changes += self.cache.all_changes[name] - if changes: - self.set_changes_buffer(changes_buffer, changes, name, srcpkg) - - def on_treeview_button_press(self, widget, event): - """ - Show a context menu if a right click was performed on an update entry - """ - if event.type == Gdk.EventType.BUTTON_PRESS and event.button == 3: - # need to keep a reference here of menu, otherwise it gets - # deleted when it goes out of scope and no menu is visible - # (bug #806949) - self.menu = menu = Gtk.Menu() - item_select_none = \ - Gtk.MenuItem.new_with_mnemonic(_("_Deselect All")) - item_select_none.connect("activate", self.select_none_upgrades) - menu.append(item_select_none) - num_updates = self.cache.install_count - if num_updates == 0: - item_select_none.set_property("sensitive", False) - item_select_all = Gtk.MenuItem.new_with_mnemonic(_("Select _All")) - item_select_all.connect("activate", self.select_all_upgrades) - menu.append(item_select_all) - menu.show_all() - menu.popup_for_device( - None, None, None, None, None, event.button, event.time) - menu.show() - return True - - # we need this for select all/unselect all - def _toggle_group_headers(self, new_selection_value): - """ small helper that will set/unset the group headers - """ - model = self.treeview_update.get_model() - for row in model: - data = model.get_value(row.iter, LIST_UPDATE_DATA) - if data.groups is not None or data.group is not None: - model.set_value(row.iter, LIST_TOGGLE_ACTIVE, - new_selection_value) - - def select_all_upgrades(self, widget): - """ - Select all updates - """ - self.setBusy(True) - self.cache.saveDistUpgrade() - self._toggle_group_headers(True) - self.treeview_update.queue_draw() - self.updates_changed() - self.setBusy(False) - - def select_none_upgrades(self, widget): - """ - Select none updates - """ - self.setBusy(True) - self.cache.clear() - self._toggle_group_headers(False) - self.treeview_update.queue_draw() - self.updates_changed() - self.setBusy(False) - - def setBusy(self, flag): - """ Show a watch cursor if the app is busy for more than 0.3 sec. - Furthermore provide a loop to handle user interface events """ - if self.window_main.get_window() is None: - return - if flag: - self.window_main.get_window().set_cursor( - Gdk.Cursor.new(Gdk.CursorType.WATCH)) - else: - self.window_main.get_window().set_cursor(None) - while Gtk.events_pending(): - Gtk.main_iteration() - - def _mark_selected_updates(self): - def foreach_cb(model, path, iter, data): - data = model.get_value(iter, LIST_UPDATE_DATA) - active = False - if data.item: - active = data.item.is_selected() - elif data.group: - active = data.group.packages_are_selected() - elif data.groups: - active = any([g.packages_are_selected() for g in data.groups]) - model.set_value(iter, LIST_TOGGLE_ACTIVE, active) - self.store.foreach(foreach_cb, None) - - def _check_for_required_restart(self): - requires_restart = False - - def foreach_cb(model, path, iter, data): - data = model.get_value(iter, LIST_UPDATE_DATA) - active = model.get_value(iter, LIST_TOGGLE_ACTIVE) - if not active: - return - pkg = None - if data.item: - pkg = data.item.pkg - elif data.group and data.group.core_item: - pkg = data.group.core_item.pkg - if pkg and self.pkg_requires_restart(pkg): - nonlocal requires_restart - requires_restart = True - - self.store.foreach(foreach_cb, None) - self.hbox_restart.set_visible(requires_restart) - - def _refresh_updates_count(self): - self.button_install.set_sensitive(self.cache.install_count) - try: - inst_count = self.cache.install_count - self.dl_size = self.cache.required_download - download_str = "" - if self.dl_size != 0: - download_str = _("%s will be downloaded.") % ( - humanize_size(self.dl_size)) - self.image_downsize.set_sensitive(True) - # do not set the buttons to sensitive/insensitive until NM - # can deal with dialup connections properly - #if self.alert_watcher.network_state != NM_STATE_CONNECTED: - # self.button_install.set_sensitive(False) - #else: - # self.button_install.set_sensitive(True) - self.button_install.set_sensitive(True) - self.unity.set_install_menuitem_visible(True) - else: - if inst_count > 0: - download_str = ngettext( - "The update has already been downloaded.", - "The updates have already been downloaded.", - inst_count) - self.button_install.set_sensitive(True) - self.unity.set_install_menuitem_visible(True) - else: - download_str = _("There are no updates to install.") - self.button_install.set_sensitive(False) - self.unity.set_install_menuitem_visible(False) - self.image_downsize.set_sensitive(False) - self.label_downsize.set_text(download_str) - self.hbox_downsize.show() - self.vbox_alerts.show() - except SystemError as e: - print("required_download could not be calculated: %s" % e) - self.label_downsize.set_markup(_("Unknown download size.")) - self.image_downsize.set_sensitive(False) - self.hbox_downsize.show() - self.vbox_alerts.show() - - def updates_changed(self): - self._mark_selected_updates() - self._check_for_required_restart() - self._refresh_updates_count() - - def update_count(self): - """activate or disable widgets and show dialog texts corresponding to - the number of available updates""" - self.updates_changed() - - text_header = None - text_desc = None - - if self.custom_header is not None: - text_header = self.custom_header - if self.custom_desc is not None: - text_desc = self.custom_desc - - # show different text on first run (UX team suggestion) - elif self.settings.get_boolean("first-run"): - flavor = self.window_main.meta_release.flavor_name - version = self.window_main.meta_release.current_dist_version - text_header = _("Updated software has been issued since %s %s " - "was released. Do you want to install " - "it now?") % (flavor, version) - self.settings.set_boolean("first-run", False) - else: - text_header = _("Updated software is available for this " - "computer. Do you want to install it now?") - if not self.hbox_restart.get_visible() and self.need_reboot: - text_desc = _("The computer also needs to restart " - "to finish installing previous updates.") - - self.notebook_details.set_sensitive(True) - self.treeview_update.set_sensitive(True) - self.set_header(text_header) - self.set_desc(text_desc) - - return True - - # Before we shrink the window, capture the size - def pre_activate_details(self, expander): - expanded = self.expander_details.get_expanded() - if expanded: - self._save_state() - - def activate_details(self, expander, data): - expanded = self.expander_details.get_expanded() - self.settings.set_boolean("show-details", expanded) - if expanded: - self.on_treeview_update_cursor_changed(self.treeview_update) - self._restore_state() - - def activate_desc(self, expander, data): - expanded = self.expander_desc.get_expanded() - self.expander_desc.set_vexpand(expanded) - - def on_button_install_clicked(self): - self.unity.set_install_menuitem_visible(False) - # print("on_button_install_clicked") - err_sum = _("Not enough free disk space") - err_msg = _("The upgrade needs a total of %s free space on " - "disk '%s'. " - "Please free at least an additional %s of disk " - "space on '%s'. %s") - # specific ways to resolve lack of free space - remedy_archivedir = _("Remove temporary packages of former " - "installations using 'sudo apt clean'.") - remedy_boot = _("You can remove old kernels using " - "'sudo apt autoremove', and you could also " - "set COMPRESS=xz in " - "/etc/initramfs-tools/initramfs.conf to " - "reduce the size of your initramfs.") - remedy_root = _("Empty your trash and remove temporary " - "packages of former installations using " - "'sudo apt clean'.") - remedy_tmp = _("Reboot to clean up files in /tmp.") - remedy_usr = _("") - # check free space and error if its not enough - try: - self.cache.checkFreeSpace() - except NotEnoughFreeSpaceError as e: - # CheckFreeSpace examines where packages are cached - archivedir = apt_pkg.config.find_dir("Dir::Cache::archives") - err_long = "" - for req in e.free_space_required_list: - if err_long != "": - err_long += " " - if req.dir == archivedir: - err_long += err_msg % (req.size_total, req.dir, - req.size_needed, req.dir, - remedy_archivedir) - elif req.dir == "/boot": - err_long += err_msg % (req.size_total, req.dir, - req.size_needed, req.dir, - remedy_boot) - elif req.dir == "/": - err_long += err_msg % (req.size_total, req.dir, - req.size_needed, req.dir, - remedy_root) - elif req.dir == "/tmp": - err_long += err_msg % (req.size_total, req.dir, - req.size_needed, req.dir, - remedy_tmp) - elif req.dir == "/usr": - err_long += err_msg % (req.size_total, req.dir, - req.size_needed, req.dir, - remedy_usr) - self.window_main.start_error(False, err_sum, err_long) - return - except SystemError as e: - logging.exception("free space check failed") - self.window_main.start_install() - - def _on_network_alert(self, watcher, state): - # do not set the buttons to sensitive/insensitive until NM - # can deal with dialup connections properly - if state in NetworkManagerHelper.NM_STATE_CONNECTING_LIST: - self.label_offline.set_text(_("Connecting...")) - self.updates_changed() - self.hbox_offline.show() - self.vbox_alerts.show() - self.connected = False - # in doubt (STATE_UNKNOWN), assume connected - elif (state in NetworkManagerHelper.NM_STATE_CONNECTED_LIST or - state == NetworkManagerHelper.NM_STATE_UNKNOWN): - self.updates_changed() - self.hbox_offline.hide() - self.connected = True - # trigger re-showing the current app to get changelog info (if - # needed) - self.on_treeview_update_cursor_changed(self.treeview_update) - else: - self.connected = False - self.label_offline.set_text(_("You may not be able to check for " - "updates or download new updates.")) - self.updates_changed() - self.hbox_offline.show() - self.vbox_alerts.show() - - def _on_battery_alert(self, watcher, on_battery): - if on_battery: - self.hbox_battery.show() - self.vbox_alerts.show() - else: - self.hbox_battery.hide() - - def _on_network_3g_alert(self, watcher, on_3g, is_roaming): - #print("on 3g: %s; roaming: %s" % (on_3g, is_roaming)) - if is_roaming: - self.hbox_roaming.show() - self.hbox_on_3g.hide() - elif on_3g: - self.hbox_on_3g.show() - self.hbox_roaming.hide() - else: - self.hbox_on_3g.hide() - self.hbox_roaming.hide() - - def on_update_toggled(self, renderer, path): - """ a toggle button in the listview was toggled """ - iter = self.store.get_iter(path) - data = self.store.get_value(iter, LIST_UPDATE_DATA) - # make sure that we don't allow to toggle deactivated updates - # this is needed for the call by the row activation callback - if data.groups: - self.toggle_from_items([item for group in data.groups - for item in group.items]) - elif data.group: - self.toggle_from_items(data.group.items) - else: - self.toggle_from_items([data.item]) - - def on_treeview_update_row_activated(self, treeview, path, column, *args): - """ - If an update row was activated (by pressing space), toggle the - install check box - """ - self.on_update_toggled(None, path) - - def toggle_from_items(self, items): - self.setBusy(True) - actiongroup = apt_pkg.ActionGroup(self.cache._depcache) - - # Deselect all updates if any are selected - keep_packages = any([item.is_selected() for item in items]) - for item in items: - try: - if keep_packages: - item.pkg.mark_keep() - elif item.pkg.name not in self.list.held_back: - item.pkg.mark_install() - except SystemError: - pass - - # check if we left breakage - if self.cache._depcache.broken_count: - Fix = apt_pkg.ProblemResolver(self.cache._depcache) - Fix.resolve_by_keep() - self.updates_changed() - self.treeview_update.queue_draw() - del actiongroup - self.setBusy(False) - - def _save_state(self): - """ save the state (window-size for now) """ - if self.expander_details.get_expanded(): - (w, h) = self.window_main.get_size() - self.settings.set_int("window-width", w) - self.settings.set_int("window-height", h) - - def _restore_state(self): - """ restore the state (window-size for now) """ - w = self.settings.get_int("window-width") - h = self.settings.get_int("window-height") - expanded = self.expander_details.get_expanded() - if expanded: - self.window_main.begin_user_resizable(w, h) - else: - self.window_main.end_user_resizable() - return False - - def _add_header(self, name, groups): - total_size = 0 - for group in groups: - total_size = total_size + group.get_total_size() - header_row = [ - name, - UpdateData(groups, None, None), - humanize_size(total_size), - True - ] - return self.store.append(None, header_row) - - def _add_groups(self, groups): - # Each row contains: - # row label (for screen reader), - # update data tuple (is_toplevel, group object, package object), - # update size, - # update selection state - for group in groups: - if not group.items: - continue - - group_is_item = None - if not isinstance(group, UpdateSystemGroup) and \ - len(group.items) == 1: - group_is_item = group.items[0] - - group_row = [ - group.name, - UpdateData(None, group, group_is_item), - humanize_size(group.get_total_size()), - True - ] - group_iter = self.store.append(None, group_row) - - if group_is_item: - continue - for item in group.items: - item_row = [ - item.name, - UpdateData(None, None, item), - humanize_size(getattr(item.pkg.candidate, "size", 0)), - True - ] - self.store.append(group_iter, item_row) - - def set_update_list(self, update_list): - self.list = update_list - - # use the watch cursor - self.setBusy(True) - # disconnect the view first - self.treeview_update.set_model(None) - self.store.clear() - # clean most objects - self.dl_size = 0 - - self.scrolledwindow_update.show() - - # add security and update groups to self.store - if self.list.security_groups: - self._add_header(_("Security updates"), self.list.security_groups) - self._add_groups(self.list.security_groups) - if self.list.security_groups and self.list.update_groups: - self._add_header(_("Other updates"), self.list.update_groups) - if self.list.update_groups: - self._add_groups(self.list.update_groups) - - self.treeview_update.set_model(self.store) - self.pkg_cell_area.indent_toplevel = bool(self.list.security_groups) - self.update_close_button() - self.update_count() - self.setBusy(False) - while Gtk.events_pending(): - Gtk.main_iteration() - self.updates_changed() - return False diff -Nru update-manager-17.10.11/update-manager-text update-manager-0.156.14.15/update-manager-text --- update-manager-17.10.11/update-manager-text 2017-01-05 18:01:57.000000000 +0000 +++ update-manager-0.156.14.15/update-manager-text 2017-12-23 05:00:38.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/python # update-manager-text - easy updating application # # Copyright (c) 2004-2008 Canonical @@ -21,15 +21,14 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA -from __future__ import print_function - from UpdateManagerText.UpdateManagerText import UpdateManagerText import sys import os -from UpdateManager.UpdateManagerVersion import VERSION +from DistUpgrade.DistUpgradeVersion import VERSION import locale import gettext +from gettext import gettext as _ from optparse import OptionParser @@ -37,35 +36,31 @@ APP="update-manager" DIR="/usr/share/locale" - #FIXME: Workaround a bug in optparser which doesn't handle unicode/str - # correctly, see http://bugs.python.org/issue4391 - # Should be resolved by Python3 gettext.bindtextdomain(APP, DIR) gettext.textdomain(APP) - translation = gettext.translation(APP, fallback=True) - if sys.version >= '3': - _ = translation.gettext - else: - _ = translation.ugettext # Begin parsing of options parser = OptionParser() + #FIXME: Workaround a bug in optparser which doesn't handle unicode/str + # correctly, see http://bugs.python.org/issue4391 + # Should be resolved by Python3 + enc = locale.getpreferredencoding() parser.add_option ("-V", "--version", action="store_true", dest="show_version", default=False, - help=_("Show version and exit")) + help=_("Show version and exit").decode(enc)) parser.add_option ("--show-description", "--show-description", action="store_true", dest="show_description", default=False, help=_("Show description of the package instead of " - "the changelog")) + "the changelog").decode(enc)) (options, args) = parser.parse_args() data_dir="/usr/share/update-manager/" if options.show_version: - print("%s: version %s" % (os.path.basename(sys.argv[0]), VERSION)) + print "%s: version %s" % (os.path.basename(sys.argv[0]), VERSION) sys.exit(0) app = UpdateManagerText(data_dir) - app.main(options) + app.main(options) diff -Nru update-manager-17.10.11/UpdateManagerText/UpdateManagerText.py update-manager-0.156.14.15/UpdateManagerText/UpdateManagerText.py --- update-manager-17.10.11/UpdateManagerText/UpdateManagerText.py 2017-08-07 19:04:39.000000000 +0000 +++ update-manager-0.156.14.15/UpdateManagerText/UpdateManagerText.py 2017-12-23 05:00:38.000000000 +0000 @@ -1,13 +1,10 @@ -#!/usr/bin/python3 -# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*- - -from __future__ import print_function +#!/usr/bin/python +# -*- coding: utf-8 -*- import apt import apt_pkg -import operator import sys -import threading +import thread import time from gettext import gettext as _ @@ -22,40 +19,39 @@ snackArgs, ) - class UpdateManagerText(object): DEBUG = False def __init__(self, datadir): - self.screen = SnackScreen() + self.screen = SnackScreen() # FIXME: self.screen.finish() clears the screen (and all messages) # there too #atexit.register(self.restoreScreen) - self.button_bar = ButtonBar(self.screen, - ((_("Cancel"), "cancel"), - (_("Install"), "ok")), - compact=True) - self.textview_changes = Textbox(72, 8, _("Changelog"), True, True) - self.checkbox_tree_updates = CheckboxTree(height=8, width=72, scroll=1) - self.checkbox_tree_updates.setCallback(self.checkbox_changed) - self.layout = GridForm(self.screen, _("Updates"), 1, 5) - self.layout.add(self.checkbox_tree_updates, 0, 0) - # empty line to make it look less crowded - self.layout.add(Textbox(60, 1, " ", False, False), 0, 1) - self.layout.add(self.textview_changes, 0, 2) - # empty line to make it look less crowded - self.layout.add(Textbox(60, 1, " ", False, False), 0, 3) - self.layout.add(self.button_bar, 0, 4) + self.button_bar = ButtonBar(self.screen, + ( (_("Cancel"), "cancel"), + (_("Install"), "ok")), + compact = True) + self.textview_changes = Textbox(72, 8, _("Changelog"), True, True) + self.checkbox_tree_updates = CheckboxTree(height=8, width=72, scroll=1) + self.checkbox_tree_updates.setCallback(self.checkbox_changed) + self.layout = GridForm(self.screen, _("Updates"), 1, 5) + self.layout.add(self.checkbox_tree_updates, 0, 0) + # empty line to make it look less crowded + self.layout.add(Textbox(60, 1," ",False, False), 0, 1) + self.layout.add(self.textview_changes, 0, 2) + # empty line to make it look less crowded + self.layout.add(Textbox(60, 1," ",False, False), 0, 3) + self.layout.add(self.button_bar, 0, 4) # FIXME: better progress than the current suspend/resume screen thing - self.screen.suspend() - if not self.DEBUG: - apt_pkg.pkgsystem_lock() - self.openCache() - print(_("Building Updates List")) - self.fillstore() + self.screen.suspend() + if not self.DEBUG: + apt_pkg.PkgSystemLock() + self.openCache() + print _("Building Updates List") + self.fillstore() if self.list.distUpgradeWouldDelete > 0: - print(_(""" -A normal upgrade can not be calculated, please run: + print _(""" +A normal upgrade can not be calculated, please run: sudo apt-get dist-upgrade @@ -63,51 +59,50 @@ * A previous upgrade which didn't complete * Problems with some of the installed software * Unofficial software packages not provided by Ubuntu - * Normal changes of a pre-release version of Ubuntu""")) + * Normal changes of a pre-release version of Ubuntu""") sys.exit(1) - self.screen.resume() + self.screen.resume() # def restoreScreen(self): # self.screen.finish() - + def openCache(self): - # open cache - progress = apt.progress.text.OpProgress() + # open cache + progress = apt.progress.OpTextProgress() if hasattr(self, "cache"): self.cache.open(progress) self.cache._initDepCache() else: self.cache = MyCache(progress) - self.actiongroup = apt_pkg.ActionGroup(self.cache._depcache) - # lock the cache + self.actiongroup = apt_pkg.GetPkgActionGroup(self.cache._depcache) + # lock the cache self.cache.lock = True - + def fillstore(self): - # populate the list - self.list = UpdateList(self) - self.list.update(self.cache) - origin_list = sorted( - self.list.pkgs, key=operator.attrgetter("importance"), - reverse=True) - for (i, origin) in enumerate(origin_list): - self.checkbox_tree_updates.append(origin.description, - selected=True) - for pkg in self.list.pkgs[origin]: - self.checkbox_tree_updates.addItem(pkg.name, - (i, snackArgs['append']), - pkg, - selected=True) + # populate the list + self.list = UpdateList(self) + self.list.update(self.cache) + origin_list = self.list.pkgs.keys() + origin_list.sort(lambda x,y: cmp(x.importance, y.importance)) + origin_list.reverse() + for (i, origin) in enumerate(origin_list): + self.checkbox_tree_updates.append(origin.description, selected=True) + for pkg in self.list.pkgs[origin]: + self.checkbox_tree_updates.addItem(pkg.name, + (i, snackArgs['append']), + pkg, + selected = True) def updateSelectionStates(self): - """ - helper that goes over the cache and updates the selection + """ + helper that goes over the cache and updates the selection states in the UI based on the cache """ for pkg in self.cache: - if pkg not in self.checkbox_tree_updates.item2key: + if not self.checkbox_tree_updates.item2key.has_key(pkg): continue # update based on the status - if pkg.marked_upgrade or pkg.marked_install: + if pkg.markedUpgrade or pkg.markedInstall: self.checkbox_tree_updates.setEntryValue(pkg, True) else: self.checkbox_tree_updates.setEntryValue(pkg, False) @@ -116,75 +111,74 @@ def updateUI(self): self.layout.draw() self.screen.refresh() - + def get_news_and_changelog(self, pkg): changes = "" - name = pkg.name - + name = pkg.name + # if we don't have it, get it - if (name not in self.cache.all_changes and - name not in self.cache.all_news): + if (not self.cache.all_changes.has_key(name) and + not self.cache.all_news.has_key(name)): self.textview_changes.setText(_("Downloading changelog")) - lock = threading.Lock() + lock = thread.allocate_lock() lock.acquire() - changelog_thread = threading.Thread( - target=self.cache.get_news_and_changelog, args=(name, lock)) - changelog_thread.start() + thread.start_new_thread(self.cache.get_news_and_changelog,(name,lock)) # this lock should never take more than 2s even with network down while lock.locked(): time.sleep(0.03) # build changes from NEWS and changelog - if name in self.cache.all_news: + if self.cache.all_news.has_key(name): changes += self.cache.all_news[name] - if name in self.cache.all_changes: + if self.cache.all_changes.has_key(name): changes += self.cache.all_changes[name] - return changes + return changes def checkbox_changed(self): # item is either a apt.package.Package or a str (for the headers) - pkg = self.checkbox_tree_updates.getCurrent() - descr = "" - if hasattr(pkg, "name"): - need_refresh = False - name = pkg.name - if self.options.show_description: - descr = getattr(pkg.candidate, "description", None) - else: - descr = self.get_news_and_changelog(pkg) - # check if it is a wanted package - selected = self.checkbox_tree_updates.getEntryValue(pkg)[1] - marked_install_upgrade = pkg.marked_install or pkg.marked_upgrade - if not selected and marked_install_upgrade: - need_refresh = True - pkg.mark_keep() - if selected and not marked_install_upgrade: - if not (name in self.list.held_back): - # FIXME: properly deal with "fromUser" here + pkg = self.checkbox_tree_updates.getCurrent() + descr = "" + if hasattr(pkg, "name"): + need_refresh = False + name = pkg.name + if self.options.show_description: + descr = pkg.description + else: + descr = self.get_news_and_changelog(pkg) + # check if it is a wanted package + selected = self.checkbox_tree_updates.getEntryValue(pkg)[1] + marked_install_upgrade = pkg.markedInstall or pkg.markedUpgrade + if not selected and marked_install_upgrade: need_refresh = True - pkg.mark_install() - # fixup any problems - if self.cache._depcache.broken_count: - need_refresh = True - Fix = apt_pkg.ProblemResolver(self.cache._depcache) - Fix.resolve_by_keep() - # update the list UI to reflect the cache state - if need_refresh: - self.updateSelectionStates() - self.textview_changes.setText(descr) - self.updateUI() + pkg.markKeep() + if selected and not marked_install_upgrade: + if not (name in self.list.held_back): + # FIXME: properly deal with "fromUser" here + need_refresh = True + pkg.markInstall() + # fixup any problems + if self.cache._depcache.BrokenCount: + need_refresh = True + Fix = apt_pkg.GetPkgProblemResolver(self.cache._depcache) + Fix.ResolveByKeep() + # update the list UI to reflect the cache state + if need_refresh: + self.updateSelectionStates() + self.textview_changes.setText(descr) + self.updateUI() def main(self, options): self.options = options res = self.layout.runOnce() - self.screen.finish() - button = self.button_bar.buttonPressed(res) - if button == "ok": - self.screen.suspend() - res = self.cache.commit(apt.progress.text.AcquireProgress(), - apt.progress.base.InstallProgress()) - + self.screen.finish() + button = self.button_bar.buttonPressed(res) + if button == "ok": + self.screen.suspend() + res = self.cache.commit(apt.progress.text.AcquireProgress(), + apt.progress.base.InstallProgress()) + + if __name__ == "__main__": diff -Nru update-manager-17.10.11/utils/demoted.cfg update-manager-0.156.14.15/utils/demoted.cfg --- update-manager-17.10.11/utils/demoted.cfg 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/utils/demoted.cfg 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,245 @@ +# demoted packages from oneiric to precise +ajaxterm +asp.net-examples +at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu +cantor +cantor-dbg +cobbler-enlist +couchdb-bin +dcraw +defoma +defoma-doc +desktopcouch +desktopcouch-tools +desktopcouch-ubuntuone +ecosconfig-imx +evolution-couchdb +evolution-couchdb-backend +exiv2 +fortunes-ubuntu-server +g++-4.5-multilib +gamin +gbrainy +gcc-4.4-source +gcc-4.5-multilib +gir1.2-couchdb-1.0 +gir1.2-desktopcouch-1.0 +gnome-desktop-data +gnome-search-tool +jsvc +jython +jython-doc +kaffeine +kaffeine-dbg +kdevelop +kdevelop-data +kdevelop-dev +kdevplatform-dbg +kdevplatform-dev +kdewallpapers +koffice-l10n-ca +koffice-l10n-cavalencia +koffice-l10n-da +koffice-l10n-de +koffice-l10n-el +koffice-l10n-engb +koffice-l10n-es +koffice-l10n-et +koffice-l10n-fr +koffice-l10n-gl +koffice-l10n-hu +koffice-l10n-it +koffice-l10n-ja +koffice-l10n-kk +koffice-l10n-nb +koffice-l10n-nds +koffice-l10n-nl +koffice-l10n-pl +koffice-l10n-pt +koffice-l10n-ptbr +koffice-l10n-ru +koffice-l10n-sv +koffice-l10n-tr +koffice-l10n-uk +koffice-l10n-wa +koffice-l10n-zhcn +koffice-l10n-zhtw +lib32go0 +lib32go0-dbg +lib64go0 +lib64go0-dbg +libaccess-bridge-java +libaccess-bridge-java-jni +libamd2.2.0 +libatspi-dbg +libatspi-dev +libatspi1.0-0 +libbtf1.1.0 +libcamd2.2.0 +libccolamd2.7.1 +libcholmod1.7.1 +libcolamd2.7.1 +libcommons-daemon-java +libcouchdb-glib-1.0-2 +libcouchdb-glib-dev +libcouchdb-glib-doc +libcsparse2.2.3 +libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev +libdesktopcouch-glib-1.0-2 +libdesktopcouch-glib-dev +libdirectfb-1.2-9 +libdirectfb-1.2-9-dbg +libdirectfb-bin +libdirectfb-bin-dbg +libdirectfb-dev +libdirectfb-extra +libdirectfb-extra-dbg +libgamin-dev +libgamin0 +libgdata-cil-dev +libgdict-1.0-6 +libgdict-1.0-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil +libglademm-2.4-1c2a +libglademm-2.4-dbg +libglademm-2.4-dev +libglademm-2.4-doc +libgladeui-1-11 +libgladeui-1-dev +libgmm-dev +libgo0 +libgo0-dbg +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev +libgtkhtml-editor-common +libgtkhtml-editor-dev +libgtkhtml-editor0 +libgtkhtml3.14-19 +libgtkhtml3.14-dbg +libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev +libklu1.1.0 +libldl2.0.1 +libllvm-2.8-ocaml-dev +libllvm-2.9-ocaml-dev +libllvm2.8 +libllvm2.9 +liblpsolve55-dev +libmodplug-dev +libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil +libmozjs185-1.0 +libmozjs185-dev +libmusicbrainz4-dev +libmysql-java +libnotify-cil-dev +libnotify0.4-cil +libofa0 +libofa0-dev +libpg-java +libpod-plainer-perl +libqt4-declarative-shaders +librcps-dev +librcps0 +libreadline-java +libreadline-java-doc +libsac-java +libsac-java-doc +libsac-java-gcj +libsublime-dev +libsuitesparse-dbg +libsuitesparse-dev +libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil +libtextcat-data +libtextcat-dev +libtextcat0 +libts-0.0-0 +libts-0.0-0-dbg +libts-bin +libts-dev +libumfpack5.4.0 +libvala-0.12-0 +libvala-0.12-0-dbg +libxine-dev +libxine1 +libxine1-bin +libxine1-console +libxine1-dbg +libxine1-doc +libxine1-ffmpeg +libxine1-gnome +libxine1-misc-plugins +libxine1-x +linux-wlan-ng +linux-wlan-ng-doc +llvm-2.8 +llvm-2.8-dev +llvm-2.8-doc +llvm-2.8-runtime +llvm-2.9 +llvm-2.9-dev +llvm-2.9-doc +llvm-2.9-examples +llvm-2.9-runtime +lp-solve +lp-solve-doc +mono-jay +mono-xsp2 +mono-xsp2-base +myspell-tools +nova-ajax-console-proxy +oxygen-icon-theme-complete +pngquant +python-aptdaemon.gtkwidgets +python-bittorrent +python-central +python-desktopcouch +python-desktopcouch-application +python-desktopcouch-records +python-desktopcouch-recordtypes +python-fontforge +python-gamin +python-indicate +python-smartpm +python-support +python-telepathy +python-xklavier +qt3-designer +squid +squid-common +swift +tomboy +tomcat6-user +tsconf +ttf-lao +ttf-sil-padauk +ttf-unfonts-extra +unionfs-fuse +vala-0.12-doc +valac-0.12 +valac-0.12-dbg +vinagre +x-ttcidfont-conf +xserver-xephyr +zeitgeist-extension-fts diff -Nru update-manager-17.10.11/utils/demoted.cfg.dapper update-manager-0.156.14.15/utils/demoted.cfg.dapper --- update-manager-17.10.11/utils/demoted.cfg.dapper 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/utils/demoted.cfg.dapper 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,243 @@ +# demoted packages from dapper to hardy +alcovebook-sgml +alcovebook-sgml-doc +aspell-fi +binfmt-support +blender +bluez-hcidump +bluez-pcmcia-support +calc +console-common +console-data +courier-authdaemon +courier-base +courier-doc +courier-imap +courier-imap-ssl +courier-pop +courier-pop-ssl +courier-ssl +debian-el +debmake +dh-consoledata +dh-kpatches +doc-debian +dpkg-dev-el +emacs21 +emacs21-bin-common +emacs21-common +emacs21-el +evms +evms-cli +evms-gui +evms-ncurses +expat +festlex-cmu +festlex-poslex +festvox-kallpc16k +ftgl-dev +g++-3.4 +gcj-4.1-base +gij-4.1 +git-email +gnome-cups-manager +gnome-doc-tools +gnus +gok +gok-doc +gtkhtml3.8 +gtranslator +heartbeat +heartbeat-dev +heimdal-dev +ia32-libs-kde +installation-guide-hppa +irssi-text +kde-style-lipstik +kitchensync +klaptopdaemon +kmplayer-doc +knewsticker-scripts +ladspa-sdk +lam4-dev +lam4c2 +latex-xft-fonts +libaltlinuxhyph-dev +libasn1-6-heimdal +libcompfaceg1 +libcompfaceg1-dev +libconfig-inifiles-perl +libconvert-binhex-perl +libdm0 +libdm0-dev +libdvdnav-dev +libdvdnav4 +libdvdread3 +libemail-valid-perl +libevms-2.5 +libevms-dev +libfinance-quote-perl +libgcj7-jar +libgd-gd2-noxpm-perl +libgda2-3 +libgda2-common +libgda2-dev +libgda2-doc +libgdchart-gd2-noxpm +libgdchart-gd2-noxpm-dev +libglib1.2 +libglib1.2-dbg +libglib1.2-dev +libgnomecupsui1.0-1c2a +libgnomecupsui1.0-dev +libgnomedb2-4 +libgnomedb2-common +libgnomedb2-dev +libgnomedb2-doc +libgnucrypto-java +libgssapi4-heimdal +libgtk1.2 +libgtk1.2-common +libgtk1.2-dbg +libgtk1.2-dev +libhdb7-heimdal +libhtml-tableextract-perl +libio-pty-perl +libipc-run-perl +libjaxp1.2-java +libkadm5clnt4-heimdal +libkadm5srv7-heimdal +libkafs0-heimdal +libkrb5-17-heimdal +liblzo1 +libmail-sendmail-perl +libmailtools-perl +libmime-perl +libmpich1.0-dev +libnasl-dev +libnasl2 +libnessus-dev +libnessus2 +libnet-dns-perl +libnet-domain-tld-perl +libnet-ip-perl +libnet1 +libnet1-dev +libnetcdf++3 +libnetcdf3 +libnews-nntpclient-perl +libpcap0.7 +libpcap0.7-dev +libpgtcl-dev +libpgtcl1.5 +libpils-dev +libpils0 +libpq4 +libquicktime-dev +libroken16-heimdal +libstdc++6-dbg +libstdc++6-dev +libstlport4.6-dev +libstlport4.6c2 +libstonith-dev +libstonith0 +libsyck0-dev +libttf-dev +libttf2 +libvncauth-dev +libvncauth0 +libxaw6 +libxaw6-dbg +libxml-dev +libxml1 +libxmlsec1 +libxmlsec1-dev +libxmlsec1-nss +libxmlsec1-openssl +memtester +menu-xdg +mgetty +mgetty-fax +mpi-doc +mpich-bin +myspell-fi +nagios-common +nagios-mysql +nagios-pgsql +nagios-plugins +nagios-plugins-basic +nagios-plugins-standard +nagios-text +nessus +nessus-dev +nessus-plugins +nessusd +netcdfg-dev +nvidia-glx-legacy +nvidia-glx-legacy-dev +openjade1.3 +openoffice.org-help-km +openoffice.org-l10n-km +pcmcia-cs +perlsgml +pmount +postgresql-8.1 +postgresql-client-8.1 +postgresql-contrib-8.1 +postgresql-doc-8.1 +postgresql-plperl-8.1 +postgresql-plpython-8.1 +postgresql-pltcl-8.1 +postgresql-server-dev-8.1 +procinfo +publib-dev +python-elementtree +python-elementtree-doc +python-eunuchs +python-gadfly +python-htmltmpl +python-kjbuckets +python-mode +python-netcdf +python-pgsql +python-psycopg +python-scientific-doc +python-soappy +python-sqlite +python-stats +python-syck +python2.4-schooltool +rcs +readahead-list +reportbug +rhino +rhino-doc +schooltool +sdf-doc +sgml2x +smake +springgraph +sysutils +tcsh +tex4ht +ttf-baekmuk +ttf-bpg-georgian-fonts +ubuntu-calendar +ubuntu-calendar-december +ubuntu-calendar-february +ubuntu-calendar-january +ubuntu-calendar-march +ubuntu-calendar-november +ubuntu-calendar-october +utf8-migration-tool +vnc-common +wfinnish +wlassistant +xarchiver +xfce4-taskmanager +xfmedia +xmms +xmms-dev +xvncviewer +yada +yada-doc diff -Nru update-manager-17.10.11/utils/demoted.cfg.hardy update-manager-0.156.14.15/utils/demoted.cfg.hardy --- update-manager-17.10.11/utils/demoted.cfg.hardy 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/utils/demoted.cfg.hardy 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,568 @@ +# demoted packages from hardy to lucid +acpi +adept +analog +app-install-data-edubuntu +aspell-af +aspell-am +aspell-ar +aspell-bg +aspell-bn +aspell-br +aspell-ca +aspell-cs +aspell-cy +aspell-da +aspell-de +aspell-de-alt +aspell-el +aspell-eo +aspell-es +aspell-et +aspell-fa +aspell-fo +aspell-fr +aspell-ga +aspell-gl-minimos +aspell-gu +aspell-he +aspell-hr +aspell-hu +aspell-hy +aspell-is +aspell-it +aspell-ku +aspell-lt +aspell-lv +aspell-ml +aspell-nl +aspell-no +aspell-nr +aspell-ns +aspell-or +aspell-pa +aspell-pl +aspell-pt-br +aspell-pt-pt +aspell-ro +aspell-ru +aspell-sk +aspell-sl +aspell-ss +aspell-st +aspell-sv +aspell-ta +aspell-te +aspell-tn +aspell-ts +aspell-uk +aspell-xh +aspell-zu +atomix +atomix-data +bacula-traymonitor +bicyclerepair +binutils-static +brazilian-conjugate +bug-buddy +capiutils +cgilib +compiz-fusion-plugins-extra +console-tools +console-tools-dev +contacts-snapshot +cpp-4.1 +cpp-4.1-doc +cpp-4.2 +cpp-4.2-doc +cricket +cups-pdf +cupsddk +db4.6-doc +db4.6-util +debtags +denemo +desktop-base +diff-doc +discover1 +dpkg-awk +drdsl +edubuntu-artwork +edubuntu-desktop +edubuntu-desktop-kde +edubuntu-docs +edubuntu-server +elinks +elinks-data +elinks-doc +elisa +emacs22 +emacs22-bin-common +emacs22-common +emacs22-el +emacs22-nox +enigmail +epiphany-browser +epiphany-browser-data +epiphany-browser-dbg +epiphany-browser-dev +epiphany-extensions +epiphany-gecko +fbreader +fdutils +fontforge-doc +freeradius-dialupadmin +freeradius-iodbc +freeradius-krb5 +freeradius-ldap +freeradius-mysql +freeradius-postgresql +g++-4.2 +g++-4.2-multilib +galculator +gcc-4.1 +gcc-4.1-base +gcc-4.1-doc +gcc-4.1-multilib +gcc-4.1-source +gcc-4.2 +gcc-4.2-base +gcc-4.2-doc +gcc-4.2-locales +gcc-4.2-multilib +gcc-4.2-source +gcompris +gcompris-data +gcompris-dbg +gcompris-sound-ar +gcompris-sound-bg +gcompris-sound-br +gcompris-sound-cs +gcompris-sound-da +gcompris-sound-de +gcompris-sound-el +gcompris-sound-en +gcompris-sound-es +gcompris-sound-eu +gcompris-sound-fi +gcompris-sound-fr +gcompris-sound-hi +gcompris-sound-hu +gcompris-sound-id +gcompris-sound-it +gcompris-sound-mr +gcompris-sound-nb +gcompris-sound-nl +gcompris-sound-pt +gcompris-sound-ptbr +gcompris-sound-ru +gcompris-sound-so +gcompris-sound-sr +gcompris-sound-sv +gcompris-sound-tr +gcompris-sound-ur +gengetopt +gfortran-4.2 +gfortran-4.2-doc +glut-doc +glutg3-dev +gnome-icon-theme-gartoon +gnome-mount +gnome-netstatus-applet +gnome-pilot +gnome-pilot-conduits +gnome-volume-manager +gobby +gobjc-4.2 +gpaint +gpgsm +gstreamer0.10-gnomevfs +gthumb +gtk2-engines-sapwood +gtk2-engines-sapwood-dbg +guile-1.6 +guile-1.6-dev +guile-1.6-doc +guile-1.6-libs +hildon-control-panel +hildon-control-panel-dbg +hildon-control-panel-dev +hildon-control-panel-l10n-engb +hildon-control-panel-l10n-english +hildon-thumbnail +hildon-update-category-database +human-icon-theme +ibrazilian +ibritish +ibulgarian +icatalan +iczech +idanish +idutch +iesperanto +iestonian +ifaroese +ifrench-gut +ihungarian +iirish +iitalian +ilithuanian +imanx +indi +ingerman +inorwegian +iogerman +ipolish +iportuguese +ipppd +irussian +isdnutils-base +isdnutils-doc +isdnutils-xtools +ispanish +iswedish +iswiss +itagalog +italc-client +italc-master +iukrainian +javacc-doc +kdeartwork-theme-icon +kdeartwork-theme-window +keep +kernel-package +kexi +khelpcenter +kino +klogd +kmplayer +kmplayer-base +koffice-data +koffice-doc-html +koffice-libs +kspread +ktorrent +kubuntu-artwork-usplash +kugar +kwin-style-crystal +kword +kword-data +kxsldbg +language-support-writing-no +language-support-writing-sw +laptop-mode-tools +lib32gfortran2 +lib32gfortran2-dbg +lib32stdc++6-4.2-dbg +lib64gfortran2 +lib64gfortran2-dbg +lib64stdc++6-4.2-dbg +libalut-dev +libalut0 +libapache2-mod-auth-pam +libapache2-mod-auth-sys-group +libapache2-svn +libares-dev +libares0 +libavahi-compat-howl-dev +libavahi-compat-howl0 +libboost-python-dev +libcapi20-3 +libcapi20-dev +libcdio7 +libchicken-dev +libconsole +libdb4.2 +libdb4.2++-dev +libdb4.2++c2 +libdb4.2-dev +libdb4.6 +libdb4.6++ +libdb4.6++-dev +libdb4.6-dbg +libdb4.6-dev +libdb4.6-java +libdb4.6-java-dev +libdb4.6-java-gcj +libdiscover1-dev +libehcache-java +libesd-alsa0 +libfile-which-perl +libgda3-3 +libgda3-3-dbg +libgda3-common +libgda3-dev +libgda3-doc +libgfortran2 +libgfortran2-dbg +libggz-gtk-dev +libggz-gtk1 +libggzdmod++-dev +libggzdmod++1 +libggzdmod-dev +libggzdmod6 +libglew1.5 +libglew1.5-dev +libglut3 +libglut3-dev +libgnet-dev +libgnet2.0-0 +libgnome-speech-dev +libgnome-speech7 +libgnomevfs2-bin +libgnumail-java-doc +libguile-ltdl-1 +libhildon-1-0 +libhildon-1-0-dbg +libhildon-1-dev +libhildonhelp-dev +libhildonhelp0 +libhildonhelp0-dbg +libhildonmime-dev +libhildonmime0 +libhildonmime0-dbg +libio-socket-ssl-perl +libiso9660-dev +libitalc +libitext-java +libiw29 +libjakarta-poi-java +libjakarta-poi-java-doc +libjcommon-java +libjcommon-java-doc +libjsr107cache-java +libkpathsea4 +libloader-java +libloader-java-doc +liblockdev1 +liblockdev1-dbg +liblockdev1-dev +libmatchbox-dev +libmatchbox1 +libmikmod2 +libmikmod2-dev +libmimelib1-dev +libmimelib1c2a +libmokoui2-0 +libmokoui2-dev +libmokoui2-doc +libmysqlclient15off +libnet-ssleay-perl +libnet6-1.3-0 +libnet6-1.3-0-dbg +libnet6-1.3-dev +libobby-0.4-1 +libobby-0.4-dev +libopenal-dev +libopensync0 +libopensync0-dbg +libopensync0-dev +libosso-dev +libosso1 +libosso1-dbg +libosso1-doc +libpam-thinkfinger +libpigment-dbg +libpigment0.3-dev +libpixie-java +libpolkit-gnome-dev +libpolkit-gnome0 +libportaudio-dev +libportaudio-doc +libportaudio0 +libpqxx-2.6.9ldbl +libpqxx-dev +libpt-1.10.10 +libpt-1.10.10-dbg +libpt-1.10.10-plugins-alsa +libpt-1.10.10-plugins-v4l +libpt-1.10.10-plugins-v4l2 +libqcad0-dev +libqt-perl +libqthreads-12 +librsvg2-bin +librsync-dev +librsync1 +libscim-dev +libscim8c2a +libsdl-image1.2 +libsdl-image1.2-dev +libsdl-mixer1.2 +libsdl-mixer1.2-dev +libsdl-pango-dev +libsdl-pango1 +libsdl-ttf2.0-0 +libsdl-ttf2.0-dev +libsensors-dev +libsensors3 +libskim-dev +libskim0 +libsmbios-dev +libsmbios-doc +libsmokeqt-dev +libsmokeqt1 +libsmpeg-dev +libsmpeg0 +libsnmp-session-perl +libstdc++6-4.1-dbg +libstdc++6-4.1-doc +libstdc++6-4.2-dbg +libstdc++6-4.2-dev +libstdc++6-4.2-doc +libsvn-java +libsvn-ruby +libsvn-ruby1.8 +libthinkfinger-dev +libthinkfinger-doc +libthinkfinger0 +libwriter2latex-java-doc +libwv2-dev +libxml-encoding-perl +libxml-writer-perl +libzlcore-dev +libzltext-dev +libzlui-gtk +linux-headers-rt +lsb-languages +lsb-multimedia +maemo-af-desktop-l10n-engb +maemo-af-desktop-l10n-english +matchbox-keyboard +matchbox-window-manager +mce-dev +mesa-utils +mii-diag +mimetex +minicom +moodle +myspell-da +myspell-fr-gut +myspell-sw +netcat-traditional +nut-hal-drivers +openoffice.org-style-crystal +openoffice.org-writer2latex +osso-af-settings +osso-gwconnect +osso-gwconnect-dev +pccts +pidgin-otr +planner +planner-dev +policykit-gnome +policykit-gnome-doc +poster +powermanagement-interface +powernowd +pppdcapiplugin +pyqt-tools +python-bluez +python-clientform +python-daap +python-gdata +python-hildon +python-hildon-dev +python-launchpad-bugs +python-mechanize +python-numeric +python-numeric-dbg +python-numeric-ext +python-numeric-ext-dbg +python-pgm +python-pqueue +python-pylirc +python-pysqlite2 +python-pysqlite2-dbg +python-qt-dev +python-qt3 +python-qt3-dbg +python-qt3-doc +python-qtext +python-qtext-dbg +python-selinux +python-sexy +python-tcm +python-twisted-web2 +python-tz +python2.5 +python2.5-dbg +python2.5-doc +python2.5-examples +python2.5-minimal +qca-tls +qcad +qcad-doc +qt3-assistant +quanta +quanta-data +rasmol +rasmol-doc +rdiff-backup +rss-glx +scim +scim-anthy +scim-bridge-agent +scim-bridge-client-gtk +scim-bridge-client-qt +scim-bridge-client-qt4 +scim-chewing +scim-dev +scim-dev-doc +scim-gtk2-immodule +scim-hangul +scim-m17n +scim-modules-socket +scim-modules-table +scim-pinyin +scim-qtimm +scim-tables-additional +scim-tables-zh +selinux-utils +sensord +sepol-utils +skim +sound-juicer +speedcrunch +student-control-panel +swat +sysklogd +tagcoll +tangerine-icon-theme +tasks +tasks-dbg +tcl8.3 +tcl8.3-dev +tcl8.3-doc +tdb-tools +tetex-extra +thin-client-manager-backend +thin-client-manager-gnome +thinkfinger-tools +ttf-kochi-gothic +ttf-kochi-mincho +ttf-sil-andika +ttf-sil-doulos +ttf-sil-gentium +tuxmath +tuxpaint +tuxpaint-data +tuxpaint-stamps-default +tuxtype +tuxtype-data +usplash-theme-ubuntu +vlock +w3c-dtd-xhtml +workrave +xaos +xapian-examples +xapian-tools +xresprobe +xsane +xsane-common +xsane-doc +xserver-xorg-video-amd +xserver-xorg-video-amd-dbg +xserver-xorg-video-dummy +xserver-xorg-video-glint +xserver-xorg-video-via +zope-common diff -Nru update-manager-17.10.11/utils/demotions.py update-manager-0.156.14.15/utils/demotions.py --- update-manager-17.10.11/utils/demotions.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/utils/demotions.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,127 @@ +#! /usr/bin/env python +# +# FIXME: strip "TryExec" from the extracted menu files (and noDisplay) +# +# TODO: +# - emacs21 ships it's icon in emacs-data, deal with this +# - some stuff needs to be blacklisted (e.g. gnome-about) +# - lots of packages have there desktop file in "-data", "-comon" (e.g. anjuta) +# - lots of packages have multiple desktop files for the same application +# abiword, abiword-gnome, abiword-gtk + +import os +import sys +import warnings +warnings.filterwarnings("ignore", "apt API not stable yet", FutureWarning) +import apt +import apt_pkg +#import xdg.Menu +import os.path + +ARCHES = ["i386","amd64"] +#ARCHES = ["i386"] + +# pkgs in main for the given dist +class Dist(object): + def __init__(self,name): + self.name = name + self.pkgs_in_comp = {} + + +def get_replace(cache, pkgname): + replaces = set() + if not cache.has_key(pkgname): + #print "can not find '%s'" % pkgname + return replaces + pkg = cache[pkgname] + ver = cache._depcache.get_candidate_ver(pkg._pkg) + if not ver: + return replaces + depends = ver.depends_list + for t in ["Replaces"]: + if not depends.has_key(t): + continue + for depVerList in depends[t]: + for depOr in depVerList: + replaces.add(depOr.target_pkg.name) + return replaces + + +if __name__ == "__main__": + + # init + apt_pkg.config.set("Dir::state","./apt/") + apt_pkg.config.set("Dir::Etc","./apt") + apt_pkg.config.set("Dir::State::status","./apt/status") + try: + os.makedirs("apt/lists/partial") + except OSError: + pass + + old = Dist(sys.argv[1]) # Dist("gutsy") + new = Dist(sys.argv[2]) # Dist("hardy") + + # go over the dists to find main pkgs + for dist in [old, new]: + + for comp in ["main", "restricted", "universe", "multiverse"]: + line = "deb http://archive.ubuntu.com/ubuntu %s %s\n" % (dist.name,comp) + file("apt/sources.list","w").write(line) + dist.pkgs_in_comp[comp] = set() + + # and the archs + for arch in ARCHES: + apt_pkg.Config.set("APT::Architecture",arch) + cache = apt.Cache(apt.progress.base.OpProgress()) + prog = apt.progress.base.AcquireProgress() + cache.update(prog) + cache.open(apt.progress.base.OpProgress()) + for pkg in cache: + if ":" in pkg.name: + continue + dist.pkgs_in_comp[comp].add(pkg.name) + + # check what is no longer in main + no_longer_main = old.pkgs_in_comp["main"] - new.pkgs_in_comp["main"] + no_longer_main |= old.pkgs_in_comp["restricted"] - new.pkgs_in_comp["restricted"] + + # check what moved to universe and what was removed (or renamed) + in_universe = lambda pkg: pkg in new.pkgs_in_comp["universe"] or pkg in new.pkgs_in_comp["multiverse"] + + # debug + #not_in_universe = lambda pkg: not in_universe(pkg) + #print filter(not_in_universe, no_longer_main) + + # this stuff was demoted and is no in universe + demoted = filter(in_universe, no_longer_main) + demoted.sort() + + # remove items that are now in universe, but are replaced by something + # in main (pidgin, gaim) etc + #print "Looking for replaces" + line = "deb http://archive.ubuntu.com/ubuntu %s %s\n" % (new.name, "main") + file("apt/sources.list","w").write(line) + dist.pkgs_in_comp[comp] = set() + for arch in ARCHES: + apt_pkg.Config.set("APT::Architecture",arch) + cache = apt.Cache(apt.progress.base.OpProgress()) + prog = apt.progress.base.AcquireProgress() + cache.update(prog) + cache.open(apt.progress.base.OpProgress()) + # go over the packages in "main" and check if they replaces something + # that we think is a demotion + for pkgname in new.pkgs_in_comp["main"]: + replaces = get_replace(cache, pkgname) + for r in replaces: + if r in demoted: + #print "found '%s' that is demoted but replaced by '%s'" % (r, pkgname) + demoted.remove(r) + + #outfile = "demoted.cfg" + #print "writing the demotion info to '%s'" % outfile + # write it out + #out = open(outfile,"w") + #out.write("# demoted packages\n") + #out.write("\n".join(demoted)) + print "# demoted packages from %s to %s" % (sys.argv[1], sys.argv[2]) + print "\n".join(demoted) diff -Nru update-manager-17.10.11/utils/est_kernel_size.py update-manager-0.156.14.15/utils/est_kernel_size.py --- update-manager-17.10.11/utils/est_kernel_size.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/utils/est_kernel_size.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,13 @@ +#!/usr/bin/python + +import apt_pkg +import glob +import os + +(sysname, nodename, krelease, version, machine) = os.uname() + +sum = 0 +for entry in glob.glob("/boot/*%s*" % krelease): + sum += os.path.getsize(entry) + +print "Sum of kernel releated files: ",sum, apt_pkg.SizeToStr(sum) diff -Nru update-manager-17.10.11/utils/update-base-installer.sh update-manager-0.156.14.15/utils/update-base-installer.sh --- update-manager-17.10.11/utils/update-base-installer.sh 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/utils/update-base-installer.sh 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,51 @@ +#!/bin/sh +# +# Include the latest base-installer version into the DistUpgrader/ +# directory (this is used for the kernel selection) +# + +set -e + +DIST="$(lsb_release -c -s)" +BASEDIR=./apt + +APT_OPTS="\ + -o Dir::State=./apt \ + -o Dir::Cache=./apt \ + -o Dir::Etc=./apt \ + -o Dir::State::Status=./apt/status \ +" + +# cleanup base-installer first +rm -rf base-installer* + +# create dirs +if [ ! -d $BASEDIR/archives/partial ]; then + mkdir -p $BASEDIR/archives/partial +fi +if [ ! -d $BASEDIR/preferences.d ]; then + mkdir -p $BASEDIR/preferences.d +fi + +cp /etc/apt/trusted.gpg $BASEDIR/ + +# create status file +touch $BASEDIR/status + +# put right sources.list in +echo "deb-src http://archive.ubuntu.com/ubuntu $DIST main" > $BASEDIR/sources.list + +# run apt-get update +apt-get $APT_OPTS update + +# get the latest base-installer +apt-get $APT_OPTS source base-installer + +# move kernel/ lib into place +mkdir -p ../DistUpgrade/base-installer +mv base-installer-*/kernel ../DistUpgrade/base-installer/ +# get changelog subset +head -n 500 base-installer-*/debian/changelog > ../DistUpgrade/base-installer/VERSION + +# cleanup +rm -rf base-installer-* base-installer_* diff -Nru update-manager-17.10.11/utils/update_mirrors.py update-manager-0.156.14.15/utils/update_mirrors.py --- update-manager-17.10.11/utils/update_mirrors.py 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.14.15/utils/update_mirrors.py 2017-12-23 05:00:38.000000000 +0000 @@ -0,0 +1,22 @@ +#!/usr/bin/python + +import feedparser +import sys + +# read what we have +current_mirrors = set() +for line in open(sys.argv[1], "r"): + current_mirrors.add(line.strip()) + + +outfile = open(sys.argv[1],"a") +d = feedparser.parse("https://launchpad.net/ubuntu/+archivemirrors-rss") + +#import pprint +#pp = pprint.PrettyPrinter(indent=4) +#pp.pprint(d) + +for entry in d.entries: + for link in entry.links: + if not link.href in current_mirrors: + outfile.write(link.href+"\n")